diff options
| -rw-r--r-- | src/include/device/pci_ids.h | 28 | ||||
| -rw-r--r-- | src/soc/intel/common/block/graphics/graphics.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/common/block/systemagent/systemagent.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/bootblock/report_platform.c | 30 |
4 files changed, 39 insertions, 26 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 51e98aec1a..eeb23aeea3 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -3792,6 +3792,7 @@ #define PCI_DEVICE_ID_INTEL_EHL_GT1_1 0x4541 #define PCI_DEVICE_ID_INTEL_EHL_GT2_1 0x4540 #define PCI_DEVICE_ID_INTEL_EHL_GT1_2 0x4551 +#define PCI_DEVICE_ID_INTEL_EHL_GT1_2_1 0x4555 #define PCI_DEVICE_ID_INTEL_EHL_GT2_2 0x4550 #define PCI_DEVICE_ID_INTEL_EHL_GT1_3 0x4571 #define PCI_DEVICE_ID_INTEL_EHL_GT2_3 0x4570 @@ -3876,18 +3877,21 @@ #define PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2 0x9A14 #define PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2 0x9A02 #define PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2 0x9A12 -#define PCI_DEVICE_ID_INTEL_JSL_EHL 0x4532 -#define PCI_DEVICE_ID_INTEL_EHL_ID_1 0x4510 -#define PCI_DEVICE_ID_INTEL_EHL_ID_2 0x4522 -#define PCI_DEVICE_ID_INTEL_EHL_ID_3 0x4524 -#define PCI_DEVICE_ID_INTEL_EHL_ID_4 0x4512 -#define PCI_DEVICE_ID_INTEL_EHL_ID_5 0x4526 -#define PCI_DEVICE_ID_INTEL_EHL_ID_6 0x4514 -#define PCI_DEVICE_ID_INTEL_EHL_ID_7 0x4528 -#define PCI_DEVICE_ID_INTEL_EHL_ID_8 0x452A -#define PCI_DEVICE_ID_INTEL_EHL_ID_9 0x4516 -#define PCI_DEVICE_ID_INTEL_EHL_ID_10 0x452C -#define PCI_DEVICE_ID_INTEL_EHL_ID_11 0x452E +#define PCI_DEVICE_ID_INTEL_EHL_ID_0 0x4510 +#define PCI_DEVICE_ID_INTEL_EHL_ID_1 0x4522 +#define PCI_DEVICE_ID_INTEL_EHL_ID_1A 0x4538 +#define PCI_DEVICE_ID_INTEL_EHL_ID_2 0x4524 +#define PCI_DEVICE_ID_INTEL_EHL_ID_2_1 0x453A +#define PCI_DEVICE_ID_INTEL_EHL_ID_3 0x4512 +#define PCI_DEVICE_ID_INTEL_EHL_ID_3A 0x451E +#define PCI_DEVICE_ID_INTEL_EHL_ID_4 0x4526 +#define PCI_DEVICE_ID_INTEL_EHL_ID_5 0x4514 +#define PCI_DEVICE_ID_INTEL_EHL_ID_6 0x4528 +#define PCI_DEVICE_ID_INTEL_EHL_ID_7 0x452A +#define PCI_DEVICE_ID_INTEL_EHL_ID_8 0x4516 +#define PCI_DEVICE_ID_INTEL_EHL_ID_9 0x452C +#define PCI_DEVICE_ID_INTEL_EHL_ID_10 0x452E +#define PCI_DEVICE_ID_INTEL_EHL_ID_11 0x4532 #define PCI_DEVICE_ID_INTEL_EHL_ID_12 0x4518 #define PCI_DEVICE_ID_INTEL_EHL_ID_13 0x451A #define PCI_DEVICE_ID_INTEL_JSL_ID_1 0x4e22 diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index e5af85f750..80f13c6291 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -277,6 +277,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_EHL_GT2_1, PCI_DEVICE_ID_INTEL_EHL_GT1_2, PCI_DEVICE_ID_INTEL_EHL_GT2_2, + PCI_DEVICE_ID_INTEL_EHL_GT1_2_1, PCI_DEVICE_ID_INTEL_EHL_GT1_3, PCI_DEVICE_ID_INTEL_EHL_GT2_3, PCI_DEVICE_ID_INTEL_JSL_GT1, diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index 19d4522d95..17a6cc73de 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -375,10 +375,13 @@ static const unsigned short systemagent_ids[] = { PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, - PCI_DEVICE_ID_INTEL_JSL_EHL, + PCI_DEVICE_ID_INTEL_EHL_ID_0, PCI_DEVICE_ID_INTEL_EHL_ID_1, + PCI_DEVICE_ID_INTEL_EHL_ID_1A, PCI_DEVICE_ID_INTEL_EHL_ID_2, + PCI_DEVICE_ID_INTEL_EHL_ID_2_1, PCI_DEVICE_ID_INTEL_EHL_ID_3, + PCI_DEVICE_ID_INTEL_EHL_ID_3A, PCI_DEVICE_ID_INTEL_EHL_ID_4, PCI_DEVICE_ID_INTEL_EHL_ID_5, PCI_DEVICE_ID_INTEL_EHL_ID_6, @@ -388,6 +391,7 @@ static const unsigned short systemagent_ids[] = { PCI_DEVICE_ID_INTEL_EHL_ID_10, PCI_DEVICE_ID_INTEL_EHL_ID_11, PCI_DEVICE_ID_INTEL_EHL_ID_12, + PCI_DEVICE_ID_INTEL_EHL_ID_13, PCI_DEVICE_ID_INTEL_JSL_ID_1, PCI_DEVICE_ID_INTEL_JSL_ID_2, PCI_DEVICE_ID_INTEL_JSL_ID_3, diff --git a/src/soc/intel/elkhartlake/bootblock/report_platform.c b/src/soc/intel/elkhartlake/bootblock/report_platform.c index 1dd31975ac..7d9e9f4e82 100644 --- a/src/soc/intel/elkhartlake/bootblock/report_platform.c +++ b/src/soc/intel/elkhartlake/bootblock/report_platform.c @@ -18,25 +18,28 @@ static struct { const char *name; } cpu_table[] = { { CPUID_ELKHARTLAKE_A0, "Elkhartlake A0" }, - { CPUID_ELKHARTLAKE_B0, "Elkhartlake B0" }, + { CPUID_ELKHARTLAKE_B0, "Elkhartlake B0/B1" }, }; static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_EHL_ID_1, "Elkhartlake SKU-0" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_2, "Elkhartlake SKU-1" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_3, "Elkhartlake SKU-2" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_4, "Elkhartlake SKU-3" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_5, "Elkhartlake SKU-4" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_6, "Elkhartlake SKU-5" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_7, "Elkhartlake SKU-6" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_8, "Elkhartlake SKU-7" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_9, "Elkhartlake SKU-8" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_10, "Elkhartlake SKU-9" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_11, "Elkhartlake SKU-10" }, - { PCI_DEVICE_ID_INTEL_JSL_EHL, "Elkhartlake SKU-11" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_0, "Elkhartlake SKU-0" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_1, "Elkhartlake SKU-1" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_1A, "Elkhartlake SKU-1A" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_2, "Elkhartlake SKU-2" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_2_1, "Elkhartlake SKU-2" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_3, "Elkhartlake SKU-3" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_3A, "Elkhartlake SKU-3A" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_4, "Elkhartlake SKU-4" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_5, "Elkhartlake SKU-5" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_6, "Elkhartlake SKU-6" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_7, "Elkhartlake SKU-7" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_8, "Elkhartlake SKU-8" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_9, "Elkhartlake SKU-9" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_10, "Elkhartlake SKU-10" }, + { PCI_DEVICE_ID_INTEL_EHL_ID_11, "Elkhartlake SKU-11" }, { PCI_DEVICE_ID_INTEL_EHL_ID_12, "Elkhartlake SKU-12" }, { PCI_DEVICE_ID_INTEL_EHL_ID_13, "Elkhartlake SKU-13" }, }; @@ -59,6 +62,7 @@ static struct { { PCI_DEVICE_ID_INTEL_EHL_GT1_1, "Elkhartlake GT1-1" }, { PCI_DEVICE_ID_INTEL_EHL_GT2_1, "Elkhartlake GT2-1" }, { PCI_DEVICE_ID_INTEL_EHL_GT1_2, "Elkhartlake GT1-2" }, + { PCI_DEVICE_ID_INTEL_EHL_GT1_2_1, "Elkhartlake GT1-2-1" }, { PCI_DEVICE_ID_INTEL_EHL_GT2_2, "Elkhartlake GT2-2" }, { PCI_DEVICE_ID_INTEL_EHL_GT1_3, "Elkhartlake GT1-3" }, { PCI_DEVICE_ID_INTEL_EHL_GT2_3, "Elkhartlake GT2-3" }, |