From d54a5b294ff3fe7a8b27f71b5fb3da2d2d0057b1 Mon Sep 17 00:00:00 2001 From: Michał Żygowski Date: Mon, 3 Jul 2023 17:17:32 +0200 Subject: treewide: Drop the suffixes from ADL and RPL CPUID macros and strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CPUID is the same for Alder Lake and Raptor Lake S and HX variants. To reduce the confusion and concerns how to name the macros, remove the suffixes from macros and platform reporting strings. Thankfully the stepping names are unique across mobile (P suffixed) and desktop (S and HX suffixed) SKUs. Distinguishing the S from HX is possible via host bridge PCI ID. Change-Id: Ib08fb0923481541dd6f358cf60da44d90bd75ae2 Signed-off-by: Michał Żygowski Reviewed-on: https://review.coreboot.org/c/coreboot/+/76203 Tested-by: build bot (Jenkins) Reviewed-by: Tim Crawford --- .../intel/alderlake/bootblock/report_platform.c | 22 +++++++++++----------- src/soc/intel/alderlake/fsp_params.c | 4 ++-- src/soc/intel/common/block/cpu/mp_init.c | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c index 9cc2c17766..938c8ebbca 100644 --- a/src/soc/intel/alderlake/bootblock/report_platform.c +++ b/src/soc/intel/alderlake/bootblock/report_platform.c @@ -29,17 +29,17 @@ static struct { { CPUID_ALDERLAKE_Q0, "Alderlake Q0 Platform" }, { CPUID_ALDERLAKE_R0, "Alderlake R0 Platform" }, { CPUID_ALDERLAKE_N_A0, "Alderlake-N Platform" }, - { CPUID_ALDERLAKE_S_A0, "Alderlake-S A0 Platform" }, - { CPUID_ALDERLAKE_S_B0, "Alderlake-S B0 Platform" }, - { CPUID_ALDERLAKE_S_C0, "Alderlake-S C0 Platform" }, - { CPUID_ALDERLAKE_S_G0, "Alderlake-S G0 Platform" }, - { CPUID_ALDERLAKE_S_H0, "Alderlake-S H0 Platform" }, - { CPUID_RAPTORLAKE_S_A0, "Raptorlake-S A0 Platform" }, - { CPUID_RAPTORLAKE_S_B0, "Raptorlake-S B0 Platform" }, - { CPUID_RAPTORLAKE_S_C0, "Raptorlake-S C0 Platform" }, - { CPUID_RAPTORLAKE_S_H0, "Raptorlake-S H0 Platform" }, - { CPUID_RAPTORLAKE_P_J0, "Raptorlake-P J0 Platform" }, - { CPUID_RAPTORLAKE_P_Q0, "Raptorlake-P Q0 Platform" }, + { CPUID_ALDERLAKE_A0, "Alderlake A0 Platform" }, + { CPUID_ALDERLAKE_B0, "Alderlake B0 Platform" }, + { CPUID_ALDERLAKE_C0, "Alderlake C0 Platform" }, + { CPUID_ALDERLAKE_G0, "Alderlake G0 Platform" }, + { CPUID_ALDERLAKE_H0, "Alderlake H0 Platform" }, + { CPUID_RAPTORLAKE_A0, "Raptorlake A0 Platform" }, + { CPUID_RAPTORLAKE_B0, "Raptorlake B0 Platform" }, + { CPUID_RAPTORLAKE_C0, "Raptorlake C0 Platform" }, + { CPUID_RAPTORLAKE_H0, "Raptorlake H0 Platform" }, + { CPUID_RAPTORLAKE_J0, "Raptorlake J0 Platform" }, + { CPUID_RAPTORLAKE_Q0, "Raptorlake Q0 Platform" }, }; static struct { diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c index e8cde5a237..214a70075b 100644 --- a/src/soc/intel/alderlake/fsp_params.c +++ b/src/soc/intel/alderlake/fsp_params.c @@ -1015,12 +1015,12 @@ static void fill_fsps_misc_power_params(FSP_S_CONFIG *s_cfg, s_cfg->VrPowerDeliveryDesign = config->vr_power_delivery_design; /* FIXME: Disable package C state demotion on Raptorlake as a W/A for S0ix issues */ - if ((cpu_id == CPUID_RAPTORLAKE_P_J0) || (cpu_id == CPUID_RAPTORLAKE_P_Q0)) + if ((cpu_id == CPUID_RAPTORLAKE_J0) || (cpu_id == CPUID_RAPTORLAKE_Q0)) s_cfg->PkgCStateDemotion = 0; else s_cfg->PkgCStateDemotion = !config->disable_package_c_state_demotion; - if (cpu_id == CPUID_RAPTORLAKE_P_J0 || cpu_id == CPUID_RAPTORLAKE_P_Q0) + if (cpu_id == CPUID_RAPTORLAKE_J0 || cpu_id == CPUID_RAPTORLAKE_Q0) s_cfg->C1e = 0; else s_cfg->C1e = 1; diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index 3d6d6063a4..f38db875d6 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -74,19 +74,19 @@ static const struct cpu_device_id cpu_table[] = { { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_A0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_ALDERLAKE_A0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_J0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_K0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_L0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_Q0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_R0, CPUID_EXACT_MATCH_MASK }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_J0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_Q0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_A0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_B0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_C0, CPUID_EXACT_MATCH_MASK }, - { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_H0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_J0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_Q0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_A0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_B0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_C0, CPUID_EXACT_MATCH_MASK }, + { X86_VENDOR_INTEL, CPUID_RAPTORLAKE_H0, CPUID_EXACT_MATCH_MASK }, CPU_TABLE_END }; -- cgit v1.2.3