inteltool: Add PCI IDs for the C220 PCH series

Adds missing PCI IDs to allow tool to dump the
C220 PCH (8 series) southbridge.

Intel Document 328904 is the datasheet for this PCH.

Change-Id: I07a8f2e9cb0ee8677c8fe2c51881147ed81c1a35
Signed-off-by: Quan Tran <qeed.quan@gmail.com>
Reviewed-on: https://review.coreboot.org/27168
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

6 files changed, 112 insertions, 1 deletions

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 5e310359f7..c38051c911 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -852,7 +852,27 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
 		gpio_registers = lynxpoint_lp_gpio_registers;
 		size = ARRAY_SIZE(lynxpoint_lp_gpio_registers);
-	    break;
+		break;
+	case PCI_DEVICE_ID_INTEL_C8_MOBILE:
+	case PCI_DEVICE_ID_INTEL_C8_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_Z87:
+	case PCI_DEVICE_ID_INTEL_Z85:
+	case PCI_DEVICE_ID_INTEL_HM86:
+	case PCI_DEVICE_ID_INTEL_H87:
+	case PCI_DEVICE_ID_INTEL_HM87:
+	case PCI_DEVICE_ID_INTEL_Q85:
+	case PCI_DEVICE_ID_INTEL_Q87:
+	case PCI_DEVICE_ID_INTEL_QM87:
+	case PCI_DEVICE_ID_INTEL_B85:
+	case PCI_DEVICE_ID_INTEL_C222:
+	case PCI_DEVICE_ID_INTEL_C224:
+	case PCI_DEVICE_ID_INTEL_C226:
+	case PCI_DEVICE_ID_INTEL_H81:
+		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
+		gpio_registers = lynxpoint_lp_gpio_registers;
+		/* Shares register locations but has less of them */
+		size = 29;
+		break;
 	case PCI_DEVICE_ID_INTEL_3400:
 	case PCI_DEVICE_ID_INTEL_3420:
 	case PCI_DEVICE_ID_INTEL_3450:
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index 24d62e1208..d0b42794da 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -232,6 +232,21 @@ static const struct {
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM175, "HM175" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QM175, "QM175" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CM238, "CM238" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C8_MOBILE, "C8 Mobile"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C8_DESKTOP, "C8 Desktop"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z87, "Z87"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z85, "Z85"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM86, "HM86"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H87, "H87"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM87, "HM87"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q85, "Q85"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q87, "Q87"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QM87, "QM87"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_B85, "B85"},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C222, "C222"},
+	{ 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"},
 	/* Intel GPUs */
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_G35_EXPRESS,
 	  "Intel(R) G35 Express Chipset Family" },
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 3ca91cdb6d..5de73aaa05 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -184,6 +184,22 @@ static inline uint32_t inl(unsigned port)
 #define PCI_DEVICE_ID_INTEL_82B43		0x2e40
 #define PCI_DEVICE_ID_INTEL_82B43_2		0x2e90
 
+#define PCI_DEVICE_ID_INTEL_C8_MOBILE		0x8c41
+#define PCI_DEVICE_ID_INTEL_C8_DESKTOP		0x8c42
+#define PCI_DEVICE_ID_INTEL_Z87			0x8c44
+#define PCI_DEVICE_ID_INTEL_Z85			0x8c46
+#define PCI_DEVICE_ID_INTEL_HM86		0x8c49
+#define PCI_DEVICE_ID_INTEL_H87			0x8c4a
+#define PCI_DEVICE_ID_INTEL_HM87		0x8c4b
+#define PCI_DEVICE_ID_INTEL_Q85			0x8c4c
+#define PCI_DEVICE_ID_INTEL_Q87			0x8c4e
+#define PCI_DEVICE_ID_INTEL_QM87		0x8c4f
+#define PCI_DEVICE_ID_INTEL_B85			0x8c50
+#define PCI_DEVICE_ID_INTEL_C222		0x8c52
+#define PCI_DEVICE_ID_INTEL_C224		0x8c54
+#define PCI_DEVICE_ID_INTEL_C226		0x8c56
+#define PCI_DEVICE_ID_INTEL_H81			0x8c5c
+
 #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/powermgt.c b/util/inteltool/powermgt.c
index f022904eb0..45cbb338f6 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -730,6 +730,21 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_PREM:
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP:
 	case PCI_DEVICE_ID_INTEL_BAYTRAIL_LPC:
