[coreboot-gerrit] New patch to review for coreboot: bf3aaa4 inteltool: refine GPIO and PMBASE/TCO printing on Ibex Peak/5 Series

[Stefan Tauner (stefan.tauner@gmx.at)]

Stefan Tauner (stefan.tauner at gmx.at) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7239

-gerrit

commit bf3aaa40d9521c70d3203119b51416011dc4a553
Author: Stefan Tauner <stefan.tauner at gmx.at>
Date:   Wed Oct 29 01:14:35 2014 +0100

    inteltool: refine GPIO and PMBASE/TCO printing on Ibex Peak/5 Series
    
    Nicolas Reinecke was noticing that in my Lenovo T410s logs the GPIO*3
    settings were missing. This led to some investigation and this patch, thanks!
    
    Change-Id: I7ba28aa00d10f988a7fe81e61d2e216b54a11006
    Signed-off-by: Stefan Tauner <stefan.tauner at gmx.at>
---
 util/inteltool/gpio.c     | 29 ++++++++++++++++++-----------
 util/inteltool/powermgt.c | 22 +++++++++++-----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 49c1325..924e97d 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -406,6 +406,24 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 		printf("\n============= GPIOS =============\n\n");
 
 	switch (sb->device_id) {
+	case PCI_DEVICE_ID_INTEL_P55:
+	case PCI_DEVICE_ID_INTEL_PM55:
+	case PCI_DEVICE_ID_INTEL_H55:
+	case PCI_DEVICE_ID_INTEL_QM57:
+	case PCI_DEVICE_ID_INTEL_H57:
+	case PCI_DEVICE_ID_INTEL_HM55:
+	case PCI_DEVICE_ID_INTEL_Q57:
+	case PCI_DEVICE_ID_INTEL_HM57:
+	case PCI_DEVICE_ID_INTEL_B55_A:
+	case PCI_DEVICE_ID_INTEL_B55_B:
+	case PCI_DEVICE_ID_INTEL_QS57:
+		gpiobase = pci_read_word(sb, 0x48) & 0xff80;
+		gpio_registers = pch_gpio_registers;
+		size = ARRAY_SIZE(pch_gpio_registers);
+		/* FIXME: add Ibex Peak defaults (and possibly split desktop/mobile)
+		gpio_defaults = ip_pch_desktop_defaults;
+		defaults_size = ARRAY_SIZE(ip_pch_desktop_defaults); */
+		break;
 	case PCI_DEVICE_ID_INTEL_Z68:
 	case PCI_DEVICE_ID_INTEL_P67:
 	case PCI_DEVICE_ID_INTEL_H67:
@@ -525,21 +543,10 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 
 	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
 	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
-	case PCI_DEVICE_ID_INTEL_P55:
-	case PCI_DEVICE_ID_INTEL_PM55:
-	case PCI_DEVICE_ID_INTEL_H55:
-	case PCI_DEVICE_ID_INTEL_QM57:
-	case PCI_DEVICE_ID_INTEL_H57:
-	case PCI_DEVICE_ID_INTEL_HM55:
-	case PCI_DEVICE_ID_INTEL_Q57:
-	case PCI_DEVICE_ID_INTEL_HM57:
 	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
-	case PCI_DEVICE_ID_INTEL_B55_A:
-	case PCI_DEVICE_ID_INTEL_QS57:
 	case PCI_DEVICE_ID_INTEL_3400:
 	case PCI_DEVICE_ID_INTEL_3420:
 	case PCI_DEVICE_ID_INTEL_3450:
-	case PCI_DEVICE_ID_INTEL_B55_B:
 		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
 		gpio_registers = i631x_gpio_registers;
 		size = ARRAY_SIZE(i631x_gpio_registers);
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 3bc4efc..8096790 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -656,6 +656,17 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 	printf("\n============= PMBASE ============\n\n");
 
 	switch (sb->device_id) {
+	case PCI_DEVICE_ID_INTEL_P55:
+	case PCI_DEVICE_ID_INTEL_PM55:
+	case PCI_DEVICE_ID_INTEL_H55:
+	case PCI_DEVICE_ID_INTEL_QM57:
+	case PCI_DEVICE_ID_INTEL_H57:
+	case PCI_DEVICE_ID_INTEL_HM55:
+	case PCI_DEVICE_ID_INTEL_Q57:
+	case PCI_DEVICE_ID_INTEL_HM57:
+	case PCI_DEVICE_ID_INTEL_B55_A:
+	case PCI_DEVICE_ID_INTEL_QS57:
+	case PCI_DEVICE_ID_INTEL_B55_B:
 	case PCI_DEVICE_ID_INTEL_Z68:
 	case PCI_DEVICE_ID_INTEL_P67:
 	case PCI_DEVICE_ID_INTEL_UM67:
@@ -763,21 +774,10 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 
 	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
 	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
-	case PCI_DEVICE_ID_INTEL_P55:
-	case PCI_DEVICE_ID_INTEL_PM55:
-	case PCI_DEVICE_ID_INTEL_H55:
-	case PCI_DEVICE_ID_INTEL_QM57:
-	case PCI_DEVICE_ID_INTEL_H57:
-	case PCI_DEVICE_ID_INTEL_HM55:
-	case PCI_DEVICE_ID_INTEL_Q57:
-	case PCI_DEVICE_ID_INTEL_HM57:
 	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
-	case PCI_DEVICE_ID_INTEL_B55_A:
-	case PCI_DEVICE_ID_INTEL_QS57:
 	case PCI_DEVICE_ID_INTEL_3400:
 	case PCI_DEVICE_ID_INTEL_3420:
 	case PCI_DEVICE_ID_INTEL_3450:
-	case PCI_DEVICE_ID_INTEL_B55_B:
 		pmbase = pci_read_word(sb, 0x40) & 0xfffc;
 		pm_registers = i63xx_pm_registers;
 		size = ARRAY_SIZE(i63xx_pm_registers);