[commit] r5791 - in trunk/src: cpu/amd/model_10xxx northbridge/amd/amdmct/mct

[repository service]

Author: oxygene
Date: Thu Sep  9 11:56:19 2010
New Revision: 5791
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5791

Log:
Apparently, it's not crucial to clear this at the exact moment we switch
to using ram, so something like the appended is perhaps more
appropriate.  Confirmed to work on hw.

Signed-off-by: Arne Georg Gleditsch 
Acked-by: Patrick Georgi

Modified:
   trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c
   trunk/src/northbridge/amd/amdmct/mct/mct_d.c

Modified: trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c
==============================================================================
--- trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c	Thu Sep  9 10:34:02 2010	(r5790)
+++ trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c	Thu Sep  9 11:56:19 2010	(r5791)
@@ -113,6 +113,11 @@
    msr.hi &= ~(1 << (46 - 32));
    wrmsr(NB_CFG_MSR, msr);

+	/* Clear ClLinesToNbDis */
+	msr = rdmsr(BU_CFG2_MSR);
+	msr.lo &= ~(1 << 15);
+	wrmsr(BU_CFG2_MSR, msr);
+
    /* Write protect SMM space with SMMLOCK. */
    msr = rdmsr(HWCR_MSR);
    msr.lo |= (1 << 0);

Modified: trunk/src/northbridge/amd/amdmct/mct/mct_d.c
==============================================================================
--- trunk/src/northbridge/amd/amdmct/mct/mct_d.c	Thu Sep  9 10:34:02 2010	(r5790)
+++ trunk/src/northbridge/amd/amdmct/mct/mct_d.c	Thu Sep  9 11:56:19 2010	(r5791)
@@ -3189,7 +3189,7 @@
    print_t("\tmct_FinalMCT_D: Clr Cl, Wb\n");

-	mct_ClrClToNB_D(pMCTstat, pDCTstat);
+	/* ClrClToNB_D postponed til we're done executing from ROM */
    mct_ClrWbEnhWsbDis_D(pMCTstat, pDCTstat);
 }