[coreboot-gerrit] Patch set updated for coreboot: amd/car: don't apply Fam10h/Fam12h Errata 343 fix to Fam0Fh

[Jonathan A. Kollasch (jakllsch@kollasch.net)]

Jonathan A. Kollasch (jakllsch at kollasch.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12528

-gerrit

commit 357ecda6633c2ad3d2de27c0584cc0645c66178a
Author: Jonathan A. Kollasch <jakllsch at kollasch.net>
Date:   Tue Nov 24 10:15:22 2015 -0600

    amd/car: don't apply Fam10h/Fam12h Errata 343 fix to Fam0Fh
    
    Fixes early fault problem on Fam0Fh introduced in
    Change I8e01a4ab68b463efe02c27f589e0b4b719532eb5,
    commit 991f18475c951dcd728eb8550b10dd62938b1770.
    
    Change-Id: Id215d2822b78917939c28f7a922a94e02e5d15bf
    Signed-off-by: Jonathan A. Kollasch <jakllsch at kollasch.net>
---
 src/cpu/amd/car/post_cache_as_ram.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 2c11777..fb09cd4 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -79,18 +79,18 @@ static void prepare_ramstage_region(void *resume_backup_memory)
 	print_car_debug(" Done\n");
 }
 
-/* Disable Erratum 343 Workaround, see RevGuide for Fam10h, Pub#41322 Rev 3.33 */
+/* Disable Erratum 343 Workaround, see RevGuide for Fam10h, Pub#41322 Rev 3.33
+ * and RevGuide for Fam12h, Pub#44739 Rev 3.10
+ */
 
 static void vErrata343(void)
 {
-#ifdef BU_CFG2_MSR
 	msr_t msr;
 	unsigned int uiMask = 0xFFFFFFF7;
 
 	msr = rdmsr(BU_CFG2_MSR);
 	msr.hi &= uiMask;	// IcDisSpecTlbWr (bit 35) = 0
 	wrmsr(BU_CFG2_MSR, msr);
-#endif
 }
 
 void post_cache_as_ram(void)
@@ -121,8 +121,8 @@ void post_cache_as_ram(void)
 	prepare_romstage_ramstack(resume_backup_memory);
 
 	/* from here don't store more data in CAR */
-	if (family < 0x6f) {
-		/* Family 10h or earlier */
+	if (family >= 0x1f && family <= 0x3f) {
+		/* Family 10h and 12h, 11h until shown otherwise */
 		vErrata343();
 	}