summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/bd82x6x/Kconfig4
-rw-r--r--src/southbridge/intel/bd82x6x/smihandler.c54
-rw-r--r--src/southbridge/intel/ibexpeak/Kconfig4
-rw-r--r--src/southbridge/intel/ibexpeak/smihandler.c54
4 files changed, 78 insertions, 38 deletions
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index c2720ef4c7..d060dae406 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -45,6 +45,10 @@ config EHCI_DEBUG_OFFSET
hex
default 0xa0
+config DRAM_RESET_GATE_GPIO
+ int
+ default 60
+
config BOOTBLOCK_SOUTHBRIDGE_INIT
string
default "southbridge/intel/bd82x6x/bootblock.c"
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c
index 99f6b51319..f886ad4432 100644
--- a/src/southbridge/intel/bd82x6x/smihandler.c
+++ b/src/southbridge/intel/bd82x6x/smihandler.c
@@ -290,6 +290,31 @@ static void busmaster_disable_on_bus(int bus)
}
}
+static void southbridge_gate_memory_reset_real(int offset,
+ u16 use, u16 io, u16 lvl)
+{
+ u32 reg32;
+
+ /* Make sure it is set as GPIO */
+ reg32 = inl(use);
+ if (!(reg32 & (1 << offset))) {
+ reg32 |= (1 << offset);
+ outl(reg32, use);
+ }
+
+ /* Make sure it is set as output */
+ reg32 = inl(io);
+ if (reg32 & (1 << offset)) {
+ reg32 &= ~(1 << offset);
+ outl(reg32, io);
+ }
+
+ /* Drive the output low */
+ reg32 = inl(lvl);
+ reg32 &= ~(1 << offset);
+ outl(reg32, lvl);
+}
+
/*
* Drive GPIO 60 low to gate memory reset in S3.
*
@@ -298,31 +323,22 @@ static void busmaster_disable_on_bus(int bus)
*/
static void southbridge_gate_memory_reset(void)
{
- u32 reg32;
u16 gpiobase;
gpiobase = pci_read_config16(PCI_DEV(0, 0x1f, 0), GPIOBASE) & 0xfffc;
if (!gpiobase)
return;
- /* Make sure it is set as GPIO */
- reg32 = inl(gpiobase + GPIO_USE_SEL2);
- if (!(reg32 & (1 << 28))) {
- reg32 |= (1 << 28);
- outl(reg32, gpiobase + GPIO_USE_SEL2);
- }
-
- /* Make sure it is set as output */
- reg32 = inl(gpiobase + GP_IO_SEL2);
- if (reg32 & (1 << 28)) {
- reg32 &= ~(1 << 28);
- outl(reg32, gpiobase + GP_IO_SEL2);
- }
-
- /* Drive the output low */
- reg32 = inl(gpiobase + GP_LVL2);
- reg32 &= ~(1 << 28);
- outl(reg32, gpiobase + GP_LVL2);
+ if (CONFIG_DRAM_RESET_GATE_GPIO >= 32)
+ southbridge_gate_memory_reset_real(CONFIG_DRAM_RESET_GATE_GPIO - 32,
+ gpiobase + GPIO_USE_SEL2,
+ gpiobase + GP_IO_SEL2,
+ gpiobase + GP_LVL2);
+ else
+ southbridge_gate_memory_reset_real(CONFIG_DRAM_RESET_GATE_GPIO,
+ gpiobase + GPIO_USE_SEL,
+ gpiobase + GP_IO_SEL,
+ gpiobase + GP_LVL);
}
static void xhci_sleep(u8 slp_typ)
diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig
index 07e714b77e..97d5883222 100644
--- a/src/southbridge/intel/ibexpeak/Kconfig
+++ b/src/southbridge/intel/ibexpeak/Kconfig
@@ -43,6 +43,10 @@ config EHCI_DEBUG_OFFSET
hex
default 0xa0
+config DRAM_RESET_GATE_GPIO
+ int
+ default 60
+
config BOOTBLOCK_SOUTHBRIDGE_INIT
string
default "southbridge/intel/bd82x6x/bootblock.c"
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index 5ee8ef9538..bc4ca22c59 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -290,6 +290,31 @@ static void busmaster_disable_on_bus(int bus)
}
}
+static void southbridge_gate_memory_reset_real(int offset,
+ u16 use, u16 io, u16 lvl)
+{
+ u32 reg32;
+
+ /* Make sure it is set as GPIO */
+ reg32 = inl(use);
+ if (!(reg32 & (1 << offset))) {
+ reg32 |= (1 << offset);
+ outl(reg32, use);
+ }
+
+ /* Make sure it is set as output */
+ reg32 = inl(io);
+ if (reg32 & (1 << offset)) {
+ reg32 &= ~(1 << offset);
+ outl(reg32, io);
+ }
+
+ /* Drive the output low */
+ reg32 = inl(lvl);
+ reg32 &= ~(1 << offset);
+ outl(reg32, lvl);
+}
+
/*
* Drive GPIO 60 low to gate memory reset in S3.
*
@@ -298,31 +323,22 @@ static void busmaster_disable_on_bus(int bus)
*/
static void southbridge_gate_memory_reset(void)
{
- u32 reg32;
u16 gpiobase;
gpiobase = pci_read_config16(PCI_DEV(0, 0x1f, 0), GPIOBASE) & 0xfffc;
if (!gpiobase)
return;
- /* Make sure it is set as GPIO */
- reg32 = inl(gpiobase + GPIO_USE_SEL2);
- if (!(reg32 & (1 << 28))) {
- reg32 |= (1 << 28);
- outl(reg32, gpiobase + GPIO_USE_SEL2);
- }
-
- /* Make sure it is set as output */
- reg32 = inl(gpiobase + GP_IO_SEL2);
- if (reg32 & (1 << 28)) {
- reg32 &= ~(1 << 28);
- outl(reg32, gpiobase + GP_IO_SEL2);
- }
-
- /* Drive the output low */
- reg32 = inl(gpiobase + GP_LVL2);
- reg32 &= ~(1 << 28);
- outl(reg32, gpiobase + GP_LVL2);
+ if (CONFIG_DRAM_RESET_GATE_GPIO >= 32)
+ southbridge_gate_memory_reset_real(CONFIG_DRAM_RESET_GATE_GPIO - 32,
+ gpiobase + GPIO_USE_SEL2,
+ gpiobase + GP_IO_SEL2,
+ gpiobase + GP_LVL2);
+ else
+ southbridge_gate_memory_reset_real(CONFIG_DRAM_RESET_GATE_GPIO,
+ gpiobase + GPIO_USE_SEL,
+ gpiobase + GP_IO_SEL,
+ gpiobase + GP_LVL);
}
static void xhci_sleep(u8 slp_typ)