From aa4cd73409db2564a8d50ce952b083a8148e88f0 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 7 Oct 2022 00:18:04 +0200 Subject: [PATCH] util/inteltool: Add 9 series PCH support Add the PCI device IDs for 9 series PCHs. Change-Id: Id216cd071b09c93ee6a4792944c6fad39254aa3b Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/68185 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- util/inteltool/gpio.c | 5 +++++ util/inteltool/inteltool.c | 5 +++++ util/inteltool/inteltool.h | 6 ++++++ util/inteltool/iobp.c | 5 +++++ util/inteltool/powermgt.c | 5 +++++ util/inteltool/rootcmplx.c | 5 +++++ util/inteltool/spi.c | 10 ++++++++++ 7 files changed, 41 insertions(+) diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c index aa525929fe..2f27ac30ef 100644 --- a/util/inteltool/gpio.c +++ b/util/inteltool/gpio.c @@ -856,6 +856,11 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs) case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: gpiobase = pci_read_word(sb, 0x48) & 0xfffc; gpio_registers = pch_gpio_registers; size = ARRAY_SIZE(pch_gpio_registers); diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 2c2b950b53..743cd1a108 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -370,6 +370,11 @@ static const struct { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C224, "C224"}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C226, "C226"}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H81, "H81"}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C9_MOBILE, "C9 Mobile"}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C9_DESKTOP, "C9 Desktop"}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM97, "HM97"}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z97, "Z97"}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H97, "H97"}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL_LPC, "Apollo Lake" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_LPC, "Denverton" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK_LPC, "Gemini Lake" }, diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 3b43b39804..44201b120c 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -277,6 +277,12 @@ static inline uint32_t inl(unsigned port) #define PCI_DEVICE_ID_INTEL_C226 0x8c56 #define PCI_DEVICE_ID_INTEL_H81 0x8c5c +#define PCI_DEVICE_ID_INTEL_C9_MOBILE 0x8cc1 +#define PCI_DEVICE_ID_INTEL_C9_DESKTOP 0x8cc2 +#define PCI_DEVICE_ID_INTEL_HM97 0x8cc3 +#define PCI_DEVICE_ID_INTEL_Z97 0x8cc4 +#define PCI_DEVICE_ID_INTEL_H97 0x8cc6 + #define PCI_DEVICE_ID_INTEL_82X58 0x3405 #define PCI_DEVICE_ID_INTEL_SCH_POULSBO 0x8100 #define PCI_DEVICE_ID_INTEL_ATOM_DXXX 0xa000 diff --git a/util/inteltool/iobp.c b/util/inteltool/iobp.c index e6c41858c3..461dbd642b 100644 --- a/util/inteltool/iobp.c +++ b/util/inteltool/iobp.c @@ -291,6 +291,11 @@ void print_iobp(struct pci_dev *sb, volatile uint8_t *rcba) case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: iobp_registers = lynxpoint_iobp_registers; iobp_size = ARRAY_SIZE(lynxpoint_iobp_registers); break; diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c index 9e98809367..716b85ce03 100644 --- a/util/inteltool/powermgt.c +++ b/util/inteltool/powermgt.c @@ -766,6 +766,11 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc) case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: pmbase = pci_read_word(sb, 0x40) & 0xff80; pm_registers = pch_pm_registers; pm_registers_size = ARRAY_SIZE(pch_pm_registers); diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c index bdafa1ef55..eee6899753 100644 --- a/util/inteltool/rootcmplx.c +++ b/util/inteltool/rootcmplx.c @@ -101,6 +101,11 @@ int print_rcba(struct pci_dev *sb) case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL: diff --git a/util/inteltool/spi.c b/util/inteltool/spi.c index 1bb5ba2727..3cf60515d8 100644 --- a/util/inteltool/spi.c +++ b/util/inteltool/spi.c @@ -177,6 +177,11 @@ static int print_bioscntl(struct pci_dev *sb) case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: case PCI_DEVICE_ID_INTEL_H110: case PCI_DEVICE_ID_INTEL_H170: case PCI_DEVICE_ID_INTEL_Z170: @@ -331,6 +336,11 @@ static int print_spibar(struct pci_dev *sb) { case PCI_DEVICE_ID_INTEL_C224: case PCI_DEVICE_ID_INTEL_C226: case PCI_DEVICE_ID_INTEL_H81: + case PCI_DEVICE_ID_INTEL_C9_MOBILE: + case PCI_DEVICE_ID_INTEL_C9_DESKTOP: + case PCI_DEVICE_ID_INTEL_HM97: + case PCI_DEVICE_ID_INTEL_Z97: + case PCI_DEVICE_ID_INTEL_H97: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL: