sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/intel/model_206ax: Replace generate_cstate_entries

Browse Source 
Leverage the existing `acpigen_write_CST_package` function.

Yes, bad devicetree values can trigger undefined behavior. The old code
already had this issue, and will be addressed in subsequent commits.

Change-Id: Icec5431987d91242930efcea0c8ea4e3df3182fd
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49093
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons
2021-01-04 17:37:46 +01:00
parent ea32c52a0e
commit d8b9e562d0
1 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cpu/intel/model_206ax/acpi.c
View File

@@ -19,39 +19,6 @@ static int get_logical_cores_per_package(void)
return msr.lo & 0xffff; return msr.lo & 0xffff;
} }
static void generate_cstate_entries(acpi_cstate_t *cstates,
int c1, int c2, int c3)
{
int cstate_count = 0;
/* Count number of active C-states */
if (c1 > 0)
++cstate_count;
if (c2 > 0)
++cstate_count;
if (c3 > 0)
++cstate_count;
acpigen_write_package(cstate_count + 1);
acpigen_write_byte(cstate_count);
/* Add an entry if the level is enabled */
if (c1 > 0) {
cstates[c1].ctype = 1;
acpigen_write_CST_package_entry(&cstates[c1]);
}
if (c2 > 0) {
cstates[c2].ctype = 2;
acpigen_write_CST_package_entry(&cstates[c2]);
}
if (c3 > 0) {
cstates[c3].ctype = 3;
acpigen_write_CST_package_entry(&cstates[c3]);
}
acpigen_pop_len();
}
static void generate_C_state_entries(void) static void generate_C_state_entries(void)
{ {
struct cpu_info *info; struct cpu_info *info;
@@ -75,10 +42,21 @@ static void generate_C_state_entries(void)
if (!cpu || !cpu->cstates) if (!cpu || !cpu->cstates)
return; return;
acpigen_write_method("_CST", 0); const int acpi_cstates[3] = { conf->acpi_c1, conf->acpi_c2, conf->acpi_c3 };
acpigen_emit_byte(RETURN_OP);
generate_cstate_entries(cpu->cstates, conf->acpi_c1, conf->acpi_c2, conf->acpi_c3); acpi_cstate_t acpi_cstate_map[ARRAY_SIZE(acpi_cstates)] = { 0 };
acpigen_pop_len();
/* Count number of active C-states */
int count = 0;
for (int i = 0; i < ARRAY_SIZE(acpi_cstates); i++) {
if (acpi_cstates[i] > 0) {
acpi_cstate_map[count] = cpu->cstates[acpi_cstates[i]];
acpi_cstate_map[count].ctype = i + 1;
count++;
}
}
acpigen_write_CST_package(acpi_cstate_map, count);
} }
static acpi_tstate_t tss_table_fine[] = { static acpi_tstate_t tss_table_fine[] = {