soc/intel/: Rename small and big cores references
The patch addresses Intel heterogeneous cores as `Efficient` and
`Performance` cores instead of `small` and `big` cores. It is to ensure
coreboot code has uniform reference to the heterogeneous cores. So, the
patch renames all `small` and `big` core references to `efficient` (eff)
and `performance` (perf) cores respectively.
TEST=Build the code for Brya and Rex boards
Signed-off-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Change-Id: I98c9c0ed86b211d736a0a1738b47410faa13a39f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71639
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/src/soc/intel/alderlake/cpu.c b/src/soc/intel/alderlake/cpu.c
index 4bc0af7..768f2d5 100644
--- a/src/soc/intel/alderlake/cpu.c
+++ b/src/soc/intel/alderlake/cpu.c
@@ -99,10 +99,10 @@
return CPUID_CORE_TYPE_INTEL_CORE;
}
-void soc_get_scaling_factor(u16 *big_core_scal_factor, u16 *small_core_scal_factor)
+void soc_get_scaling_factor(u16 *perf_core_scal_factor, u16 *eff_core_scal_factor)
{
- *big_core_scal_factor = 127;
- *small_core_scal_factor = 100;
+ *perf_core_scal_factor = 127;
+ *eff_core_scal_factor = 100;
}
bool soc_is_nominal_freq_supported(void)
diff --git a/src/soc/intel/common/block/acpi/cpu_hybrid.c b/src/soc/intel/common/block/acpi/cpu_hybrid.c
index 4335a46..e5ccf46 100644
--- a/src/soc/intel/common/block/acpi/cpu_hybrid.c
+++ b/src/soc/intel/common/block/acpi/cpu_hybrid.c
@@ -12,14 +12,14 @@
#define CPPC_NOM_PERF_IDX 3
enum cpu_perf_eff_type {
- CPU_TYPE_SMALL,
- CPU_TYPE_BIG,
+ CPU_TYPE_EFF,
+ CPU_TYPE_PERF,
};
DECLARE_SPIN_LOCK(cpu_lock);
static u8 global_cpu_type[CONFIG_MAX_CPUS];
-static bool is_big_core(void)
+static bool is_perf_core(void)
{
return get_soc_cpu_type() == CPUID_CORE_TYPE_INTEL_CORE;
}
@@ -39,9 +39,9 @@
}
/*
- * This function determines the type (big or small) of the CPU that is executing
- * it and stores the information (in a thread-safe manner) in an global_cpu_type
- * array.
+ * This function determines the type (performance or efficient) of the CPU that
+ * is executing it and stores the information (in a thread-safe manner) in an
+ * global_cpu_type array.
* It requires the SoC to implement a function `get_soc_cpu_type()` which will be
* called in a critical section to determine the type of the executing CPU.
*/
@@ -50,8 +50,8 @@
spin_lock(&cpu_lock);
u8 cpu_index = get_cpu_index();
- if (is_big_core())
- global_cpu_type[cpu_index] = CPU_TYPE_BIG;
+ if (is_perf_core())
+ global_cpu_type[cpu_index] = CPU_TYPE_PERF;
spin_unlock(&cpu_lock);
}
@@ -64,16 +64,16 @@
}
}
-static void acpi_get_cpu_nomi_perf(u16 *small_core_nom_perf, u16 *big_core_nom_perf)
+static void acpi_get_cpu_nomi_perf(u16 *eff_core_nom_perf, u16 *perf_core_nom_perf)
{
- u16 big_core_scal_factor, small_core_scal_factor;
+ u16 perf_core_scal_factor, eff_core_scal_factor;
u8 max_non_turbo_ratio = cpu_get_max_non_turbo_ratio();
- soc_get_scaling_factor(&big_core_scal_factor, &small_core_scal_factor);
+ soc_get_scaling_factor(&perf_core_scal_factor, &eff_core_scal_factor);
- *big_core_nom_perf = (u16)((max_non_turbo_ratio * big_core_scal_factor) / 100);
+ *perf_core_nom_perf = (u16)((max_non_turbo_ratio * perf_core_scal_factor) / 100);
- *small_core_nom_perf = (u16)((max_non_turbo_ratio * small_core_scal_factor) / 100);
+ *eff_core_nom_perf = (u16)((max_non_turbo_ratio * eff_core_scal_factor) / 100);
}
static u16 acpi_get_cpu_nominal_freq(void)
@@ -84,18 +84,18 @@
/* Updates Nominal Frequency and Nominal Performance */
static void acpigen_cppc_update_nominal_freq_perf(const char *pkg_path, s32 core_id)
{
- u16 small_core_nom_perf, big_core_nom_perf;
+ u16 eff_core_nom_perf, perf_core_nom_perf;
if (!soc_is_nominal_freq_supported())
return;
- acpi_get_cpu_nomi_perf(&small_core_nom_perf, &big_core_nom_perf);
+ acpi_get_cpu_nomi_perf(&eff_core_nom_perf, &perf_core_nom_perf);
- if (global_cpu_type[core_id] == CPU_TYPE_BIG)
- acpigen_set_package_element_int(pkg_path, CPPC_NOM_PERF_IDX, big_core_nom_perf);
+ if (global_cpu_type[core_id] == CPU_TYPE_PERF)
+ acpigen_set_package_element_int(pkg_path, CPPC_NOM_PERF_IDX, perf_core_nom_perf);
else
acpigen_set_package_element_int(pkg_path, CPPC_NOM_PERF_IDX,
- small_core_nom_perf);
+ eff_core_nom_perf);
/* Update CPU's nominal frequency */
acpigen_set_package_element_int(pkg_path, CPPC_NOM_FREQ_IDX,
diff --git a/src/soc/intel/common/block/include/intelblocks/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi.h
index c149c69..63f38bf 100644
--- a/src/soc/intel/common/block/include/intelblocks/acpi.h
+++ b/src/soc/intel/common/block/include/intelblocks/acpi.h
@@ -18,8 +18,8 @@
CPUID_UNKNOWN = 0xff,
};
-/* Gets the scaling factor for small and big core */
-void soc_get_scaling_factor(u16 *big_core_scal_factor, u16 *small_core_scal_factor);
+/* Gets the scaling factor for Efficient and Performance core */
+void soc_get_scaling_factor(u16 *perf_core_scal_factor, u16 *eff_core_scal_factor);
/* Generates ACPI code to define _CPC control method */
void acpigen_write_CPPC_hybrid_method(int core_id);
diff --git a/src/soc/intel/meteorlake/cpu.c b/src/soc/intel/meteorlake/cpu.c
index e0ac726..b299cc8 100644
--- a/src/soc/intel/meteorlake/cpu.c
+++ b/src/soc/intel/meteorlake/cpu.c
@@ -87,10 +87,10 @@
return CPUID_CORE_TYPE_INTEL_CORE;
}
-void soc_get_scaling_factor(u16 *big_core_scal_factor, u16 *small_core_scal_factor)
+void soc_get_scaling_factor(u16 *perf_core_scal_factor, u16 *eff_core_scal_factor)
{
- *big_core_scal_factor = 125;
- *small_core_scal_factor = 100;
+ *perf_core_scal_factor = 125;
+ *eff_core_scal_factor = 100;
}
bool soc_is_nominal_freq_supported(void)