GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Memory initialization support for AMD Fam10 B3 (B0-B2 already supported). 

Signed-off-by: Marc Jones <marc.jones@amd.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3433 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Marc Jones 2008-07-23 21:04:03 +00:00
parent 3a8556354d
commit c3ec1ac331
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/northbridge/amd/amdmct/amddefs.h
View File

@ -53,6 +53,7 @@
#define AMD_GT_F0 (AMD_NPT_ALL AND NOT AMD_NPT_F0) #define AMD_GT_F0 (AMD_NPT_ALL AND NOT AMD_NPT_F0)
#define AMD_DR_Ax (AMD_DR_A0A + AMD_DR_A1B + AMD_DR_A2) #define AMD_DR_Ax (AMD_DR_A0A + AMD_DR_A1B + AMD_DR_A2)
#define AMD_DR_Bx (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_B2 | AMD_DR_B3 | AMD_DR_BA) #define AMD_DR_Bx (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_B2 | AMD_DR_B3 | AMD_DR_BA)
#define AMD_DR_LT_B2 (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_BA)
#define AMD_DR_LT_B3 (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_B2 | AMD_DR_BA) #define AMD_DR_LT_B3 (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_B2 | AMD_DR_BA)
#define AMD_DR_GT_B0 (AMD_DR_ALL & ~(AMD_DR_B0)) #define AMD_DR_GT_B0 (AMD_DR_ALL & ~(AMD_DR_B0))
#define AMD_DR_ALL (AMD_DR_Bx) #define AMD_DR_ALL (AMD_DR_Bx)

42
src/northbridge/amd/amdmct/mct/mct_d.c
View File

@ -2401,30 +2401,34 @@ static void mct_DramInit(struct MCTStatStruc *pMCTstat,
mct_BeforeDramInit_Prod_D(pMCTstat, pDCTstat); mct_BeforeDramInit_Prod_D(pMCTstat, pDCTstat);
// FIXME: for rev A: mct_BeforeDramInit_D(pDCTstat, dct); // FIXME: for rev A: mct_BeforeDramInit_D(pDCTstat, dct);
/* Disable auto refresh before Dram init when in ganged mode */ /* Disable auto refresh before Dram init when in ganged mode (Erratum 278) */
if (pDCTstat->GangedMode) { if (pDCTstat->LogicalCPUID & AMD_DR_LT_B2) {
val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct)); if (pDCTstat->GangedMode) {
val |= 1 << DisAutoRefresh; val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct));
Set_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct), val); val |= 1 << DisAutoRefresh;
Set_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct), val);
}
} }
mct_DramInit_Hw_D(pMCTstat, pDCTstat, dct); mct_DramInit_Hw_D(pMCTstat, pDCTstat, dct);
/* Re-enable auto refresh after Dram init when in ganged mode /* Re-enable auto refresh after Dram init when in ganged mode
* to ensure both DCTs are in sync * to ensure both DCTs are in sync (Erratum 278)
*/ */
if (pDCTstat->GangedMode) { if (pDCTstat->LogicalCPUID & AMD_DR_LT_B2) {
do { if (pDCTstat->GangedMode) {
val = Get_NB32(pDCTstat->dev_dct, 0x90 + (0x100 * dct)); do {
} while (!(val & (1 << InitDram))); val = Get_NB32(pDCTstat->dev_dct, 0x90 + (0x100 * dct));
} while (!(val & (1 << InitDram)));
WaitRoutine_D(50); WaitRoutine_D(50);
val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct)); val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct));
val &= ~(1 << DisAutoRefresh); val &= ~(1 << DisAutoRefresh);
val |= 1 << DisAutoRefresh; val |= 1 << DisAutoRefresh;
val &= ~(1 << DisAutoRefresh); val &= ~(1 << DisAutoRefresh);
}
} }
} }
@ -3792,7 +3796,10 @@ static void mct_ResetDLL_D(struct MCTStatStruc *pMCTstat,
u8 wrap32dis = 0; u8 wrap32dis = 0;
u8 valid = 0; u8 valid = 0;
/* FIXME: Skip reset DLL for B3 */ /* Skip reset DLL for B3 */
if (pDCTstat->LogicalCPUID & AMD_DR_B3) {
return;
}
addr = HWCR; addr = HWCR;
_RDMSR(addr, &lo, &hi); _RDMSR(addr, &lo, &hi);
@ -3885,8 +3892,7 @@ static void AfterDramInit_D(struct DCTStatStruc *pDCTstat, u8 dct) {
u32 reg_off = 0x100 * dct; u32 reg_off = 0x100 * dct;
u32 dev = pDCTstat->dev_dct; u32 dev = pDCTstat->dev_dct;
/* FIXME: Add B3 */ if (pDCTstat->LogicalCPUID & (AMD_DR_B2 | AMD_DR_B3)) {
if (pDCTstat->LogicalCPUID & AMD_DR_B2) {
mct_Wait(10000); /* Wait 50 us*/ mct_Wait(10000); /* Wait 50 us*/
val = Get_NB32(dev, 0x110); val = Get_NB32(dev, 0x110);
if ( val & (1 << DramEnabled)) { if ( val & (1 << DramEnabled)) {