soc/intel/alderlake: Update CPU IDs with correct steppings

Update ADL CPU IDs per correct steppings listed in Intel Doc 626774.

Signed-off-by: Lean Sheng Tan <sheng.tan@9elements.com>
Change-Id: I722043c493b8c3de8965bcaa13f33c907d51f284
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63299
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Lean Sheng Tan 2022-04-01 12:03:51 +02:00 committed by Angel Pons
parent 74d6efc924
commit 9e78dd1357
7 changed files with 16 additions and 16 deletions

View File

@ -138,7 +138,7 @@ static void camera_fill_cio2(const struct device *dev)
port_name[i] = strdup(name); port_name[i] = strdup(name);
if (CONFIG(ACPI_ADL_IPU_ES_SUPPORT)) { if (CONFIG(ACPI_ADL_IPU_ES_SUPPORT)) {
u32 cpu_id = cpu_get_cpuid(); u32 cpu_id = cpu_get_cpuid();
if (cpu_id == CPUID_ALDERLAKE_A0 || cpu_id == CPUID_ALDERLAKE_A1 || if (cpu_id == CPUID_ALDERLAKE_J0 || cpu_id == CPUID_ALDERLAKE_Q0 ||
cpu_id == CPUID_ALDERLAKE_N_A0) cpu_id == CPUID_ALDERLAKE_N_A0)
acpi_dp_add_integer(dsd, "is_es", 1); acpi_dp_add_integer(dsd, "is_es", 1);
else else

View File

@ -51,10 +51,10 @@
#define CPUID_ELKHARTLAKE_A0 0x90660 #define CPUID_ELKHARTLAKE_A0 0x90660
#define CPUID_ELKHARTLAKE_B0 0x90661 #define CPUID_ELKHARTLAKE_B0 0x90661
#define CPUID_ALDERLAKE_S_A0 0x90670 #define CPUID_ALDERLAKE_S_A0 0x90670
#define CPUID_ALDERLAKE_A0 0x906a0 #define CPUID_ALDERLAKE_J0 0x906a0
#define CPUID_ALDERLAKE_A1 0x906a1 #define CPUID_ALDERLAKE_Q0 0x906a1
#define CPUID_ALDERLAKE_A2 0x906a2 #define CPUID_ALDERLAKE_K0 0x906a2
#define CPUID_ALDERLAKE_A3 0x906a4 #define CPUID_ALDERLAKE_R0 0x906a4
#define CPUID_ALDERLAKE_N_A0 0xb06e0 #define CPUID_ALDERLAKE_N_A0 0xb06e0
#define CPUID_METEORLAKE_A0_1 0xa06a0 #define CPUID_METEORLAKE_A0_1 0xa06a0
#define CPUID_METEORLAKE_A0_2 0xa06a1 #define CPUID_METEORLAKE_A0_2 0xa06a1

View File

@ -45,7 +45,7 @@ void configure_pmc_descriptor(void)
uint8_t si_desc_buf[CONFIG_SI_DESC_REGION_SZ]; uint8_t si_desc_buf[CONFIG_SI_DESC_REGION_SZ];
struct region_device desc_rdev; struct region_device desc_rdev;
if (cpu_get_cpuid() != CPUID_ALDERLAKE_A0) if (cpu_get_cpuid() != CPUID_ALDERLAKE_J0)
return; return;
if (fmap_locate_area_as_rdev_rw(CONFIG_SI_DESC_REGION, &desc_rdev) < 0) { if (fmap_locate_area_as_rdev_rw(CONFIG_SI_DESC_REGION, &desc_rdev) < 0) {

View File

@ -23,10 +23,10 @@ static struct {
u32 cpuid; u32 cpuid;
const char *name; const char *name;
} cpu_table[] = { } cpu_table[] = {
{ CPUID_ALDERLAKE_A0, "Alderlake Platform" }, { CPUID_ALDERLAKE_J0, "Alderlake J0 Platform" },
{ CPUID_ALDERLAKE_A1, "Alderlake Platform" }, { CPUID_ALDERLAKE_K0, "Alderlake K0 Platform" },
{ CPUID_ALDERLAKE_A2, "Alderlake Platform" }, { CPUID_ALDERLAKE_Q0, "Alderlake Q0 Platform" },
{ CPUID_ALDERLAKE_A3, "Alderlake Platform" }, { CPUID_ALDERLAKE_R0, "Alderlake R0 Platform" },
{ CPUID_ALDERLAKE_N_A0, "Alderlake-N Platform" }, { CPUID_ALDERLAKE_N_A0, "Alderlake-N Platform" },
}; };

View File

@ -273,7 +273,7 @@ static void fill_fspm_vtd_params(FSP_M_CONFIG *m_cfg,
const uint32_t cpuid = cpu_get_cpuid(); const uint32_t cpuid = cpu_get_cpuid();
/* Disable VT-d for early silicon steppings as it results in a CPU hard hang */ /* Disable VT-d for early silicon steppings as it results in a CPU hard hang */
if (cpuid == CPUID_ALDERLAKE_A0 || cpuid == CPUID_ALDERLAKE_A1) { if (cpuid == CPUID_ALDERLAKE_J0 || cpuid == CPUID_ALDERLAKE_Q0) {
m_cfg->VtdDisable = 1; m_cfg->VtdDisable = 1;
return; return;
} }

View File

@ -27,7 +27,7 @@
bool skip_cse_sub_part_update(void) bool skip_cse_sub_part_update(void)
{ {
return cpu_get_cpuid() != CPUID_ALDERLAKE_A2; return cpu_get_cpuid() != CPUID_ALDERLAKE_K0;
} }
/* Save the DIMM information for SMBIOS table 17 */ /* Save the DIMM information for SMBIOS table 17 */

View File

@ -70,10 +70,10 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0 }, { X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0 },
{ X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0 }, { X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_A0 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_J0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_A1 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_K0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_A2 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_Q0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_A3 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_R0 },
{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0 },
{ 0, 0 }, { 0, 0 },
}; };