[coreboot] r3433 - in trunk/coreboot-v2/src/northbridge/amd/amdmct: . mct

Author: mjones
Date: 2008-07-23 23:04:03 +0200 (Wed, 23 Jul 2008)
New Revision: 3433

Modified:
   trunk/coreboot-v2/src/northbridge/amd/amdmct/amddefs.h
   trunk/coreboot-v2/src/northbridge/amd/amdmct/mct/mct_d.c
Log:
Memory initialization support for AMD Fam10 B3 (B0-B2 already supported).

Signed-off-by: Marc Jones 
Acked-by: Carl-Daniel Hailfinger

Modified: trunk/coreboot-v2/src/northbridge/amd/amdmct/amddefs.h
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdmct/amddefs.h	2008-07-21 22:23:57 UTC (rev 3432)
+++ trunk/coreboot-v2/src/northbridge/amd/amdmct/amddefs.h	2008-07-23 21:04:03 UTC (rev 3433)
@@ -53,6 +53,7 @@
 #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_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_GT_B0	(AMD_DR_ALL & ~(AMD_DR_B0))
 #define	AMD_DR_ALL	(AMD_DR_Bx)

Modified: trunk/coreboot-v2/src/northbridge/amd/amdmct/mct/mct_d.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdmct/mct/mct_d.c	2008-07-21 22:23:57 UTC (rev 3432)
+++ trunk/coreboot-v2/src/northbridge/amd/amdmct/mct/mct_d.c	2008-07-23 21:04:03 UTC (rev 3433)
@@ -2401,30 +2401,34 @@
    mct_BeforeDramInit_Prod_D(pMCTstat, pDCTstat);
    // FIXME: for rev A: mct_BeforeDramInit_D(pDCTstat, dct);

-	/* Disable auto refresh before Dram init when in ganged mode */
-	if (pDCTstat->GangedMode) {
-		val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct));
-		val |= 1 << DisAutoRefresh;
-		Set_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct), val);
+	/* Disable auto refresh before Dram init when in ganged mode (Erratum 278) */
+	if (pDCTstat->LogicalCPUID & AMD_DR_LT_B2) {
+		if (pDCTstat->GangedMode) {
+			val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct));
+			val |= 1 << DisAutoRefresh;
+			Set_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct), val);
+		}
    }

mct_DramInit_Hw_D(pMCTstat, pDCTstat, dct);

/* 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) {
-		do {
-			val = Get_NB32(pDCTstat->dev_dct, 0x90 + (0x100 * dct));
-		} while (!(val & (1 << InitDram)));
+	if (pDCTstat->LogicalCPUID & AMD_DR_LT_B2) {
+		if (pDCTstat->GangedMode) {
+			do {
+				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 &= ~(1 << DisAutoRefresh);
-		val |= 1 << DisAutoRefresh;
-		val &= ~(1 << DisAutoRefresh);
+			val = Get_NB32(pDCTstat->dev_dct, 0x8C + (0x100 * dct));
+			val &= ~(1 << DisAutoRefresh);
+			val |= 1 << DisAutoRefresh;
+			val &= ~(1 << DisAutoRefresh);
+		}
    }
 }

@@ -3792,7 +3796,10 @@
    u8 wrap32dis = 0;
    u8 valid = 0;

-	/* FIXME: Skip reset DLL for B3 */
+	/* Skip reset DLL for B3 */
+	if (pDCTstat->LogicalCPUID & AMD_DR_B3) {
+		return;
+	}

addr = HWCR;
    _RDMSR(addr, &lo, &hi);
@@ -3885,8 +3892,7 @@
    u32 reg_off = 0x100 * dct;
    u32 dev = pDCTstat->dev_dct;

-	/* FIXME: Add B3 */
-	if (pDCTstat->LogicalCPUID & AMD_DR_B2) {
+	if (pDCTstat->LogicalCPUID & (AMD_DR_B2 | AMD_DR_B3)) {
    	mct_Wait(10000);	/* Wait 50 us*/
    	val = Get_NB32(dev, 0x110);
    	if ( val & (1 << DramEnabled)) {