Merge branch 'x86/urgent' into x86/cache (4fedcde7) · Commits · 戴 / test

arch/x86/include/asm/fpu/internal.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ static inline void __fpregs_load_activate(void)
		struct fpu *fpu = &current->thread.fpu;
		int cpu = smp_processor_id();

		if (WARN_ON_ONCE(current->mm == NULL))
		if (WARN_ON_ONCE(current->flags & PF_KTHREAD))
		return;

		if (!fpregs_state_valid(fpu, cpu)) {
		@@ -567,11 +567,11 @@ static inline void __fpregs_load_activate(void)
		* otherwise.
		*
		* The FPU context is only stored/restored for a user task and
		* ->mm is used to distinguish between kernel and user threads.
		* PF_KTHREAD is used to distinguish between kernel and user threads.
		*/
		static inline void switch_fpu_prepare(struct fpu *old_fpu, int cpu)
		{
		if (static_cpu_has(X86_FEATURE_FPU) && current->mm) {
		if (static_cpu_has(X86_FEATURE_FPU) && !(current->flags & PF_KTHREAD)) {
		if (!copy_fpregs_to_fpstate(old_fpu))
		old_fpu->last_cpu = -1;
		else

+3 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,9 @@

		#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66

		#define INTEL_FAM6_ICELAKE_X 0x6A
		#define INTEL_FAM6_ICELAKE_XEON_D 0x6C
		#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D
		#define INTEL_FAM6_ICELAKE_MOBILE 0x7E

		/* "Small Core" Processors (Atom) */

+2 −1

Original line number	Diff line number	Diff line
		@@ -1464,7 +1464,8 @@ static void apic_pending_intr_clear(void)
		if (queued) {
		if (boot_cpu_has(X86_FEATURE_TSC) && cpu_khz) {
		ntsc = rdtsc();
		max_loops = (cpu_khz << 10) - (ntsc - tsc);
		max_loops = (long long)cpu_khz << 10;
		max_loops -= ntsc - tsc;
		} else {
		max_loops--;
		}

+9 −4

Original line number	Diff line number	Diff line
		@@ -789,13 +789,16 @@ static struct syscore_ops mc_syscore_ops = {
		.resume = mc_bp_resume,
		};

		static int mc_cpu_online(unsigned int cpu)
		static int mc_cpu_starting(unsigned int cpu)
		{
		struct device *dev;

		dev = get_cpu_device(cpu);
		microcode_update_cpu(cpu);
		pr_debug("CPU%d added\n", cpu);
		return 0;
		}

		static int mc_cpu_online(unsigned int cpu)
		{
		struct device *dev = get_cpu_device(cpu);

		if (sysfs_create_group(&dev->kobj, &mc_attr_group))
		pr_err("Failed to create group for CPU%d\n", cpu);
		@@ -872,6 +875,8 @@ int __init microcode_init(void)
		goto out_ucode_group;

		register_syscore_ops(&mc_syscore_ops);
		cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:starting",
		mc_cpu_starting, NULL);
		cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",
		mc_cpu_online, mc_cpu_down_prep);

+3 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,9 @@ static void update_mba_bw(struct rdtgroup rgrp, struct rdt_domain dom_mbm)
		struct list_head *head;
		struct rdtgroup *entry;

		if (!is_mbm_local_enabled())
		return;

		r_mba = &rdt_resources_all[RDT_RESOURCE_MBA];
		closid = rgrp->closid;
		rmid = rgrp->mon.rmid;