rpms/kernel/FC-4 linux-2.6-x86_64-disable-tlb-flush-filter.patch, NONE, 1.1 kernel-2.6.spec, 1.1433, 1.1434

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-disable-tlb-flush-filter.patch 
Log Message:
Work around AMD x86-64 errata 122.



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/FC-4/kernel-2.6.spec,v
retrieving revision 1.1433
retrieving revision 1.1434
diff -u -r1.1433 -r1.1434
--- kernel-2.6.spec	23 Aug 2005 18:51:39 -0000	1.1433
+++ kernel-2.6.spec	24 Aug 2005 02:28:43 -0000	1.1434
@@ -220,6 +220,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
@@ -553,6 +554,8 @@
 #
 # Compile 686 kernels tuned for Pentium4.
 %patch200 -p1
+# AMD errata 122
+%patch201 -p1
 
 # 
 # ppc64
@@ -1263,6 +1266,9 @@
 %endif
 
 %changelog
+* Tue Aug 23 2005 Dave Jones <davej at redhat.com>
+- Work around AMD x86-64 errata 122.
+
 * Tue Aug 23 2005 Rik van Riel <riel at redhat.com>
 - upgrade to today's Xen snapshot