Commit c22ccc4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.15_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - A FPU fix to properly handle invalid MXCSR values: 32-bit masks them
   out due to historical reasons and 64-bit kernels reject them

 - A fix to clear X86_FEATURE_SMAP when support for is not
   config-enabled

 - Three fixes correcting misspelled Kconfig symbols used in code

 - Two resctrl object cleanup fixes

 - Yet another attempt at fixing the neverending saga of botched x86
   timers, this time because some incredibly smart hardware decides to
   turn off the HPET timer in a low power state - who cares if the OS is
   relying on it...

 - Check the full return value range of an SEV VMGEXIT call to determine
   whether it returned an error

* tag 'x86_urgent_for_v5.15_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Restore the masking out of reserved MXCSR bits
  x86/Kconfig: Correct reference to MWINCHIP3D
  x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
  x86/entry: Clear X86_FEATURE_SMAP when CONFIG_X86_SMAP=n
  x86/entry: Correct reference to intended CONFIG_64_BIT
  x86/resctrl: Fix kfree() of the wrong type in domain_add_cpu()
  x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails
  x86/hpet: Use another crystalball to evaluate HPET usability
  x86/sev: Return an error on a returned non-zero SW_EXITINFO1[31:0]
parents 7fd2bf83 d298b035

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ config HIGHMEM4G 


config HIGHMEM64G

	bool "64GB"

	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6

	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6

	select X86_PAE

	help

	  Select this if you have a 32-bit processor and more than 4

arch/x86/include/asm/entry-common.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static __always_inline void arch_check_user_regs(struct pt_regs *regs) 
		 * For !SMAP hardware we patch out CLAC on entry.

		 */

		if (boot_cpu_has(X86_FEATURE_SMAP) ||

		    (IS_ENABLED(CONFIG_64_BIT) && boot_cpu_has(X86_FEATURE_XENPV)))

		    (IS_ENABLED(CONFIG_64BIT) && boot_cpu_has(X86_FEATURE_XENPV)))

			mask |= X86_EFLAGS_AC;



		WARN_ON_ONCE(flags & mask);

arch/x86/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) 
#ifdef CONFIG_X86_SMAP

		cr4_set_bits(X86_CR4_SMAP);

#else

		clear_cpu_cap(c, X86_FEATURE_SMAP);

		cr4_clear_bits(X86_CR4_SMAP);

#endif

	}

arch/x86/kernel/cpu/resctrl/core.c

+4 −2
Original line number Diff line number Diff line
@@ -527,12 +527,14 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 
	rdt_domain_reconfigure_cdp(r);



	if (r->alloc_capable && domain_setup_ctrlval(r, d)) {

		kfree(d);

		kfree(hw_dom);

		return;

	}



	if (r->mon_capable && domain_setup_mon_state(r, d)) {

		kfree(d);

		kfree(hw_dom->ctrl_val);

		kfree(hw_dom->mbps_val);

		kfree(hw_dom);

		return;

	}

arch/x86/kernel/early-quirks.c

+0 −6
Original line number Diff line number Diff line
@@ -714,12 +714,6 @@ static struct chipset early_qrk[] __initdata = { 
	 */

	{ PCI_VENDOR_ID_INTEL, 0x0f00,

		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},

	{ PCI_VENDOR_ID_INTEL, 0x3e20,

		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},

	{ PCI_VENDOR_ID_INTEL, 0x3ec4,

		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},

	{ PCI_VENDOR_ID_INTEL, 0x8a12,

		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},

	{ PCI_VENDOR_ID_BROADCOM, 0x4331,

	  PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},

	{}