]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jul 2015 07:28:42 +0000 (00:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jul 2015 07:28:42 +0000 (00:28 -0700)
added patches:
x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch

queue-3.14/series
queue-3.14/x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch [new file with mode: 0644]

index b151b64e216ecce9d793327db85e4fd69094f63c..0f56effcbff84a70b491e5479f3b08a77a5946b1 100644 (file)
@@ -27,3 +27,4 @@ arm64-kvm-fix-tlb-invalidation-by-ipa-vmid.patch
 arm64-kvm-fix-hcr-setting-for-32bit-guests.patch
 arm64-kvm-do-not-use-pgd_index-to-index-stage-2-pgd.patch
 arm-arm64-kvm-keep-elrsr-aisr-in-sync-with-software-model.patch
+x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch
diff --git a/queue-3.14/x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch b/queue-3.14/x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch
new file mode 100644 (file)
index 0000000..7adbdc7
--- /dev/null
@@ -0,0 +1,50 @@
+From aa8e4f22ab7773352ba3895597189b8097f2c307 Mon Sep 17 00:00:00 2001
+From: "David E. Box" <david.e.box@linux.intel.com>
+Date: Wed, 27 Aug 2014 14:40:39 -0700
+Subject: x86/iosf: Add Kconfig prompt for IOSF_MBI selection
+
+From: "David E. Box" <david.e.box@linux.intel.com>
+
+commit aa8e4f22ab7773352ba3895597189b8097f2c307 upstream.
+
+Fixes an error in having the iosf build as 'default m'. On X86 SoC's the iosf
+sideband is the only way to access information for some registers, as opposed to
+through MSR's on other Intel architectures. While selecting IOSF_MBI is
+preferred, it does mean carrying extra code on non-SoC architectures. This
+exports the selection to the user, allowing those driver writers to compile out
+iosf code if it's not being built.
+
+Signed-off-by: David E. Box <david.e.box@linux.intel.com>
+Link: http://lkml.kernel.org/r/1409175640-32426-2-git-send-email-david.e.box@linux.intel.com
+Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+Cc: William Dauchy <william@gandi.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/Kconfig |   14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2440,9 +2440,19 @@ config X86_DMA_REMAP
+       depends on STA2X11
+ config IOSF_MBI
+-      tristate
+-      default m
++      tristate "Intel System On Chip IOSF Sideband support"
+       depends on PCI
++      ---help---
++        Enables sideband access to mailbox registers on SoC's. The sideband is
++        available on the following platforms. This list is not meant to be
++        exclusive.
++         - BayTrail
++         - Cherryview
++         - Braswell
++         - Quark
++
++        You should say Y if you are running a kernel on one of these
++        platforms.
+ source "net/Kconfig"