Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74396 )
Change subject: cpu,soc/intel: Sync ACPI CPU object implementations ......................................................................
cpu,soc/intel: Sync ACPI CPU object implementations
Take variable names from soc/intel and adjust counter to start from zero.
Change-Id: I14e1120e74e1bd92acd782a53104fabfb266c3b5 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/cpu/intel/haswell/acpi.c M src/cpu/intel/model_2065x/acpi.c M src/cpu/intel/model_206ax/acpi.c 3 files changed, 32 insertions(+), 31 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/74396/1
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c index 1e1c724..66d58ad 100644 --- a/src/cpu/intel/haswell/acpi.c +++ b/src/cpu/intel/haswell/acpi.c @@ -327,30 +327,26 @@
void generate_cpu_entries(const struct device *device) { - int coreID, cpuID; int totalcores = dev_count_cpu(); int cores_per_package = get_logical_cores_per_package(); - int numcpus = totalcores/cores_per_package; + int numcpus = totalcores / cores_per_package;
printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n", numcpus, cores_per_package);
- for (cpuID = 1; cpuID <= numcpus; cpuID++) { - for (coreID = 1; coreID <= cores_per_package; coreID++) { + for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) { + for (int core_id = 0; core_id < cores_per_package; core_id++) { /* Generate Scope(_SB) { Device(CPUx */ - acpigen_write_processor_device( - (cpuID - 1) * cores_per_package+coreID - 1); + acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
/* Generate P-state tables */ - generate_P_state_entries( - coreID - 1, cores_per_package); + generate_P_state_entries(core_id, cores_per_package);
/* Generate C-state tables */ generate_C_state_entries(device);
/* Generate T-state tables */ - generate_T_state_entries( - cpuID - 1, cores_per_package); + generate_T_state_entries(cpu_id, cores_per_package);
acpigen_write_processor_device_end(); } diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c index 834a3bb..370ea96 100644 --- a/src/cpu/intel/model_2065x/acpi.c +++ b/src/cpu/intel/model_2065x/acpi.c @@ -205,30 +205,26 @@
void generate_cpu_entries(const struct device *device) { - int coreID, cpuID; int totalcores = dev_count_cpu(); int cores_per_package = get_cores_per_package(); - int numcpus = totalcores/cores_per_package; + int numcpus = totalcores / cores_per_package;
printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n", numcpus, cores_per_package);
- for (cpuID = 1; cpuID <= numcpus; cpuID++) { - for (coreID = 1; coreID <= cores_per_package; coreID++) { + for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) { + for (int core_id = 0; core_id < cores_per_package; core_id++) { /* Generate Scope(_SB) { Device(CPUx */ - acpigen_write_processor_device( - (cpuID-1)*cores_per_package+coreID-1); + acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
/* Generate P-state tables */ - generate_P_state_entries( - cpuID-1, cores_per_package); + generate_P_state_entries(cpu_id, cores_per_package);
/* Generate C-state tables */ generate_C_state_entries();
/* Generate T-state tables */ - generate_T_state_entries( - cpuID-1, cores_per_package); + generate_T_state_entries(cpu_id, cores_per_package);
acpigen_write_processor_device_end(); } diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index d7c048d..a10f8dc 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -296,30 +296,26 @@
void generate_cpu_entries(const struct device *device) { - int coreID, cpuID; int totalcores = dev_count_cpu(); int cores_per_package = get_logical_cores_per_package(); - int numcpus = totalcores/cores_per_package; + int numcpus = totalcores / cores_per_package;
printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n", numcpus, cores_per_package);
- for (cpuID = 1; cpuID <= numcpus; cpuID++) { - for (coreID = 1; coreID <= cores_per_package; coreID++) { - /* Generate Scope(_SB) { Device(CPU */ - acpigen_write_processor_device( - (cpuID-1)*cores_per_package+coreID-1); + for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) { + for (int core_id = 0; core_id < cores_per_package; core_id++) { + /* Generate Scope(_SB) { Device(CPUx */ + acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
/* Generate P-state tables */ - generate_P_state_entries( - cpuID-1, cores_per_package); + generate_P_state_entries(cpu_id, cores_per_package);
/* Generate C-state tables */ generate_C_state_entries(device);
/* Generate T-state tables */ - generate_T_state_entries( - cpuID-1, cores_per_package); + generate_T_state_entries(cpu_id, cores_per_package);
acpigen_write_processor_device_end(); }