tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
"This tree includes:

- a fix that disables the compacted FPU XSAVE format by disabling
XSAVES support: the fixes are too complex and the breakages
ABI-affecting, so we want this to be quirked off in a robust way
and backported, to make sure no broken kernel is exposed to the new
hardware (which exposure is still very limited).

- an MCE printk message fix

- a documentation fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fpu: Disable XSAVES* support for now
x86/Documentation: Update the contact email for L3 cache index disable functionality
x86/mce: Fix MCE severity messages

Linus Torvalds 7ffb9e11 70d7d88f

+21 -3
+1 -1
Documentation/ABI/testing/sysfs-devices-system-cpu
··· 162 162 What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1} 163 163 Date: August 2008 164 164 KernelVersion: 2.6.27 165 - Contact: discuss@x86-64.org 165 + Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org> 166 166 Description: Disable L3 cache indices 167 167 168 168 These files exist in every CPU's cache/index3 directory. Each
+5 -2
arch/x86/kernel/cpu/mcheck/mce.c
··· 708 708 struct pt_regs *regs) 709 709 { 710 710 int i, ret = 0; 711 + char *tmp; 711 712 712 713 for (i = 0; i < mca_cfg.banks; i++) { 713 714 m->status = mce_rdmsrl(MSR_IA32_MCx_STATUS(i)); ··· 717 716 if (quirk_no_way_out) 718 717 quirk_no_way_out(i, m, regs); 719 718 } 720 - if (mce_severity(m, mca_cfg.tolerant, msg, true) >= 721 - MCE_PANIC_SEVERITY) 719 + 720 + if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { 721 + *msg = tmp; 722 722 ret = 1; 723 + } 723 724 } 724 725 return ret; 725 726 }
+15
arch/x86/kernel/i387.c
··· 173 173 xstate_size = sizeof(struct i387_fxsave_struct); 174 174 else 175 175 xstate_size = sizeof(struct i387_fsave_struct); 176 + 177 + /* 178 + * Quirk: we don't yet handle the XSAVES* instructions 179 + * correctly, as we don't correctly convert between 180 + * standard and compacted format when interfacing 181 + * with user-space - so disable it for now. 182 + * 183 + * The difference is small: with recent CPUs the 184 + * compacted format is only marginally smaller than 185 + * the standard FPU state format. 186 + * 187 + * ( This is easy to backport while we are fixing 188 + * XSAVES* support. ) 189 + */ 190 + setup_clear_cpu_cap(X86_FEATURE_XSAVES); 176 191 } 177 192 178 193 /*