Remove some duplicate #include files (trivial).

[coreboot.git] / src / cpu / amd / model_10xxx / model_10xxx_init.c

diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/model_10xxx/model_10xxx_init.c
index 5a19547b4d89affea76f7cf3ae6b067a15db69f6..9cd6d66e4abf3232241e1a1b9d033054ec2864b2 100644 (file)
--- a/src/cpu/amd/model_10xxx/model_10xxx_init.c
+++ b/src/cpu/amd/model_10xxx/model_10xxx_init.c
@@ -27,9 +27,7 @@
 #include <cpu/x86/pae.h>
 #include <pc80/mc146818rtc.h>
 #include <cpu/x86/lapic.h>
-
-#include "../../../northbridge/amd/amdfam10/amdfam10.h"
-
+#include "northbridge/amd/amdfam10/amdfam10.h"
 #include <cpu/amd/model_10xxx_rev.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
@@ -113,6 +111,13 @@ static void model_10xxx_init(device_t dev)
        msr.hi &= ~(1 << (46 - 32));
        wrmsr(NB_CFG_MSR, msr);
 
+       msr = rdmsr(BU_CFG2_MSR);
+       /* Clear ClLinesToNbDis */
+       msr.lo &= ~(1 << 15);
+       /* Clear bit 35 as per Erratum 343 */
+       msr.hi &= ~(1 << (35-32));
+       wrmsr(BU_CFG2_MSR, msr);
+
        /* Write protect SMM space with SMMLOCK. */
        msr = rdmsr(HWCR_MSR);
        msr.lo |= (1 << 0);
@@ -134,12 +139,12 @@ static struct cpu_device_id cpu_table[] = {
        { X86_VENDOR_AMD, 0x100f22 },
        { X86_VENDOR_AMD, 0x100f23 },
        { X86_VENDOR_AMD, 0x100f40 },           /* RB-C0 */
-       { X86_VENDOR_AMD, 0x100F42 },           /* RB-C2 */ 
-       { X86_VENDOR_AMD, 0x100F43 },           /* RB-C3 */ 
-       { X86_VENDOR_AMD, 0x100F52 },           /* BL-C2 */ 
-       { X86_VENDOR_AMD, 0x100F62 },           /* DA-C2 */ 
-       { X86_VENDOR_AMD, 0x100F63 },           /* DA-C3 */ 
-       { X86_VENDOR_AMD, 0x100F80 },           /* HY-D0 */ 
+       { X86_VENDOR_AMD, 0x100F42 },           /* RB-C2 */
+       { X86_VENDOR_AMD, 0x100F43 },           /* RB-C3 */
+       { X86_VENDOR_AMD, 0x100F52 },           /* BL-C2 */
+       { X86_VENDOR_AMD, 0x100F62 },           /* DA-C2 */
+       { X86_VENDOR_AMD, 0x100F63 },           /* DA-C3 */
+       { X86_VENDOR_AMD, 0x100F80 },           /* HY-D0 */
        { 0, 0 },
 };