[coreboot-gerrit] Change in coreboot[master]: sb/intel/gpio: Cache gpiobase in ramstage and romstage

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/27664

Change subject: sb/intel/gpio: Cache gpiobase in ramstage and romstage
......................................................................

sb/intel/gpio: Cache gpiobase in ramstage and romstage

Implement caching like it's done with pmbase.

Change-Id: I26d56a9ff1a8d6e64c164f36e23b846b8b459380
Signed-off-by: Patrick Rudolph 
---
M src/southbridge/intel/common/gpio.c
M src/southbridge/intel/common/gpio.h
2 files changed, 21 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/27664/1

diff --git a/src/southbridge/intel/common/gpio.c b/src/southbridge/intel/common/gpio.c
index caf24f4..9eb2fe4 100644
--- a/src/southbridge/intel/common/gpio.c
+++ b/src/southbridge/intel/common/gpio.c
@@ -18,18 +18,36 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
+#include <arch/early_variables.h>

#include "gpio.h"

#define MAX_GPIO_NUMBER 75 /* zero based */

+/* LPC GPIO Base Address Register */
+#define GPIO_BASE	0x48
+
+/* PCI Configuration Space (D31:F0): LPC */
+#if defined(__SIMPLE_DEVICE__)
+#define PCH_LPC_DEV	PCI_DEV(0, 0x1f, 0)
+#else
+#define PCH_LPC_DEV	dev_find_slot(0, PCI_DEVFN(0x1f, 0))
+#endif
+
 static u16 get_gpio_base(void)
 {
-#if defined(__PRE_RAM__) || defined(__SMM__)
+#if defined(__SMM__)
+	/* Don't assume GPIO_BASE is still the same */
    return pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc;
 #else
-	return pci_read_config16(dev_find_slot(0, PCI_DEVFN(0x1f, 0)),
-				 GPIO_BASE) & 0xfffc;
+	static u16 gpiobase CAR_GLOBAL;
+
+	if (gpiobase)
+		return gpiobase;
+
+	gpiobase = pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc;
+
+	return gpiobase;
 #endif
 }

diff --git a/src/southbridge/intel/common/gpio.h b/src/southbridge/intel/common/gpio.h
index 8bd3b96..97b7783 100644
--- a/src/southbridge/intel/common/gpio.h
+++ b/src/southbridge/intel/common/gpio.h
@@ -19,11 +19,6 @@
 #include <stdint.h>
 #include <compiler.h>

-/* LPC GPIO Base Address Register */
-#define GPIO_BASE		0x48
-/* PCI Configuration Space (D31:F0): LPC */
-#define PCH_LPC_DEV		PCI_DEV(0, 0x1f, 0)
-
 /* ICH7 GPIOBASE */
 #define GPIO_USE_SEL	0x00
 #define GP_IO_SEL	0x04