From: Greg Kroah-Hartman Date: Wed, 8 Jul 2015 07:28:42 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v4.0.8~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cef04d80a02a19fe9c9abe8fceff0bf0de7bc220;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch --- diff --git a/queue-3.14/series b/queue-3.14/series index b151b64e216..0f56effcbff 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -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 index 00000000000..7adbdc7cee6 --- /dev/null +++ b/queue-3.14/x86-iosf-add-kconfig-prompt-for-iosf_mbi-selection.patch @@ -0,0 +1,50 @@ +From aa8e4f22ab7773352ba3895597189b8097f2c307 Mon Sep 17 00:00:00 2001 +From: "David E. Box" +Date: Wed, 27 Aug 2014 14:40:39 -0700 +Subject: x86/iosf: Add Kconfig prompt for IOSF_MBI selection + +From: "David E. Box" + +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 +Link: http://lkml.kernel.org/r/1409175640-32426-2-git-send-email-david.e.box@linux.intel.com +Signed-off-by: H. Peter Anvin +Cc: William Dauchy +Signed-off-by: Greg Kroah-Hartman + +--- + 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" +