[commit] r5748 - in trunk/src/northbridge/amd/amdmct: mct_ddr3 wrappers

[repository service]

Author: zbao
Date: Mon Aug 30 09:31:31 2010
New Revision: 5748
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5748

Log:
Multi-DIMMS on AMD ddr3 MCT channel B works.

Signed-off-by: Kerry She 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
   trunk/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
   trunk/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
   trunk/src/northbridge/amd/amdmct/wrappers/mcti.h
   trunk/src/northbridge/amd/amdmct/wrappers/mcti_d.c

Modified: trunk/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
==============================================================================
--- trunk/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c	Mon Aug 30 09:24:13 2010	(r5747)
+++ trunk/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c	Mon Aug 30 09:31:31 2010	(r5748)
@@ -332,7 +332,6 @@

if (pDCTstat->DIMMValidDCT[Channel] == 0)	/* mct_BeforeTrainDQSRdWrPos_D */
    		continue;
-
    	pDCTstat->DqsRdWrPos_Saved = 0;
    	for ( DQSWrDelay = 0; DQSWrDelay < dqsWrDelay_end; DQSWrDelay++) {
    		pDCTstat->DQSDelay = DQSWrDelay;
@@ -1174,12 +1173,12 @@
    *valid = 0;

-	if (!pDCTstat->GangedMode)  {	/* FIXME: not used. */
+	if (!pDCTstat->GangedMode) {
    	reg_off = 0x100 * Channel;
    }

/* get the local base addr of the chipselect */
-	reg = 0x40 + (receiver << 2);
+	reg = 0x40 + (receiver << 2) + reg_off;
    val = Get_NB32(dev, reg);

val &= ~0x0F;

Modified: trunk/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
==============================================================================
--- trunk/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c	Mon Aug 30 09:24:13 2010	(r5747)
+++ trunk/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c	Mon Aug 30 09:31:31 2010	(r5748)
@@ -22,6 +22,8 @@
 {
    u8 Dimms, DimmNum, MaxDimm, Speed;
    u32 val;
+	u32 dct = 0;
+	u32 reg_off = 0;

DimmNum = MrsChipSel >> 20;

@@ -32,8 +34,14 @@

MaxDimm = mctGet_NVbits(NV_MAX_DIMMS);
    Speed = pDCTstat->DIMMAutoSpeed;
-	/* if (dct == 0) */
-	Dimms = pDCTstat->MAdimms[0];
+
+	if (pDCTstat->CSPresent_DCT[0] > 0) {
+		dct = 0;
+	} else if (pDCTstat->CSPresent_DCT[1] > 0 ){
+		dct = 1;
+	}
+	reg_off = 0x100 * dct;
+	Dimms = pDCTstat->MAdimms[dct];

val = 0;
    if (CtrlWordNum == 0)
@@ -87,14 +95,21 @@
 static void mct_SendCtrlWrd(struct MCTStatStruc *pMCTstat,
    		struct DCTStatStruc *pDCTstat, u32 val)
 {
+	u32 reg_off = 0;
    u32 dev = pDCTstat->dev_dct;

-	val |= Get_NB32(dev, 0x7C) & ~0xFFFFFF;
+	if (pDCTstat->CSPresent_DCT[0] > 0) {
+		reg_off = 0;
+	} else if (pDCTstat->CSPresent_DCT[1] > 0 ){
+		reg_off = 0x100;
+	}
+
+	val |= Get_NB32(dev, reg_off + 0x7C) & ~0xFFFFFF;
    val |= 1 << SendControlWord;
-	Set_NB32(dev, 0x7C, val);
+	Set_NB32(dev, reg_off + 0x7C, val);

do {
-		val = Get_NB32(dev, 0x7C);
+		val = Get_NB32(dev, reg_off + 0x7C);
    } while (val & (1 << SendControlWord));
 }

@@ -104,6 +119,7 @@
    u8 MrsChipSel;
    u32 dev = pDCTstat->dev_dct;
    u32 val, cw;
+	u32 reg_off = 0x100 * dct;

mct_Wait(1600);

@@ -111,7 +127,7 @@

for (MrsChipSel = 0; MrsChipSel < 8; MrsChipSel ++, MrsChipSel ++) {
    	if (pDCTstat->CSPresent & (1 << MrsChipSel)) {
-			val = Get_NB32(dev, 0xA8);
+			val = Get_NB32(dev, reg_off + 0xA8);
    		val &= ~(0xF << 8);

switch (MrsChipSel) {
@@ -128,7 +144,7 @@
    		case 7:
    			val |= (3 << 6) << 8;
    		}
-			Set_NB32(dev, 0xA8, val);
+			Set_NB32(dev, reg_off + 0xA8 , val);

for (cw=0; cw <=15; cw ++) {
    			mct_Wait(1600);

Modified: trunk/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
==============================================================================
--- trunk/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c	Mon Aug 30 09:24:13 2010	(r5747)
+++ trunk/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c	Mon Aug 30 09:31:31 2010	(r5748)
@@ -86,7 +86,7 @@

for (dimm = 0; dimm < MAX_TOTAL_DIMMS; dimm++) {
    	u8  DimmRanks;
-		if (DimmValid & (1 << dimm)) {
+		if (DimmValid & (1 << (dimm << 1))) {
    		DimmRanks = 1;
    		if (pDCTstat->DimmDRPresent & (1 << (dimm+dct)))
    			DimmRanks = 2;

Modified: trunk/src/northbridge/amd/amdmct/wrappers/mcti.h
==============================================================================
--- trunk/src/northbridge/amd/amdmct/wrappers/mcti.h	Mon Aug 30 09:24:13 2010	(r5747)
+++ trunk/src/northbridge/amd/amdmct/wrappers/mcti.h	Mon Aug 30 09:31:31 2010	(r5748)
@@ -51,9 +51,18 @@
 /*----------------------------------------------------------------------------
 UPDATE AS NEEDED
 ----------------------------------------------------------------------------*/
+#ifndef MAX_NODES_SUPPORTED
 #define MAX_NODES_SUPPORTED		8
+#endif
+
+#ifndef MAX_DIMMS_SUPPORTED
 #define MAX_DIMMS_SUPPORTED		8
+#endif
+
+#ifndef MAX_CS_SUPPORTED
 #define MAX_CS_SUPPORTED		8
+#endif
+
 #define MCT_TRNG_KEEPOUT_START		0x00000C00
 #define MCT_TRNG_KEEPOUT_END		0x00000CFF

Modified: trunk/src/northbridge/amd/amdmct/wrappers/mcti_d.c
==============================================================================
--- trunk/src/northbridge/amd/amdmct/wrappers/mcti_d.c	Mon Aug 30 09:24:13 2010	(r5747)
+++ trunk/src/northbridge/amd/amdmct/wrappers/mcti_d.c	Mon Aug 30 09:31:31 2010	(r5748)
@@ -40,8 +40,8 @@
    	val = MAX_NODES_SUPPORTED;
    	break;
    case NV_MAX_DIMMS:
-		//val = MAX_DIMMS_SUPPORTED;
-		val = 8;
+		val = MAX_DIMMS_SUPPORTED;
+		//val = 8;
    	break;
    case NV_MAX_MEMCLK:
    	/* Maximum platform supported memclk */