From c3244ccca7b05f8b6f9b0ca996bd962fe5dd6b82 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 29 Jul 2019 22:54:09 +0200 Subject: soc/intel/skl: Add C232 chipset and reorder IDs This patch ... - adds the PCH ID for C232 chipset, - renames "Premium" chipset to "HM170" (because of same IDs), - reorders the Skylake-H PCH IDs ascending by hex values. Used documents: - Intel 332690-005EN Change-Id: I859975fe7bcd3c10dead8fe150a2fbead9c64a51 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/34619 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/include/device/pci_ids.h | 7 ++++--- src/soc/intel/common/block/lpc/lpc.c | 7 ++++--- src/soc/intel/skylake/bootblock/report_platform.c | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index b3822103f2..1aac48e9aa 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -2699,16 +2699,17 @@ #define PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE 0x9d43 #define PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM 0x9d48 #define PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM 0x9d46 +#define PCI_DEVICE_ID_INTEL_SPT_H_H110 0xa143 #define PCI_DEVICE_ID_INTEL_SPT_H_H170 0xa144 #define PCI_DEVICE_ID_INTEL_SPT_H_Z170 0xa145 #define PCI_DEVICE_ID_INTEL_SPT_H_Q170 0xa146 #define PCI_DEVICE_ID_INTEL_SPT_H_Q150 0xa147 #define PCI_DEVICE_ID_INTEL_SPT_H_B150 0xa148 #define PCI_DEVICE_ID_INTEL_SPT_H_C236 0xa149 -#define PCI_DEVICE_ID_INTEL_SPT_H_CM236 0xa150 -#define PCI_DEVICE_ID_INTEL_SPT_H_PREMIUM 0xa14e -#define PCI_DEVICE_ID_INTEL_SPT_H_H110 0xa143 +#define PCI_DEVICE_ID_INTEL_SPT_H_C232 0xa14a #define PCI_DEVICE_ID_INTEL_SPT_H_QM170 0xa14d +#define PCI_DEVICE_ID_INTEL_SPT_H_HM170 0xa14e +#define PCI_DEVICE_ID_INTEL_SPT_H_CM236 0xa150 #define PCI_DEVICE_ID_INTEL_SPT_H_HM175 0xa152 #define PCI_DEVICE_ID_INTEL_SPT_H_QM175 0xa153 #define PCI_DEVICE_ID_INTEL_SPT_H_CM238 0xa154 diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 8f809f97f6..d7917d6262 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -124,16 +124,17 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, - PCI_DEVICE_ID_INTEL_SPT_H_CM236, - PCI_DEVICE_ID_INTEL_SPT_H_C236, - PCI_DEVICE_ID_INTEL_SPT_H_PREMIUM, PCI_DEVICE_ID_INTEL_SPT_H_H110, PCI_DEVICE_ID_INTEL_SPT_H_H170, PCI_DEVICE_ID_INTEL_SPT_H_Z170, PCI_DEVICE_ID_INTEL_SPT_H_Q170, PCI_DEVICE_ID_INTEL_SPT_H_Q150, PCI_DEVICE_ID_INTEL_SPT_H_B150, + PCI_DEVICE_ID_INTEL_SPT_H_C236, + PCI_DEVICE_ID_INTEL_SPT_H_C232, PCI_DEVICE_ID_INTEL_SPT_H_QM170, + PCI_DEVICE_ID_INTEL_SPT_H_HM170, + PCI_DEVICE_ID_INTEL_SPT_H_CM236, PCI_DEVICE_ID_INTEL_SPT_H_HM175, PCI_DEVICE_ID_INTEL_SPT_H_QM175, PCI_DEVICE_ID_INTEL_SPT_H_CM238, diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c index 6733f912dc..a643bbedf2 100644 --- a/src/soc/intel/skylake/bootblock/report_platform.c +++ b/src/soc/intel/skylake/bootblock/report_platform.c @@ -73,16 +73,17 @@ static struct { { PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, "Skylake-U Base" }, { PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, "Skylake-U Premium" }, { PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, "Skylake-Y Premium" }, - { PCI_DEVICE_ID_INTEL_SPT_H_PREMIUM, "Skylake PCH-H Premium" }, { PCI_DEVICE_ID_INTEL_SPT_H_H110, "Skylake PCH-H H110" }, { PCI_DEVICE_ID_INTEL_SPT_H_H170, "Skylake PCH-H H170" }, { PCI_DEVICE_ID_INTEL_SPT_H_Z170, "Skylake PCH-H Z170" }, { PCI_DEVICE_ID_INTEL_SPT_H_Q170, "Skylake PCH-H Q170" }, { PCI_DEVICE_ID_INTEL_SPT_H_Q150, "Skylake PCH-H Q150" }, { PCI_DEVICE_ID_INTEL_SPT_H_B150, "Skylake PCH-H B150" }, - { PCI_DEVICE_ID_INTEL_SPT_H_CM236, "Skylake PCH-H CM236" }, { PCI_DEVICE_ID_INTEL_SPT_H_C236, "Skylake PCH-H C236" }, + { PCI_DEVICE_ID_INTEL_SPT_H_C232, "Skylake PCH-H C232" }, { PCI_DEVICE_ID_INTEL_SPT_H_QM170, "Skylake PCH-H QM170" }, + { PCI_DEVICE_ID_INTEL_SPT_H_HM170, "Skylake PCH-H HM170" }, + { PCI_DEVICE_ID_INTEL_SPT_H_CM236, "Skylake PCH-H CM236" }, { PCI_DEVICE_ID_INTEL_SPT_H_HM175, "Skylake PCH-H HM175" }, { PCI_DEVICE_ID_INTEL_SPT_H_QM175, "Skylake PCH-H QM175" }, { PCI_DEVICE_ID_INTEL_SPT_H_CM238, "Skylake PCH-H CM238" }, -- cgit v1.2.3