From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 May 2013 16:27:36 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.9.2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13996fab9e03208cae3e2be15c3a7cb2e33c724f;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	revert-x86-amd-disable-way-access-filter-on-piledriver-cpus-it-is-duplicated.patch
---

diff --git a/queue-3.0/revert-x86-amd-disable-way-access-filter-on-piledriver-cpus-it-is-duplicated.patch b/queue-3.0/revert-x86-amd-disable-way-access-filter-on-piledriver-cpus-it-is-duplicated.patch
new file mode 100644
index 00000000000..6b8f05539ca
--- /dev/null
+++ b/queue-3.0/revert-x86-amd-disable-way-access-filter-on-piledriver-cpus-it-is-duplicated.patch
@@ -0,0 +1,45 @@
+From 5e3fe67e02c53e5a5fcf0e2b0d91dd93f757d50b Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@amd.com>
+Date: Wed, 31 Oct 2012 17:20:50 +0100
+Subject: Revert "x86, amd: Disable way access filter on Piledriver CPUs" it is duplicated
+
+Revert 5e3fe67e02c53e5a5fcf0e2b0d91dd93f757d50b which is
+commit 2bbf0a1427c377350f001fbc6260995334739ad7 upstream.
+
+Willy pointed out that I messed up and applied this one twice to the
+3.0-stable tree, so revert the second instance of it.
+
+Reported by: Willy Tarreau <w@1wt.eu>
+Cc: Andre Przywara <osp@andrep.de>
+Cc: H. Peter Anvin <hpa@linux.intel.com>
+Cc: CAI Qian <caiqian@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+reverted:
+---
+ arch/x86/kernel/cpu/amd.c |   14 --------------
+ 1 file changed, 14 deletions(-)
+
+--- a/arch/x86/kernel/cpu/amd.c
++++ b/arch/x86/kernel/cpu/amd.c
+@@ -568,20 +568,6 @@ static void __cpuinit init_amd(struct cp
+ 		}
+ 	}
+ 
+-	/*
+-	 * The way access filter has a performance penalty on some workloads.
+-	 * Disable it on the affected CPUs.
+-	 */
+-	if ((c->x86 == 0x15) &&
+-	    (c->x86_model >= 0x02) && (c->x86_model < 0x20)) {
+-		u64 val;
+-
+-		if (!rdmsrl_safe(0xc0011021, &val) && !(val & 0x1E)) {
+-			val |= 0x1E;
+-			checking_wrmsrl(0xc0011021, val);
+-		}
+-	}
+-
+ 	cpu_detect_cache_sizes(c);
+ 
+ 	/* Multi core CPU? */
diff --git a/queue-3.0/series b/queue-3.0/series
index 404efe1a060..f2c625e0437 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -10,3 +10,4 @@ drm-radeon-fix-possible-segfault-when-parsing-pm-tables.patch
 tracing-fix-ftrace_dump.patch
 kernel-audit_tree.c-tree-will-leak-memory-when-failure-occurs-in-audit_trim_trees.patch
 x86-mm-account-for-pgdir_size-alignment.patch
+revert-x86-amd-disable-way-access-filter-on-piledriver-cpus-it-is-duplicated.patch