+	case PCI_DEVICE_ID_INTEL_C8_MOBILE:
+	case PCI_DEVICE_ID_INTEL_C8_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_Z87:
+	case PCI_DEVICE_ID_INTEL_Z85:
+	case PCI_DEVICE_ID_INTEL_HM86:
+	case PCI_DEVICE_ID_INTEL_H87:
+	case PCI_DEVICE_ID_INTEL_HM87:
+	case PCI_DEVICE_ID_INTEL_Q85:
+	case PCI_DEVICE_ID_INTEL_Q87:
+	case PCI_DEVICE_ID_INTEL_QM87:
+	case PCI_DEVICE_ID_INTEL_B85:
+	case PCI_DEVICE_ID_INTEL_C222:
+	case PCI_DEVICE_ID_INTEL_C224:
+	case PCI_DEVICE_ID_INTEL_C226:
+	case PCI_DEVICE_ID_INTEL_H81:
 		pmbase = pci_read_word(sb, 0x40) & 0xff80;
 		pm_registers = pch_pm_registers;
 		size = ARRAY_SIZE(pch_pm_registers);
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index 2ad3410486..76cb287b27 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -97,6 +97,21 @@ int print_rcba(struct pci_dev *sb)
 	case PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_BASE:
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_PREM:
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP:
+	case PCI_DEVICE_ID_INTEL_C8_MOBILE:
+	case PCI_DEVICE_ID_INTEL_C8_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_Z87:
+	case PCI_DEVICE_ID_INTEL_Z85:
+	case PCI_DEVICE_ID_INTEL_HM86:
+	case PCI_DEVICE_ID_INTEL_H87:
+	case PCI_DEVICE_ID_INTEL_HM87:
+	case PCI_DEVICE_ID_INTEL_Q85:
+	case PCI_DEVICE_ID_INTEL_Q87:
+	case PCI_DEVICE_ID_INTEL_QM87:
+	case PCI_DEVICE_ID_INTEL_B85:
+	case PCI_DEVICE_ID_INTEL_C222:
+	case PCI_DEVICE_ID_INTEL_C224:
+	case PCI_DEVICE_ID_INTEL_C226:
+	case PCI_DEVICE_ID_INTEL_H81:
 		rcba_phys = pci_read_long(sb, 0xf0) & 0xfffffffe;
 		break;
 	case PCI_DEVICE_ID_INTEL_ICH:
diff --git a/util/inteltool/spi.c b/util/inteltool/spi.c
index 6d11fa5ebe..18600b66b1 100644
--- a/util/inteltool/spi.c
+++ b/util/inteltool/spi.c
@@ -160,6 +160,21 @@ int print_bioscntl(struct pci_dev *sb)
 	case PCI_DEVICE_ID_INTEL_HM75:
 	case PCI_DEVICE_ID_INTEL_HM70:
 	case PCI_DEVICE_ID_INTEL_NM70:
+	case PCI_DEVICE_ID_INTEL_C8_MOBILE:
+	case PCI_DEVICE_ID_INTEL_C8_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_Z87:
+	case PCI_DEVICE_ID_INTEL_Z85:
+	case PCI_DEVICE_ID_INTEL_HM86:
+	case PCI_DEVICE_ID_INTEL_H87:
+	case PCI_DEVICE_ID_INTEL_HM87:
+	case PCI_DEVICE_ID_INTEL_Q85:
+	case PCI_DEVICE_ID_INTEL_Q87:
+	case PCI_DEVICE_ID_INTEL_QM87:
+	case PCI_DEVICE_ID_INTEL_B85:
+	case PCI_DEVICE_ID_INTEL_C222:
+	case PCI_DEVICE_ID_INTEL_C224:
+	case PCI_DEVICE_ID_INTEL_C226:
+	case PCI_DEVICE_ID_INTEL_H81:
 		bios_cntl = pci_read_byte(sb, 0xdc);
 		bios_cntl_register = pch_bios_cntl_registers;
 		size = ARRAY_SIZE(pch_bios_cntl_registers);
@@ -273,6 +288,21 @@ int print_spibar(struct pci_dev *sb) {
 	case PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_BASE:
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_PREM:
 	case PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP:
+	case PCI_DEVICE_ID_INTEL_C8_MOBILE:
+	case PCI_DEVICE_ID_INTEL_C8_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_Z87:
+	case PCI_DEVICE_ID_INTEL_Z85:
+	case PCI_DEVICE_ID_INTEL_HM86:
+	case PCI_DEVICE_ID_INTEL_H87:
+	case PCI_DEVICE_ID_INTEL_HM87:
+	case PCI_DEVICE_ID_INTEL_Q85:
+	case PCI_DEVICE_ID_INTEL_Q87:
+	case PCI_DEVICE_ID_INTEL_QM87:
+	case PCI_DEVICE_ID_INTEL_B85:
+	case PCI_DEVICE_ID_INTEL_C222:
+	case PCI_DEVICE_ID_INTEL_C224:
+	case PCI_DEVICE_ID_INTEL_C226:
+	case PCI_DEVICE_ID_INTEL_H81:
 		spibaroffset = ICH9_SPIBAR;
 		rcba_phys = pci_read_long(sb, 0xf0) & 0xfffffffe;
 		size = ARRAY_SIZE(spi_bar_registers);