rpms/kernel/devel linux-2.6-x86_64-disable-tlb-flush-filter.patch, NONE, 1.1 kernel-2.6.spec, 1.1502, 1.1503

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29164

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-disable-tlb-flush-filter.patch 
Log Message:
Add errata 122 workaround for AMD x86-64 CPUs.



linux-2.6-x86_64-disable-tlb-flush-filter.patch:
 setup.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE linux-2.6-x86_64-disable-tlb-flush-filter.patch ---
--- linux-2.6.12/arch/x86_64/kernel/setup.c~	2005-08-20 02:28:14.000000000 -0400
+++ linux-2.6.12/arch/x86_64/kernel/setup.c	2005-08-20 02:34:10.000000000 -0400
@@ -797,6 +797,7 @@ static int __init init_amd(struct cpuinf
 {
 	int r;
 	int level;
+	unsigned long hwcr;
 
 	/* Bit 31 in normal CPUID used for nonstandard 3DNow ID;
 	   3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */
@@ -827,6 +828,13 @@ static int __init init_amd(struct cpuinf
 		amd_detect_cmp(c);
 	}
 
+	rdmsrl(0xc0010015, hwcr);
+	if (!(hwcr & ~(1<<6))) {
+		hwcr |= 1<<6;
+		wrmsrl(0xc0010015, hwcr);
+		printk("Disabling TLB flush filter to work around errata 122.\n");
+	}
+
 	return r;
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -r1.1502 -r1.1503
--- kernel-2.6.spec	20 Aug 2005 06:07:43 -0000	1.1502
+++ kernel-2.6.spec	20 Aug 2005 06:50:33 -0000	1.1503
@@ -224,6 +224,7 @@
 # 200 - 299   x86(-64)
 
 Patch200: linux-2.6.10-x86-tune-p4.patch
+Patch201: linux-2.6-x86_64-disable-tlb-flush-filter.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.2-ppc64-build.patch
@@ -555,6 +556,8 @@
 #
 # Compile 686 kernels tuned for Pentium4.
 %patch200 -p1
+# errata 122 workaround
+%patch201 -p1
 
 # 
 # ppc64
@@ -1207,6 +1210,7 @@
 %changelog
 * Sat Aug 20 2005 Dave Jones <davej at redhat.com>
 - Disable -Os again, to see if some odd bugs 'go away'.
+- Add errata 122 workaround for AMD x86-64 CPUs.
 
 * Fri Aug 19 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc6-git11