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 Thomas Gleixner:
"A few updates for x86:

- Fix an unintended sign extension issue in the fault handling code

- Rename the new resource control config switch so it's less
confusing

- Avoid setting up EFI info in kexec when the EFI runtime is
disabled.

- Fix the microcode version check in the AMD microcode loader so it
only loads higher version numbers and never downgrades

- Set EFER.LME in the 32bit trampoline before returning to long mode
to handle older AMD/KVM behaviour properly.

- Add Darren and Andy as x86/platform reviewers"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/resctrl: Avoid confusion over the new X86_RESCTRL config
x86/kexec: Don't setup EFI info if EFI runtime is not enabled
x86/microcode/amd: Don't falsely trick the late loading mechanism
MAINTAINERS: Add Andy and Darren as arch/x86/platform/ reviewers
x86/fault: Fix sign-extend unintended sign extension
x86/boot/compressed/64: Set EFER.LME=1 in 32-bit trampoline before returning to long mode
x86/cpu: Add Atom Tremont (Jacobsville)

Linus Torvalds 24b888d8 cc6810e3

+35 -14
+1 -1
Documentation/x86/resctrl_ui.txt
··· 9 9 Tony Luck <tony.luck@intel.com> 10 10 Vikas Shivappa <vikas.shivappa@intel.com> 11 11 12 - This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo 12 + This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo 13 13 flag bits: 14 14 RDT (Resource Director Technology) Allocation - "rdt_a" 15 15 CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"
+9
MAINTAINERS
··· 16641 16641 F: drivers/platform/x86/ 16642 16642 F: drivers/platform/olpc/ 16643 16643 16644 + X86 PLATFORM DRIVERS - ARCH 16645 + R: Darren Hart <dvhart@infradead.org> 16646 + R: Andy Shevchenko <andy@infradead.org> 16647 + L: platform-driver-x86@vger.kernel.org 16648 + L: x86@kernel.org 16649 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core 16650 + S: Maintained 16651 + F: arch/x86/platform 16652 + 16644 16653 X86 VDSO 16645 16654 M: Andy Lutomirski <luto@kernel.org> 16646 16655 L: linux-kernel@vger.kernel.org
+3 -3
arch/x86/Kconfig
··· 446 446 branches. Requires a compiler with -mindirect-branch=thunk-extern 447 447 support for full protection. The kernel may run slower. 448 448 449 - config X86_RESCTRL 450 - bool "Resource Control support" 449 + config X86_CPU_RESCTRL 450 + bool "x86 CPU resource control support" 451 451 depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD) 452 452 select KERNFS 453 453 help 454 - Enable Resource Control support. 454 + Enable x86 CPU resource control support. 455 455 456 456 Provide support for the allocation and monitoring of system resources 457 457 usage by the CPU.
+8
arch/x86/boot/compressed/head_64.S
··· 600 600 leal TRAMPOLINE_32BIT_PGTABLE_OFFSET(%ecx), %eax 601 601 movl %eax, %cr3 602 602 3: 603 + /* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */ 604 + pushl %ecx 605 + movl $MSR_EFER, %ecx 606 + rdmsr 607 + btsl $_EFER_LME, %eax 608 + wrmsr 609 + popl %ecx 610 + 603 611 /* Enable PAE and LA57 (if required) paging modes */ 604 612 movl $X86_CR4_PAE, %eax 605 613 cmpl $0, %edx
+1 -1
arch/x86/boot/compressed/pgtable.h
··· 6 6 #define TRAMPOLINE_32BIT_PGTABLE_OFFSET 0 7 7 8 8 #define TRAMPOLINE_32BIT_CODE_OFFSET PAGE_SIZE 9 - #define TRAMPOLINE_32BIT_CODE_SIZE 0x60 9 + #define TRAMPOLINE_32BIT_CODE_SIZE 0x70 10 10 11 11 #define TRAMPOLINE_32BIT_STACK_END TRAMPOLINE_32BIT_SIZE 12 12
+2 -1
arch/x86/include/asm/intel-family.h
··· 6 6 * "Big Core" Processors (Branded as Core, Xeon, etc...) 7 7 * 8 8 * The "_X" parts are generally the EP and EX Xeons, or the 9 - * "Extreme" ones, like Broadwell-E. 9 + * "Extreme" ones, like Broadwell-E, or Atom microserver. 10 10 * 11 11 * While adding a new CPUID for a new microarchitecture, add a new 12 12 * group to keep logically sorted out in chronological order. Within ··· 71 71 #define INTEL_FAM6_ATOM_GOLDMONT 0x5C /* Apollo Lake */ 72 72 #define INTEL_FAM6_ATOM_GOLDMONT_X 0x5F /* Denverton */ 73 73 #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A /* Gemini Lake */ 74 + #define INTEL_FAM6_ATOM_TREMONT_X 0x86 /* Jacobsville */ 74 75 75 76 /* Xeon Phi */ 76 77
+2 -2
arch/x86/include/asm/resctrl_sched.h
··· 2 2 #ifndef _ASM_X86_RESCTRL_SCHED_H 3 3 #define _ASM_X86_RESCTRL_SCHED_H 4 4 5 - #ifdef CONFIG_X86_RESCTRL 5 + #ifdef CONFIG_X86_CPU_RESCTRL 6 6 7 7 #include <linux/sched.h> 8 8 #include <linux/jump_label.h> ··· 88 88 89 89 static inline void resctrl_sched_in(void) {} 90 90 91 - #endif /* CONFIG_X86_RESCTRL */ 91 + #endif /* CONFIG_X86_CPU_RESCTRL */ 92 92 93 93 #endif /* _ASM_X86_RESCTRL_SCHED_H */
+1 -1
arch/x86/kernel/cpu/Makefile
··· 39 39 obj-$(CONFIG_X86_MCE) += mce/ 40 40 obj-$(CONFIG_MTRR) += mtrr/ 41 41 obj-$(CONFIG_MICROCODE) += microcode/ 42 - obj-$(CONFIG_X86_RESCTRL) += resctrl/ 42 + obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ 43 43 44 44 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o 45 45
+1 -1
arch/x86/kernel/cpu/microcode/amd.c
··· 855 855 if (!p) { 856 856 return ret; 857 857 } else { 858 - if (boot_cpu_data.microcode == p->patch_id) 858 + if (boot_cpu_data.microcode >= p->patch_id) 859 859 return ret; 860 860 861 861 ret = UCODE_NEW;
+2 -2
arch/x86/kernel/cpu/resctrl/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - obj-$(CONFIG_X86_RESCTRL) += core.o rdtgroup.o monitor.o 3 - obj-$(CONFIG_X86_RESCTRL) += ctrlmondata.o pseudo_lock.o 2 + obj-$(CONFIG_X86_CPU_RESCTRL) += core.o rdtgroup.o monitor.o 3 + obj-$(CONFIG_X86_CPU_RESCTRL) += ctrlmondata.o pseudo_lock.o 4 4 CFLAGS_pseudo_lock.o = -I$(src)
+3
arch/x86/kernel/kexec-bzimage64.c
··· 167 167 struct efi_info *current_ei = &boot_params.efi_info; 168 168 struct efi_info *ei = &params->efi_info; 169 169 170 + if (!efi_enabled(EFI_RUNTIME_SERVICES)) 171 + return 0; 172 + 170 173 if (!current_ei->efi_memmap_size) 171 174 return 0; 172 175
+1 -1
arch/x86/mm/fault.c
··· 595 595 return; 596 596 } 597 597 598 - addr = desc.base0 | (desc.base1 << 16) | (desc.base2 << 24); 598 + addr = desc.base0 | (desc.base1 << 16) | ((unsigned long)desc.base2 << 24); 599 599 #ifdef CONFIG_X86_64 600 600 addr |= ((u64)desc.base3 << 32); 601 601 #endif
+1 -1
include/linux/sched.h
··· 995 995 /* cg_list protected by css_set_lock and tsk->alloc_lock: */ 996 996 struct list_head cg_list; 997 997 #endif 998 - #ifdef CONFIG_X86_RESCTRL 998 + #ifdef CONFIG_X86_CPU_RESCTRL 999 999 u32 closid; 1000 1000 u32 rmid; 1001 1001 #endif