Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46598 )
Change subject: soc/intel/xeon_sp: Rename cpx_generate_p_state_entries() ......................................................................
soc/intel/xeon_sp: Rename cpx_generate_p_state_entries()
Prepare for common ACPI. Rename cpx_generated_p_state_entries() to the common soc_power_states_generation() function. Add empty soc_power_states_generation() to skx.
Change-Id: Ib7e8dfd2bb602f3e6ccdb5b221bc65236f66a875 Signed-off-by: Marc Jones marcjones@sysproconsulting.com --- M src/soc/intel/xeon_sp/cpx/acpi.c M src/soc/intel/xeon_sp/cpx/soc_acpi.c M src/soc/intel/xeon_sp/include/soc/acpi.h M src/soc/intel/xeon_sp/skx/soc_acpi.c 4 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/46598/1
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 5a908da..3066dda2 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -261,8 +261,9 @@
/* NOTE: Intel idle driver doesn't use ACPI C-state tables */
- /* Generate P-state tables */ - cpx_generate_p_state_entries(core_id, threads_per_package); + /* Soc specific power states generation */ + soc_power_states_generation(core_id, threads_per_package); + acpigen_pop_len(); } } diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 19d196d..8820517 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -123,8 +123,8 @@ acpigen_pop_len(); }
-/* To be renamed soc_power_states_generation() */ -void cpx_generate_p_state_entries(int core, int cores_per_package) +/* TODO: See if we can use the common generate_p_state_entries */ +void soc_power_states_generation(int core, int cores_per_package) { int ratio_min, ratio_max, ratio_turbo, ratio_step; int coord_type, power_max, power_unit, num_entries; diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h index 75859e83..61639d2 100644 --- a/src/soc/intel/xeon_sp/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/include/soc/acpi.h @@ -22,7 +22,6 @@
void motherboard_fill_fadt(acpi_fadt_t *fadt);
-void cpx_generate_p_state_entries(int core, int cores_per_package); int calculate_power(int tdp, int p1_ratio, int ratio); void uncore_inject_dsdt(const struct device *device); unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index 7462d72..df2550c 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -171,6 +171,10 @@ acpigen_pop_len(); }
+void soc_power_states_generation(int core, int cores_per_package) +{ +} + unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current) { struct device *cpu;
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46598 )
Change subject: soc/intel/xeon_sp: Rename cpx_generate_p_state_entries() ......................................................................
Patch Set 1: Code-Review+2
Is there a skx version on the horizon?
Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46598 )
Change subject: soc/intel/xeon_sp: Rename cpx_generate_p_state_entries() ......................................................................
Patch Set 1:
Patch Set 1: Code-Review+2
Is there a skx version on the horizon?
That is the plan.
Marc Jones has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46598 )
Change subject: soc/intel/xeon_sp: Rename cpx_generate_p_state_entries() ......................................................................
soc/intel/xeon_sp: Rename cpx_generate_p_state_entries()
Prepare for common ACPI. Rename cpx_generated_p_state_entries() to the common soc_power_states_generation() function. Add empty soc_power_states_generation() to skx.
Change-Id: Ib7e8dfd2bb602f3e6ccdb5b221bc65236f66a875 Signed-off-by: Marc Jones marcjones@sysproconsulting.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/46598 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Stefan Reinauer stefan.reinauer@coreboot.org --- M src/soc/intel/xeon_sp/cpx/acpi.c M src/soc/intel/xeon_sp/cpx/soc_acpi.c M src/soc/intel/xeon_sp/include/soc/acpi.h M src/soc/intel/xeon_sp/skx/soc_acpi.c 4 files changed, 9 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 5a908da..3066dda2 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -261,8 +261,9 @@
/* NOTE: Intel idle driver doesn't use ACPI C-state tables */
- /* Generate P-state tables */ - cpx_generate_p_state_entries(core_id, threads_per_package); + /* Soc specific power states generation */ + soc_power_states_generation(core_id, threads_per_package); + acpigen_pop_len(); } } diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 19d196d..8820517 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -123,8 +123,8 @@ acpigen_pop_len(); }
-/* To be renamed soc_power_states_generation() */ -void cpx_generate_p_state_entries(int core, int cores_per_package) +/* TODO: See if we can use the common generate_p_state_entries */ +void soc_power_states_generation(int core, int cores_per_package) { int ratio_min, ratio_max, ratio_turbo, ratio_step; int coord_type, power_max, power_unit, num_entries; diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h index 75859e83..61639d2 100644 --- a/src/soc/intel/xeon_sp/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/include/soc/acpi.h @@ -22,7 +22,6 @@
void motherboard_fill_fadt(acpi_fadt_t *fadt);
-void cpx_generate_p_state_entries(int core, int cores_per_package); int calculate_power(int tdp, int p1_ratio, int ratio); void uncore_inject_dsdt(const struct device *device); unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index 7462d72..df2550c 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -171,6 +171,10 @@ acpigen_pop_len(); }
+void soc_power_states_generation(int core, int cores_per_package) +{ +} + unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current) { struct device *cpu;