From: Greg Kroah-Hartman Date: Sat, 7 May 2016 04:48:16 +0000 (-0400) Subject: 3.14-stable patches X-Git-Tag: v3.14.69~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d5c130299b356cee03c26bc160bbf122128ba24;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: maintainers-remove-asterisk-from-efi-directory-names.patch x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch --- diff --git a/queue-3.14/maintainers-remove-asterisk-from-efi-directory-names.patch b/queue-3.14/maintainers-remove-asterisk-from-efi-directory-names.patch new file mode 100644 index 00000000000..3327e2f7ef1 --- /dev/null +++ b/queue-3.14/maintainers-remove-asterisk-from-efi-directory-names.patch @@ -0,0 +1,42 @@ +From e8dfe6d8f6762d515fcd4f30577f7bfcf7659887 Mon Sep 17 00:00:00 2001 +From: Matt Fleming +Date: Tue, 3 May 2016 20:29:39 +0100 +Subject: MAINTAINERS: Remove asterisk from EFI directory names + +From: Matt Fleming + +commit e8dfe6d8f6762d515fcd4f30577f7bfcf7659887 upstream. + +Mark reported that having asterisks on the end of directory names +confuses get_maintainer.pl when it encounters subdirectories, and that +my name does not appear when run on drivers/firmware/efi/libstub. + +Reported-by: Mark Rutland +Signed-off-by: Matt Fleming +Cc: Ard Biesheuvel +Cc: Catalin Marinas +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: linux-efi@vger.kernel.org +Link: http://lkml.kernel.org/r/1462303781-8686-2-git-send-email-matt@codeblueprint.co.uk +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + MAINTAINERS | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -3247,8 +3247,8 @@ F: Documentation/x86/efi-stub.txt + F: arch/ia64/kernel/efi.c + F: arch/x86/boot/compressed/eboot.[ch] + F: arch/x86/include/asm/efi.h +-F: arch/x86/platform/efi/* +-F: drivers/firmware/efi/* ++F: arch/x86/platform/efi/ ++F: drivers/firmware/efi/ + F: include/linux/efi*.h + + EFI VARIABLE FILESYSTEM diff --git a/queue-3.14/series b/queue-3.14/series index a9ca5ec0c2b..38b11e08060 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -9,3 +9,5 @@ proc-prevent-accessing-proc-pid-environ-until-it-s-ready.patch batman-adv-check-skb-size-before-using-encapsulated-eth-vlan-header.patch batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch batman-adv-reduce-refcnt-of-removed-router-when-updating-route.patch +maintainers-remove-asterisk-from-efi-directory-names.patch +x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch diff --git a/queue-3.14/x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch b/queue-3.14/x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch new file mode 100644 index 00000000000..abb500fcbc0 --- /dev/null +++ b/queue-3.14/x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch @@ -0,0 +1,45 @@ +From 886123fb3a8656699dff40afa0573df359abeb18 Mon Sep 17 00:00:00 2001 +From: Chen Yu +Date: Fri, 6 May 2016 11:33:39 +0800 +Subject: x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO + +From: Chen Yu + +commit 886123fb3a8656699dff40afa0573df359abeb18 upstream. + +Currently we read the tsc radio: ratio = (MSR_PLATFORM_INFO >> 8) & 0x1f; + +Thus we get bit 8-12 of MSR_PLATFORM_INFO, however according to the SDM +(35.5), the ratio bits are bit 8-15. + +Ignoring the upper bits can result in an incorrect tsc ratio, which causes the +TSC calibration and the Local APIC timer frequency to be incorrect. + +Fix this problem by masking 0xff instead. + +[ tglx: Massaged changelog ] + +Fixes: 7da7c1561366 "x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs" +Signed-off-by: Chen Yu +Cc: "Rafael J. Wysocki" +Cc: Bin Gao +Cc: Len Brown +Link: http://lkml.kernel.org/r/1462505619-5516-1-git-send-email-yu.c.chen@intel.com +Signed-off-by: Thomas Gleixner +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/tsc_msr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/kernel/tsc_msr.c ++++ b/arch/x86/kernel/tsc_msr.c +@@ -92,7 +92,7 @@ unsigned long try_msr_calibrate_tsc(void + + if (freq_desc_tables[cpu_index].msr_plat) { + rdmsr(MSR_PLATFORM_INFO, lo, hi); +- ratio = (lo >> 8) & 0x1f; ++ ratio = (lo >> 8) & 0xff; + } else { + rdmsr(MSR_IA32_PERF_STATUS, lo, hi); + ratio = (hi >> 8) & 0x1f;