FrontRunner/Toucan-AF: Use SPD read code from F14 wrapper
Changes: - Get rid of the LiPPERT FrontRunner-AF and Toucan-AF mainboard specific code and use the platform generic function wrapper that was added in change http://review.coreboot.org/#/c/2497/ AMD f14: Add SPD read functions to wrapper code - Move DIMM addresses into devicetree.cb - Add the ASF init that used to be in the SPD read code into mainboard_enable() 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. Change-Id: I4ee5e1bc34f4caee20615c48248d4f7605c09377 Signed-off-by: Jens Rottmann <JRottmann@LiPPERTembedded.de> Reviewed-on: http://review.coreboot.org/2874 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Jens Rottmann
Stefan Reinauer
parent
36b6f367c0
commit
3db86ccfd7
|
|
@ -19,9 +19,9 @@
|
||||||
|
|
||||||
#include "agesawrapper.h"
|
#include "agesawrapper.h"
|
||||||
#include "amdlib.h"
|
#include "amdlib.h"
|
||||||
#include "dimmSpd.h"
|
|
||||||
#include "BiosCallOuts.h"
|
#include "BiosCallOuts.h"
|
||||||
#include "heapManager.h"
|
#include "heapManager.h"
|
||||||
|
#include <northbridge/amd/agesa/family14/dimmSpd.h>
|
||||||
|
|
||||||
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
|
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
|
||||||
{
|
{
|
||||||
|
|
@ -427,7 +427,11 @@ AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
||||||
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
AGESA_STATUS Status;
|
AGESA_STATUS Status;
|
||||||
Status = AmdMemoryReadSPD (Func, Data, (AGESA_READ_SPD_PARAMS *)ConfigPtr);
|
#ifdef __PRE_RAM__
|
||||||
|
Status = agesa_ReadSPD (Func, Data, ConfigPtr);
|
||||||
|
#else
|
||||||
|
Status = AGESA_UNSUPPORTED;
|
||||||
|
#endif
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,13 +26,11 @@ endif
|
||||||
|
|
||||||
romstage-y += buildOpts.c
|
romstage-y += buildOpts.c
|
||||||
romstage-y += agesawrapper.c
|
romstage-y += agesawrapper.c
|
||||||
romstage-y += dimmSpd.c
|
|
||||||
romstage-y += BiosCallOuts.c
|
romstage-y += BiosCallOuts.c
|
||||||
romstage-y += PlatformGnbPcie.c
|
romstage-y += PlatformGnbPcie.c
|
||||||
|
|
||||||
ramstage-y += buildOpts.c
|
ramstage-y += buildOpts.c
|
||||||
ramstage-y += agesawrapper.c
|
ramstage-y += agesawrapper.c
|
||||||
ramstage-y += dimmSpd.c
|
|
||||||
ramstage-y += BiosCallOuts.c
|
ramstage-y += BiosCallOuts.c
|
||||||
ramstage-y += PlatformGnbPcie.c
|
ramstage-y += PlatformGnbPcie.c
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,13 @@ chip northbridge/amd/agesa/family14/root_complex
|
||||||
device pci 18.5 on end
|
device pci 18.5 on end
|
||||||
device pci 18.6 on end
|
device pci 18.6 on end
|
||||||
device pci 18.7 on end
|
device pci 18.7 on end
|
||||||
|
|
||||||
|
register "spdAddrLookup" = "
|
||||||
|
{
|
||||||
|
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
|
{ {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
|
}"
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
|
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family14/root_complex
|
end #northbridge/amd/agesa/family14/root_complex
|
||||||
|
|
|
||||||
|
|
@ -1,164 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 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 "OEM.h" /* SMBUS0_BASE_ADDRESS */
|
|
||||||
|
|
||||||
AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info);
|
|
||||||
#define DIMENSION(array)(sizeof (array)/ sizeof (array [0]))
|
|
||||||
|
|
||||||
/*#pragma optimize ("", off) // for source level debug
|
|
||||||
*---------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* SPD address table - porting required
|
|
||||||
*/
|
|
||||||
|
|
||||||
static const UINT8 spdAddressLookup [2] [2] [4] = // socket, channel, dimm
|
|
||||||
{
|
|
||||||
// socket 0
|
|
||||||
{
|
|
||||||
{0xA0, 0xA2}, // channel 0 dimms
|
|
||||||
{0x00, 0x00}, // channel 1 dimms
|
|
||||||
},
|
|
||||||
// socket 1
|
|
||||||
{
|
|
||||||
{0x00, 0x00}, // channel 0 dimms
|
|
||||||
{0x00, 0x00}, // channel 1 dimms
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
__outbyte (iobase + 0, 0xFF); // clear error status
|
|
||||||
__outbyte (iobase + 1, 0x1F); // clear error status
|
|
||||||
__outbyte (iobase + 3, offset); // offset in eeprom
|
|
||||||
__outbyte (iobase + 4, address); // slave address and read bit
|
|
||||||
__outbyte (iobase + 2, 0x48); // read byte command
|
|
||||||
|
|
||||||
// time limit to avoid hanging for unexpected error status (should never happen)
|
|
||||||
limit = __rdtsc () + 2000000000 / 10;
|
|
||||||
for (;;) {
|
|
||||||
status = __inbyte (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] = __inbyte (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;
|
|
||||||
|
|
||||||
__outbyte (iobase + 0, 0xFF); // clear error status
|
|
||||||
__outbyte (iobase + 2, 0x44); // read command
|
|
||||||
|
|
||||||
// time limit to avoid hanging for unexpected error status
|
|
||||||
limit = __rdtsc () + 2000000000 / 10;
|
|
||||||
for (;;) {
|
|
||||||
status = __inbyte (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] = __inbyte (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 writePmReg (int reg, int data)
|
|
||||||
{
|
|
||||||
__outbyte (0xCD6, reg);
|
|
||||||
__outbyte (0xCD7, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setupFch (int ioBase)
|
|
||||||
{
|
|
||||||
writePmReg (0x2D, ioBase >> 8);
|
|
||||||
writePmReg (0x2C, ioBase | 1);
|
|
||||||
writePmReg (0x29, 0x80);
|
|
||||||
writePmReg (0x28, 0x61);
|
|
||||||
__outbyte (ioBase + 0x0E, 66000000 / 400000 / 4); // set SMBus clock to 400 KHz
|
|
||||||
}
|
|
||||||
|
|
||||||
AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info)
|
|
||||||
{
|
|
||||||
int spdAddress, ioBase;
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
spdAddress = spdAddressLookup [info->SocketId] [info->MemChannelId] [info->DimmId];
|
|
||||||
if (spdAddress == 0) return AGESA_ERROR;
|
|
||||||
ioBase = SMBUS0_BASE_ADDRESS;
|
|
||||||
setupFch (ioBase);
|
|
||||||
return readspd (ioBase, spdAddress, (void *) info->Buffer, 128);
|
|
||||||
}
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 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
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* M O D U L E S U S E D
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _DIMMSPD_H_
|
|
||||||
#define _DIMMSPD_H_
|
|
||||||
|
|
||||||
#include "Porting.h"
|
|
||||||
#include "AGESA.h"
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* D E F I N I T I O N S A N D M A C R O S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* T Y P E D E F S A N D S T R U C T U R E S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* P R O T O T Y P E S O F L O C A L F U N C T I O N S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* E X P O R T E D F U N C T I O N S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
AGESA_STATUS
|
|
||||||
AmdMemoryReadSPD (
|
|
||||||
IN UINT32 Func,
|
|
||||||
IN UINT32 Data,
|
|
||||||
IN OUT AGESA_READ_SPD_PARAMS *SpdData
|
|
||||||
);
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------------------
|
|
||||||
* L O C A L F U N C T I O N S
|
|
||||||
*---------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -183,6 +183,15 @@ static void mainboard_enable(device_t dev)
|
||||||
*(misc_mem_clk_cntrl + 2) = 0x00;
|
*(misc_mem_clk_cntrl + 2) = 0x00;
|
||||||
*(misc_mem_clk_cntrl + 3) = 0x00;
|
*(misc_mem_clk_cntrl + 3) = 0x00;
|
||||||
*(misc_mem_clk_cntrl + 4) = 0x00;
|
*(misc_mem_clk_cntrl + 4) = 0x00;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Initialize ASF registers to an arbitrary address because someone
|
||||||
|
* long ago set things up this way inside the SPD read code. The
|
||||||
|
* SPD read code has been made generic and moved out of the board
|
||||||
|
* directory, so the ASF init is being done here.
|
||||||
|
*/
|
||||||
|
pm_iowrite(0x29, 0x80);
|
||||||
|
pm_iowrite(0x28, 0x61);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct chip_operations mainboard_ops = {
|
struct chip_operations mainboard_ops = {
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
|
|
||||||
#include "agesawrapper.h"
|
#include "agesawrapper.h"
|
||||||
#include "amdlib.h"
|
#include "amdlib.h"
|
||||||
#include "dimmSpd.h"
|
|
||||||
#include "BiosCallOuts.h"
|
#include "BiosCallOuts.h"
|
||||||
#include "heapManager.h"
|
#include "heapManager.h"
|
||||||
|
#include <northbridge/amd/agesa/family14/dimmSpd.h>
|
||||||
|
|
||||||
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
|
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
|
||||||
{
|
{
|
||||||
|
|
@ -427,7 +427,11 @@ AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
||||||
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
AGESA_STATUS Status;
|
AGESA_STATUS Status;
|
||||||
Status = AmdMemoryReadSPD (Func, Data, (AGESA_READ_SPD_PARAMS *)ConfigPtr);
|
#ifdef __PRE_RAM__
|
||||||
|
Status = agesa_ReadSPD (Func, Data, ConfigPtr);
|
||||||
|
#else
|
||||||
|
Status = AGESA_UNSUPPORTED;
|
||||||
|
#endif
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,13 +26,11 @@ endif
|
||||||
|
|
||||||
romstage-y += buildOpts.c
|
romstage-y += buildOpts.c
|
||||||
romstage-y += agesawrapper.c
|
romstage-y += agesawrapper.c
|
||||||
romstage-y += dimmSpd.c
|
|
||||||
romstage-y += BiosCallOuts.c
|
romstage-y += BiosCallOuts.c
|
||||||
romstage-y += PlatformGnbPcie.c
|
romstage-y += PlatformGnbPcie.c
|
||||||
|
|
||||||
ramstage-y += buildOpts.c
|
ramstage-y += buildOpts.c
|
||||||
ramstage-y += agesawrapper.c
|
ramstage-y += agesawrapper.c
|
||||||
ramstage-y += dimmSpd.c
|
|
||||||
ramstage-y += BiosCallOuts.c
|
ramstage-y += BiosCallOuts.c
|
||||||
ramstage-y += PlatformGnbPcie.c
|
ramstage-y += PlatformGnbPcie.c
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,13 @@ chip northbridge/amd/agesa/family14/root_complex
|
||||||
device pci 18.5 on end
|
device pci 18.5 on end
|
||||||
device pci 18.6 on end
|
device pci 18.6 on end
|
||||||
device pci 18.7 on end
|
device pci 18.7 on end
|
||||||
|
|
||||||
|
register "spdAddrLookup" = "
|
||||||
|
{
|
||||||
|
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
|
{ {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
|
}"
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
|
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family14/root_complex
|
end #northbridge/amd/agesa/family14/root_complex
|
||||||
|
|
|
||||||
|
|
@ -1,164 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 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 "OEM.h" /* SMBUS0_BASE_ADDRESS */
|
|
||||||
|
|
||||||
AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info);
|
|
||||||
#define DIMENSION(array)(sizeof (array)/ sizeof (array [0]))
|
|
||||||
|
|
||||||
/*#pragma optimize ("", off) // for source level debug
|
|
||||||
*---------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* SPD address table - porting required
|
|
||||||
*/
|
|
||||||
|
|
||||||
static const UINT8 spdAddressLookup [2] [2] [4] = // socket, channel, dimm
|
|
||||||
{
|
|
||||||
// socket 0
|
|
||||||
{
|
|
||||||
{0xA0, 0xA2}, // channel 0 dimms
|
|
||||||
{0x00, 0x00}, // channel 1 dimms
|
|
||||||
},
|
|
||||||
// socket 1
|
|
||||||
{
|
|
||||||
{0x00, 0x00}, // channel 0 dimms
|
|
||||||
{0x00, 0x00}, // channel 1 dimms
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
__outbyte (iobase + 0, 0xFF); // clear error status
|
|
||||||
__outbyte (iobase + 1, 0x1F); // clear error status
|
|
||||||
__outbyte (iobase + 3, offset); // offset in eeprom
|
|
||||||
__outbyte (iobase + 4, address); // slave address and read bit
|
|
||||||
__outbyte (iobase + 2, 0x48); // read byte command
|
|
||||||
|
|
||||||
// time limit to avoid hanging for unexpected error status (should never happen)
|
|
||||||
limit = __rdtsc () + 2000000000 / 10;
|
|
||||||
for (;;) {
|
|
||||||
status = __inbyte (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] = __inbyte (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;
|
|
||||||
|
|
||||||
__outbyte (iobase + 0, 0xFF); // clear error status
|
|
||||||
__outbyte (iobase + 2, 0x44); // read command
|
|
||||||
|
|
||||||
// time limit to avoid hanging for unexpected error status
|
|
||||||
limit = __rdtsc () + 2000000000 / 10;
|
|
||||||
for (;;) {
|
|
||||||
status = __inbyte (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] = __inbyte (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 writePmReg (int reg, int data)
|
|
||||||
{
|
|
||||||
__outbyte (0xCD6, reg);
|
|
||||||
__outbyte (0xCD7, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setupFch (int ioBase)
|
|
||||||
{
|
|
||||||
writePmReg (0x2D, ioBase >> 8);
|
|
||||||
writePmReg (0x2C, ioBase | 1);
|
|
||||||
writePmReg (0x29, 0x80);
|
|
||||||
writePmReg (0x28, 0x61);
|
|
||||||
__outbyte (ioBase + 0x0E, 66000000 / 400000 / 4); // set SMBus clock to 400 KHz
|
|
||||||
}
|
|
||||||
|
|
||||||
AGESA_STATUS AmdMemoryReadSPD (UINT32 unused1, UINT32 unused2, AGESA_READ_SPD_PARAMS *info)
|
|
||||||
{
|
|
||||||
int spdAddress, ioBase;
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
spdAddress = spdAddressLookup [info->SocketId] [info->MemChannelId] [info->DimmId];
|
|
||||||
if (spdAddress == 0) return AGESA_ERROR;
|
|
||||||
ioBase = SMBUS0_BASE_ADDRESS;
|
|
||||||
setupFch (ioBase);
|
|
||||||
return readspd (ioBase, spdAddress, (void *) info->Buffer, 128);
|
|
||||||
}
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 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
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* M O D U L E S U S E D
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _DIMMSPD_H_
|
|
||||||
#define _DIMMSPD_H_
|
|
||||||
|
|
||||||
#include "Porting.h"
|
|
||||||
#include "AGESA.h"
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* D E F I N I T I O N S A N D M A C R O S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* T Y P E D E F S A N D S T R U C T U R E S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* P R O T O T Y P E S O F L O C A L F U N C T I O N S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------
|
|
||||||
* E X P O R T E D F U N C T I O N S
|
|
||||||
*----------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
AGESA_STATUS
|
|
||||||
AmdMemoryReadSPD (
|
|
||||||
IN UINT32 Func,
|
|
||||||
IN UINT32 Data,
|
|
||||||
IN OUT AGESA_READ_SPD_PARAMS *SpdData
|
|
||||||
);
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------------------
|
|
||||||
* L O C A L F U N C T I O N S
|
|
||||||
*---------------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -150,6 +150,15 @@ static void mainboard_enable(device_t dev)
|
||||||
*(misc_mem_clk_cntrl + 2) = 0x00;
|
*(misc_mem_clk_cntrl + 2) = 0x00;
|
||||||
*(misc_mem_clk_cntrl + 3) = 0x00;
|
*(misc_mem_clk_cntrl + 3) = 0x00;
|
||||||
*(misc_mem_clk_cntrl + 4) = 0x00;
|
*(misc_mem_clk_cntrl + 4) = 0x00;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Initialize ASF registers to an arbitrary address because someone
|
||||||
|
* long ago set things up this way inside the SPD read code. The
|
||||||
|
* SPD read code has been made generic and moved out of the board
|
||||||
|
* directory, so the ASF init is being done here.
|
||||||
|
*/
|
||||||
|
pm_iowrite(0x29, 0x80);
|
||||||
|
pm_iowrite(0x28, 0x61);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct chip_operations mainboard_ops = {
|
struct chip_operations mainboard_ops = {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue