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>

4 files changed, 9 insertions, 5 deletions

diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c
index 5a908dabbf..3066dda22e 100644
--- a/src/soc/intel/xeon_sp/cpx/acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/acpi.c
@@ -261,8 +261,9 @@ void generate_cpu_entries(const struct device *device)
 
 			/* 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 19d196d351..88205173b6 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 @@ void uncore_inject_dsdt(const struct device *device)
 	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 75859e8353..61639d2a84 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 @@ unsigned long northbridge_write_acpi_tables(const struct device *device,
 
 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 7462d72b7a..df2550c54a 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 @@ void uncore_inject_dsdt(const struct device *device)
 	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;