[coreboot] New patch to review for coreboot: abb0c36 Supermicro H8QGI: Use SPD read code from F15 wrapper
Kimarie Hoot (kimarie.hoot@se-eng.com)
gerrit at coreboot.org
Tue Mar 19 17:44:39 CET 2013
Kimarie Hoot (kimarie.hoot at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2828
-gerrit
commit abb0c368e74a1716a0259690f2b3f2baf39f4d1d
Author: Kimarie Hoot <kimarie.hoot at se-eng.com>
Date: Fri Mar 8 13:54:10 2013 -0700
Supermicro H8QGI: Use SPD read code from F15 wrapper
Changes:
- Get rid of the h8qgi mainboard specific code and use the
platform generic function wrapper that was added in change
http://review.coreboot.org/#/c/2777/
AMD Fam15: Add SPD read functions to wrapper code
- Move DIMM addresses into devicetree.cb
Notes:
- The DIMM reads only happen in romstage, so the function is not
available in ramstage. Point the read-SPD callback to a generic
function in ramstage.
- h8qgi_select_socket() and h8qgi_restore_socket() started by
duplicating sp5100_set_gpio() and sp5100_restore_gpio(), which
were in dimmSpd.c. In addition to renaming the functions to more
specifically state their purpose, some cleanup and magic number
reduction was done.
Change-Id: I346ebd8399d4ba3e280576e667fdc62fa75a63b8
Signed-off-by: Kimarie Hoot <kimarie.hoot at se-eng.com>
---
src/mainboard/supermicro/h8qgi/BiosCallOuts.c | 65 ++++++-
src/mainboard/supermicro/h8qgi/Makefile.inc | 2 -
src/mainboard/supermicro/h8qgi/devicetree.cb | 8 +
src/mainboard/supermicro/h8qgi/dimmSpd.c | 234 --------------------------
4 files changed, 70 insertions(+), 239 deletions(-)
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
index 1499d54..178a788 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
@@ -23,6 +23,54 @@
#include "Ids.h"
#include "OptionsIds.h"
#include "heapManager.h"
+#include <northbridge/amd/agesa/family15/dimmSpd.h>
+#include <arch/io.h>
+#include <arch/romcc_io.h>
+
+#ifdef __PRE_RAM__
+/* These defines are used to select the appropriate socket for the SPD read
+ * because this is a multi-socket design.
+ */
+#define PCI_REG_GPIO_56_to_53_CNTRL (0x52)
+#define GPIO_OUT_BIT_GPIO53 (BIT0)
+#define GPIO_OUT_BIT_GPIO54 (BIT1)
+#define GPIO_OUT_ENABLE_BIT_GPIO53 (BIT4)
+#define GPIO_OUT_ENABLE_BIT_GPIO54 (BIT5)
+
+#define GPIO_OUT_BIT_GPIO54_to_53_MASK \
+ (GPIO_OUT_BIT_GPIO54 | GPIO_OUT_BIT_GPIO53)
+#define GPIO_OUT_ENABLE_BIT_GPIO54_to_53_MASK \
+ (GPIO_OUT_ENABLE_BIT_GPIO54 | GPIO_OUT_ENABLE_BIT_GPIO53)
+
+static UINT8 select_socket(UINT8 socket_id)
+{
+ device_t sm_dev = PCI_DEV(0, 0x14, 0); //SMBus
+ UINT8 value = 0;
+ UINT8 gpio56_to_53 = 0;
+
+ /* Configure GPIO54,53 to select the desired socket
+ * GPIO54,53 control the HC4052 S1,S0
+ * S1 S0 true table
+ * 0 0 channel 1 (Socket1)
+ * 0 1 channel 2 (Socket2)
+ * 1 0 channel 3 (Socket3)
+ * 1 1 channel 4 (Socket4)
+ */
+ gpio56_to_53 = pci_read_config8(sm_dev, PCI_REG_GPIO_56_to_53_CNTRL);
+ value = gpio56_to_53 & (~GPIO_OUT_BIT_GPIO54_to_53_MASK);
+ value |= socket_id;
+ value &= (~GPIO_OUT_ENABLE_BIT_GPIO54_to_53_MASK); // 0=Output Enabled, 1=Tristate
+ pci_write_config8(sm_dev, PCI_REG_GPIO_56_to_53_CNTRL, value);
+
+ return gpio56_to_53;
+}
+
+static void restore_socket(UINT8 original_value)
+{
+ device_t sm_dev = PCI_DEV(0, 0x14, 0); //SMBus
+ pci_write_config8(sm_dev, PCI_REG_GPIO_56_to_53_CNTRL, original_value);
+}
+#endif
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
{
@@ -81,8 +129,6 @@ STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
},
};
-extern AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info);
-
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
@@ -487,7 +533,20 @@ AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
AGESA_STATUS Status;
- Status = AmdMemoryReadSPD (Func, Data, ConfigPtr);
+#ifdef __PRE_RAM__
+ UINT8 original_value = 0;
+
+ if (ConfigPtr == NULL)
+ return AGESA_ERROR;
+
+ original_value = select_socket(((AGESA_READ_SPD_PARAMS *)ConfigPtr)->SocketId);
+
+ Status = agesa_ReadSPD (Func, Data, ConfigPtr);
+
+ restore_socket(original_value);
+#else
+ Status = AGESA_UNSUPPORTED;
+#endif
return Status;
}
diff --git a/src/mainboard/supermicro/h8qgi/Makefile.inc b/src/mainboard/supermicro/h8qgi/Makefile.inc
index 2aae4c0..cd56c47 100644
--- a/src/mainboard/supermicro/h8qgi/Makefile.inc
+++ b/src/mainboard/supermicro/h8qgi/Makefile.inc
@@ -22,7 +22,6 @@ romstage-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700) += sb700_cfg.c
romstage-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700) += reset.c
romstage-y += buildOpts.c
romstage-y += agesawrapper.c
-romstage-y += dimmSpd.c
romstage-y += BiosCallOuts.c
romstage-y += platform_oem.c
@@ -31,7 +30,6 @@ ramstage-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700) += sb700_cfg.c
ramstage-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700) += reset.c
ramstage-y += buildOpts.c
ramstage-y += agesawrapper.c
-ramstage-y += dimmSpd.c
ramstage-y += BiosCallOuts.c
ramstage-y += platform_oem.c
diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb
index b918d3c..be9e564 100644
--- a/src/mainboard/supermicro/h8qgi/devicetree.cb
+++ b/src/mainboard/supermicro/h8qgi/devicetree.cb
@@ -124,6 +124,14 @@ chip northbridge/amd/agesa/family15/root_complex
device pci 18.3 on end
device pci 18.4 on end
device pci 18.5 on end #f15
+
+ register "spdAddrLookup" = "
+ {
+ { {0xAC, 0xAE}, {0xA8, 0xAA}, {0xA4, 0xA6}, {0xA0, 0xA2}, }, // socket 0
+ { {0xAC, 0xAE}, {0xA8, 0xAA}, {0xA4, 0xA6}, {0xA0, 0xA2}, }, // socket 1
+ { {0xAC, 0xAE}, {0xA8, 0xAA}, {0xA4, 0xA6}, {0xA0, 0xA2}, }, // socket 2
+ { {0xAC, 0xAE}, {0xA8, 0xAA}, {0xA4, 0xA6}, {0xA0, 0xA2}, }, // socket 3
+ }"
end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
end #domain
end #northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/supermicro/h8qgi/dimmSpd.c b/src/mainboard/supermicro/h8qgi/dimmSpd.c
deleted file mode 100644
index 41664e0..0000000
--- a/src/mainboard/supermicro/h8qgi/dimmSpd.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 - 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "Porting.h"
-#include "AGESA.h"
-#include "amdlib.h"
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <device/pci_ids.h>
-
-AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info);
-#define DIMENSION(array)(sizeof (array)/ sizeof (array [0]))
-
-/* SP5100 GPIO 53-56 contoled by SMBUS PCI_Reg 0x52 */
-#define SP5100_GPIO53_56 0x52
-
-/**
- * TODO not support all GPIO yet
- * @param reg -GPIO Cntrl Register
- * @param out -GPIO bitmap
- * @param out -GPIO enable bitmap
- * @return old setting
- */
-static u8 sp5100_set_gpio(u8 reg, u8 out, u8 enable)
-{
- u8 value, ret;
- device_t sm_dev = PCI_DEV(0, 0x14, 0); //SMBUS
-
- value = pci_read_config8(sm_dev, reg);
- ret = value;
- value &= ~(enable);
- value |= out;
- value &= ~(enable << 4);
- pci_write_config8(sm_dev, reg, value);
-
- return ret;
-}
-
-static void sp5100_restore_gpio(u8 reg, u8 value)
-{
- device_t sm_dev = PCI_DEV(0, 0x14, 0);
- pci_write_config8(sm_dev, reg, value);
-}
-
-/*-----------------------------------------------------------------------------
- *
- * SPD address table - porting required
- */
-static const UINT8 spdAddressLookup [8] [4] [2] = { // socket, channel, dimm
- /* socket 0 */
- {
- {0xAC, 0xAE},
- {0xA8, 0xAA},
- {0xA4, 0xA6},
- {0xA0, 0xA2},
- },
- /* socket 1 */
- {
- {0xAC, 0xAE},
- {0xA8, 0xAA},
- {0xA4, 0xA6},
- {0xA0, 0xA2},
- },
- /* socket 2 */
- {
- {0xAC, 0xAE},
- {0xA8, 0xAA},
- {0xA4, 0xA6},
- {0xA0, 0xA2},
- },
- /* socket 3 */
- {
- {0xAC, 0xAE},
- {0xA8, 0xAA},
- {0xA4, 0xA6},
- {0xA0, 0xA2},
- },
-};
-
-/*-----------------------------------------------------------------------------
- *
- * readSmbusByteData - read a single SPD byte from any offset
- */
-
-static int readSmbusByteData (int iobase, int address, char *buffer, int offset)
-{
- unsigned int status;
- UINT64 limit;
-
- address |= 1; // set read bit
-
- outb(0xFF, iobase + 0); // clear error status
- outb(0x1F, iobase + 1); // clear error status
- outb(offset, iobase + 3); // offset in eeprom
- outb(address, iobase + 4); // slave address and read bit
- outb(0x48, iobase + 2); // read byte command
-
- // time limit to avoid hanging for unexpected error status (should never happen)
- limit = __rdtsc () + 2000000000 / 10;
- for (;;)
- {
- status = inb(iobase);
- if (__rdtsc () > limit) break;
- if ((status & 2) == 0) continue; // SMBusInterrupt not set, keep waiting
- if ((status & 1) == 1) continue; // HostBusy set, keep waiting
- break;
- }
-
- buffer [0] = inb(iobase + 5);
- if (status == 2) status = 0; // check for done with no errors
- return status;
-}
-
-/*-----------------------------------------------------------------------------
- *
- * readSmbusByte - read a single SPD byte from the default offset
- * this function is faster function readSmbusByteData
- */
-
-static int readSmbusByte (int iobase, int address, char *buffer)
-{
- unsigned int status;
- UINT64 limit;
-
- outb(0xFF, iobase + 0); // clear error status
- outb(0x44, iobase + 2); // read command
-
- // time limit to avoid hanging for unexpected error status
- limit = __rdtsc () + 2000000000 / 10;
- for (;;)
- {
- status = inb(iobase);
- if (__rdtsc () > limit) break;
- if ((status & 2) == 0) continue; // SMBusInterrupt not set, keep waiting
- if ((status & 1) == 1) continue; // HostBusy set, keep waiting
- break;
- }
-
- buffer [0] = inb(iobase + 5);
- if (status == 2) status = 0; // check for done with no errors
- return status;
-}
-
-/*---------------------------------------------------------------------------
- *
- * readspd - Read one or more SPD bytes from a DIMM.
- * Start with offset zero and read sequentially.
- * Optimization relies on autoincrement to avoid
- * sending offset for every byte.
- * Reads 128 bytes in 7-8 ms at 400 KHz.
- */
-
-static int readspd (int iobase, int SmbusSlaveAddress, char *buffer, int count)
-{
- int index, error;
-
- /* read the first byte using offset zero */
- error = readSmbusByteData (iobase, SmbusSlaveAddress, buffer, 0);
- if (error) {
- return error;
- }
-
- /* read the remaining bytes using auto-increment for speed */
- for (index = 1; index < count; index++)
- {
- error = readSmbusByte (iobase, SmbusSlaveAddress, buffer + index);
- if (error)
- return error;
- }
-
- return 0;
-}
-
-static void setupFch (int ioBase)
-{
- outb(66000000 / 400000 / 4, ioBase + 0x0E); /* set SMBus clock to 400 KHz */
-}
-
-AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info)
-{
- AGESA_STATUS status;
- int spdAddress, ioBase;
- u8 i2c_channel;
- u8 backup;
- device_t sm_dev;
-
- if (info->SocketId >= DIMENSION (spdAddressLookup )) return AGESA_ERROR;
- if (info->MemChannelId >= DIMENSION (spdAddressLookup[0] )) return AGESA_ERROR;
- if (info->DimmId >= DIMENSION (spdAddressLookup[0][0])) return AGESA_ERROR;
- i2c_channel = (UINT8) info->SocketId;
-
- /* set ght i2c channel
- * GPIO54,53 control the HC4052 S1,S0
- * S1 S0 true table
- * 0 0 channel 1 (Socket1)
- * 0 1 channel 2 (Socket2)
- * 1 0 channel 3 (Socket3)
- * 1 1 channel 4 (Socket4)
- */
- backup = sp5100_set_gpio(SP5100_GPIO53_56, i2c_channel, 0x03);
-
- spdAddress = spdAddressLookup [info->SocketId] [info->MemChannelId] [info->DimmId];
- if (spdAddress == 0)
- return AGESA_ERROR;
-
- /*
- * SMBus Base Address was set during southbridge early setup.
- * e.g. sb700 IO mapped SMBUS_IO_BASE 0x6000, CIMX using 0xB00 as default
- */
- sm_dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SB700_SM), 0);
- ioBase = pci_read_config32(sm_dev, 0x90) & (0xFFFFFFF0);
- setupFch(ioBase);
-
- status = readspd(ioBase, spdAddress, (void *)info->Buffer, 256);
- sp5100_restore_gpio(SP5100_GPIO53_56, backup);
-
- return status;
-}
More information about the coreboot
mailing list