Kimarie Hoot (kimarie.hoot@se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2827
-gerrit
commit 767cd48350b117a7f3624b9fc36bbff3fb281df0 Author: Kimarie Hoot kimarie.hoot@se-eng.com Date: Fri Mar 8 15:31:49 2013 -0700
Tyan S8226: Use SPD read code from F15 wrapper
Changes: - Get rid of the s8226 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. - s8226_select_socket() and s8226_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: I1eaf64986ef4fa3f89aed2b69d3f9c8c913f726f Signed-off-by: Kimarie Hoot kimarie.hoot@se-eng.com --- src/mainboard/tyan/s8226/BiosCallOuts.c | 73 ++++++++++- src/mainboard/tyan/s8226/Makefile.inc | 2 - src/mainboard/tyan/s8226/devicetree.cb | 6 + src/mainboard/tyan/s8226/dimmSpd.c | 222 -------------------------------- 4 files changed, 76 insertions(+), 227 deletions(-)
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c index 1499d54..394eccb 100644 --- a/src/mainboard/tyan/s8226/BiosCallOuts.c +++ b/src/mainboard/tyan/s8226/BiosCallOuts.c @@ -23,6 +23,62 @@ #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_48_47_46_37_CNTRL (0xA6) +#define PCI_REG_GPIO_52_to_49_CNTRL (0x50) +#define GPIO_OUT_BIT_GPIO48 (BIT3) +#define GPIO_OUT_BIT_GPIO49 (BIT0) +#define GPIO_OUT_ENABLE_BIT_GPIO48 (BIT7) +#define GPIO_OUT_ENABLE_BIT_GPIO49 (BIT4) + +static UINT8 s8226_select_socket(UINT8 socket_id) +{ + device_t sm_dev = PCI_DEV(0, 0x14, 0); //SMBUS + UINT8 value = 0; + UINT8 gpio52_to_49 = 0; + + /* Configure GPIO49,48 to select the desired socket + * GPIO49,48 control the IDTQS3253 S1,S0 + * S1 S0 true table + * 0 0 channel 0 + * 0 1 channel 1 + * 1 0 channel 2 - Socket 0 + * 1 1 channel 3 - Socket 1 + * Note: Above is abstracted from Schematic. But actually it seems to be other way. + * 1 0 channel 2 - Socket 1 + * 1 1 channel 3 - Socket 0 + * Note: The DIMMs need to be plugged in from the farthest slot for each channel. + */ + gpio52_to_49 = pci_read_config8(sm_dev, PCI_REG_GPIO_52_to_49_CNTRL); + value = gpio52_to_49 | GPIO_OUT_BIT_GPIO49; // Output of GPIO49 is always forced to "1" + value &= ~(GPIO_OUT_ENABLE_BIT_GPIO49); // 0=Output Enabled, 1=Tristate + pci_write_config8(sm_dev, PCI_REG_GPIO_52_to_49_CNTRL, value); + + value = pci_read_config8(sm_dev, PCI_REG_GPIO_48_47_46_37_CNTRL); + value &= ~(GPIO_OUT_BIT_GPIO48); + value |= (~(socket_id & 1)) << 3; // Output of GPIO48 is inverse of SocketId + value &= ~(GPIO_OUT_ENABLE_BIT_GPIO48); // 0=Output Enabled, 1=Tristate + pci_write_config8(sm_dev, PCI_REG_GPIO_48_47_46_37_CNTRL, value); + + return gpio52_to_49; +} + +static void s8226_restore_socket(UINT8 original_value) +{ + device_t sm_dev = PCI_DEV(0, 0x14, 0); //SMBUS + pci_write_config8(sm_dev, PCI_REG_GPIO_52_to_49_CNTRL, original_value); + + // TODO: Restore previous GPIO48 configurations? + //pci_write_config8(sm_dev, PCI_REG_GPIO_48_47_46_37_CNTRL, gpio48_47_46_37_save); +} +#endif
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] = { @@ -81,8 +137,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 +541,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 = s8226_select_socket(((AGESA_READ_SPD_PARAMS *)ConfigPtr)->SocketId); + + Status = agesa_ReadSPD (Func, Data, ConfigPtr); + + s8226_restore_socket(original_value); +#else + Status = AGESA_UNSUPPORTED; +#endif
return Status; } diff --git a/src/mainboard/tyan/s8226/Makefile.inc b/src/mainboard/tyan/s8226/Makefile.inc index 2aae4c0..cd56c47 100644 --- a/src/mainboard/tyan/s8226/Makefile.inc +++ b/src/mainboard/tyan/s8226/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/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb index 420e52f..f879ec5 100644 --- a/src/mainboard/tyan/s8226/devicetree.cb +++ b/src/mainboard/tyan/s8226/devicetree.cb @@ -121,6 +121,12 @@ 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" = " + { + { {0xA0, 0xA4, 0xA8}, {0xA2, 0xA6, 0xAA}, }, // socket 0 + { {0xA0, 0xA4, 0xA8}, {0xA2, 0xA6, 0xAA}, }, // socket 1 + }" 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/tyan/s8226/dimmSpd.c b/src/mainboard/tyan/s8226/dimmSpd.c deleted file mode 100644 index dc47674..0000000 --- a/src/mainboard/tyan/s8226/dimmSpd.c +++ /dev/null @@ -1,222 +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 49-52 contoled by SMBUS PCI_Reg 0x52 */ -#define SP5100_GPIO37_46_47_48 0xA6 -#define SP5100_GPIO49_52 0x50 - -/** - * 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 [2] [2] [3] = { // socket, channel, dimm - /* socket 0 */ - { - {0xA0, 0xA4, 0xA8}, - {0xA2, 0xA6, 0xAA}, - }, - /* socket 1 */ - { - {0xA0, 0xA4, 0xA8}, - {0xA2, 0xA6, 0xAA}, - }, -}; - -/*----------------------------------------------------------------------------- - * - * 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 IDTQS3253 i2c channel - * GPIO49,48 control the S1,S0 - * S1 S0 true table - * 0 0 channel 0 - * 0 1 channel 1 - * 1 0 channel 2 - Socket 0 - * 1 1 channel 3 - Socket 1 - * Note: Above is abstracted from Schemetic. But actually it seems to be other way. - * 1 0 channel 2 - Socket 1 - * 1 1 channel 3 - Socket 0 - * Note: The DIMMs need to be plugged in from the farthest slot for each channel. - */ - backup = sp5100_set_gpio(SP5100_GPIO49_52, 0x1, 0x1); - sp5100_set_gpio(SP5100_GPIO37_46_47_48, (~i2c_channel & 1) << 3, 0x1 << 3); - - 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_GPIO49_52, backup); - - return status; -}