summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2019-07-28 13:27:11 +0200
committerNico Huber <nico.h@gmx.de>2019-07-30 10:32:48 +0000
commitd298ffe208f438f08192cab85e7f5ddda9bcb465 (patch)
tree2fc1d274bb5792d5bb71b1471218cf23f0fe2e98 /src
parent378352540d57d98055e6183aff4f0af81aeadf89 (diff)
downloadcoreboot-d298ffe208f438f08192cab85e7f5ddda9bcb465.tar.xz
soc/intel/cannonlake: Add new PCI IDs
* PCH IDs: H310, H370, Z390, B360, C242, HM370 * IGD IDs: Another variant of UHD-Graphics 630 * MCH/CPU IDs: Used at i3-8100 Used documents: * 337347-005 TESTED=Gigabyte Z390M Gaming Change-Id: I5be88ef23359c6429b18f17bcffbffb7f10ba028 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34600 Reviewed-by: Christian Walter <christian.walter@9elements.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/include/device/pci_ids.h10
-rw-r--r--src/soc/intel/cannonlake/bootblock/report_platform.c11
-rw-r--r--src/soc/intel/common/block/cpu/mp_init.c1
-rw-r--r--src/soc/intel/common/block/graphics/graphics.c1
-rw-r--r--src/soc/intel/common/block/include/intelblocks/mp_init.h1
-rw-r--r--src/soc/intel/common/block/lpc/lpc.c8
-rw-r--r--src/soc/intel/common/block/systemagent/systemagent.c1
7 files changed, 30 insertions, 3 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 26b1237639..b3822103f2 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2729,9 +2729,15 @@
#define PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC 0x9d85
#define PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC 0x9d84
#define PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC 0x9d83
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310 0xa303
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370 0xa304
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390 0xa305
#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370 0xa306
-#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370 0xa30c
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360 0xa308
#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246 0xa309
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242 0xa30a
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370 0xa30c
+#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370 0xa30d
#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246 0xa30e
#define PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI 0x3480
#define PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI_REV0 0x3481
@@ -3052,6 +3058,7 @@
#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_1 0x3e92
#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_2 0x3e98
#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_3 0x3e9a
+#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_4 0x3e91
#define PCI_DEVICE_ID_INTEL_ICL_GT0_ULT 0x8A70
#define PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT 0x8A71
#define PCI_DEVICE_ID_INTEL_ICL_GT1_ULT 0x8A40
@@ -3114,6 +3121,7 @@
#define PCI_DEVICE_ID_INTEL_CFL_ID_H 0x3ec4
#define PCI_DEVICE_ID_INTEL_CFL_ID_H_8 0x3e20
#define PCI_DEVICE_ID_INTEL_CFL_ID_S 0x3ec2
+#define PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4 0x3e1f
#define PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8 0x3e30
#define PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8 0x3e31
#define PCI_DEVICE_ID_INTEL_ICL_ID_U 0x8A12
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 4bb06fb347..480b3b835b 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -40,6 +40,7 @@ static struct {
{ CPUID_WHISKEYLAKE_V0, "Whiskeylake V0" },
{ CPUID_WHISKEYLAKE_W0, "Whiskeylake W0" },
{ CPUID_COFFEELAKE_U0, "Coffeelake U0 (6+2)" },
+ { CPUID_COFFEELAKE_B0, "Coffeelake B0" },
{ CPUID_COFFEELAKE_P0, "Coffeelake P0" },
{ CPUID_COFFEELAKE_R0, "Coffeelake R0" },
{ CPUID_COMETLAKE_U_A0, "Cometlake-U A0 (6+2)" },
@@ -60,6 +61,7 @@ static struct {
{ PCI_DEVICE_ID_INTEL_CFL_ID_H, "Coffeelake-H" },
{ PCI_DEVICE_ID_INTEL_CFL_ID_H_8, "Coffeelake-H (8+2)" },
{ PCI_DEVICE_ID_INTEL_CFL_ID_S, "Coffeelake-S" },
+ { PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4, "Coffeelake-S DT(4)" },
{ PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8, "Coffeelake-S DT(8+2)" },
{ PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8, "Coffeelake-S WS(8+2)" },
{ PCI_DEVICE_ID_INTEL_CML_ULT, "CometLake-U (4+2)" },
@@ -79,9 +81,15 @@ static struct {
{ PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC, "Cannonlake-U Base" },
{ PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC, "Cannonlake-U Premium" },
{ PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC, "Cannonlake-Y Premium" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310, "Cannonlake-H H310" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370, "Cannonlake-H H370" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390, "Cannonlake-H Z390" },
{ PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370, "Cannonlake-H Q370" },
- { PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, "Cannonlake-H QM370" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360, "Cannonlake-H B360" },
{ PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246, "Cannonlake-H C246" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242, "Cannonlake-H C242" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, "Cannonlake-H QM370" },
+ { PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370, "Cannonlake-H HM370" },
{ PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246, "Cannonlake-H CM246" },
{ PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC, "Cometlake-U Super" },
{ PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC, "Cometlake-Y Premium" },
@@ -110,6 +118,7 @@ static struct {
{ PCI_DEVICE_ID_INTEL_CFL_S_GT2_1, "Coffeelake-S GT2" },
{ PCI_DEVICE_ID_INTEL_CFL_S_GT2_2, "Coffeelake-S GT2" },
{ PCI_DEVICE_ID_INTEL_CFL_S_GT2_3, "Coffeelake-S GT2" },
+ { PCI_DEVICE_ID_INTEL_CFL_S_GT2_4, "Coffeelake-S GT2" },
{ PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1, "CometLake ULT GT1" },
{ PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2, "CometLake ULT GT1" },
{ PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1, "CometLake ULT GT2" },
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 12417097c5..d941ab28bb 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -74,6 +74,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_V0 },
{ X86_VENDOR_INTEL, CPUID_WHISKEYLAKE_W0 },
{ X86_VENDOR_INTEL, CPUID_COFFEELAKE_U0 },
+ { X86_VENDOR_INTEL, CPUID_COFFEELAKE_B0 },
{ X86_VENDOR_INTEL, CPUID_COFFEELAKE_D0 },
{ X86_VENDOR_INTEL, CPUID_COFFEELAKE_P0 },
{ X86_VENDOR_INTEL, CPUID_COFFEELAKE_R0 },
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 26e1cb81aa..2b4c4a74db 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -154,6 +154,7 @@ static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_INTEL_CFL_S_GT2_1,
PCI_DEVICE_ID_INTEL_CFL_S_GT2_2,
PCI_DEVICE_ID_INTEL_CFL_S_GT2_3,
+ PCI_DEVICE_ID_INTEL_CFL_S_GT2_4,
PCI_DEVICE_ID_INTEL_ICL_GT0_ULT,
PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT,
PCI_DEVICE_ID_INTEL_ICL_GT1_ULT,
diff --git a/src/soc/intel/common/block/include/intelblocks/mp_init.h b/src/soc/intel/common/block/include/intelblocks/mp_init.h
index 11f1aa652a..5ef7641a3a 100644
--- a/src/soc/intel/common/block/include/intelblocks/mp_init.h
+++ b/src/soc/intel/common/block/include/intelblocks/mp_init.h
@@ -42,6 +42,7 @@
#define CPUID_WHISKEYLAKE_W0 0x806eb
#define CPUID_COFFEELAKE_D0 0x806ea
#define CPUID_COFFEELAKE_U0 0x906ea
+#define CPUID_COFFEELAKE_B0 0x906eb
#define CPUID_COFFEELAKE_P0 0x906ec
#define CPUID_COFFEELAKE_R0 0x906ed
#define CPUID_ICELAKE_A0 0x706e0
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index 1a4d295bb2..8f809f97f6 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -154,9 +154,15 @@ static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC,
PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC,
PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390,
PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370,
- PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360,
PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370,
+ PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370,
PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246,
PCI_DEVICE_ID_INTEL_ICL_BASE_U_ESPI,
PCI_DEVICE_ID_INTEL_ICL_BASE_Y_ESPI,
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index 420f8b89d7..c9abb55490 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -359,6 +359,7 @@ static const unsigned short systemagent_ids[] = {
PCI_DEVICE_ID_INTEL_CFL_ID_H,
PCI_DEVICE_ID_INTEL_CFL_ID_H_8,
PCI_DEVICE_ID_INTEL_CFL_ID_S,
+ PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4,
PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8,
PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8,
PCI_DEVICE_ID_INTEL_ICL_ID_U,