x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: 3f806e50981825fa56a7f1938f24c0680816be45 x86/mce/AMD: Fix UP build error
Thanks,
Ingo
------------------>
Andreas Herrmann (1):
x86/amd: Fix L1i and L2 cache sharing information for AMD family 15h processors
Borislav Petkov (1):
x86/mce/AMD: Fix UP build error
Prarit Bhargava (1):
x86/microcode: Remove noisy AMD microcode warning
Steven Rostedt (2):
x86/nmi: Test saved %cs in NMI to determine nested NMI case
x86: Specify a size for the cmp in the NMI handler
arch/x86/kernel/cpu/intel_cacheinfo.c | 44 +++++++++++++++++++++++++++------ arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 + arch/x86/kernel/entry_64.S | 9 ++++++- arch/x86/kernel/microcode_amd.c | 1 - 4 files changed, 46 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +36 -8
@@ -326,8 +326,7 @@ static void __cpuinit amd_calc_l3_indices(struct amd_northbridge *nb) l3->indices = (max (max3 (sc0, sc1, sc2), sc3) <<10 ) -1 ; } -static void __cpuinit amd_init_l3_cache (struct _cpuid4_info_regs *this_leaf, -int index) +static void __cpuinit amd_init_l3_cache (struct _cpuid4_info_regs *this_leaf,int index) {int node;
@@ -725,14 +724,16 @@ static DEFINE_PER_CPU(struct _cpuid4_info *, ici_cpuid4_info);#define CPUID4_INFO_IDX (x, y) (&((per_cpu(ici_cpuid4_info, x))[y]))#ifdef CONFIG_SMP -static void __cpuinit cache_shared_cpu_map_setup (unsigned int cpu,int index) + +static int __cpuinit cache_shared_amd_cpu_map_setup (unsigned int cpu,int index) { -struct _cpuid4_info *this_leaf, *sibling_leaf; -unsigned long num_threads_sharing; -int index_msb, i, sibling; +struct _cpuid4_info *this_leaf; +int ret, i, sibling;struct cpuinfo_x86 *c = &cpu_data (cpu); -if ((index ==3 ) && (c->x86_vendor ==X86_VENDOR_AMD )) { + ret =0 ; +if (index ==3 ) { + ret =1 ;for_each_cpu (i,cpu_llc_shared_mask (cpu)) {if (!per_cpu (ici_cpuid4_info, i))continue ;
@@ -743,8 +744,35 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)set_bit (sibling, this_leaf->shared_cpu_map); } } -return ; + }else if ((c->x86 ==0x15 ) && ((index ==1 ) || (index ==2 ))) { + ret =1 ; +for_each_cpu (i,cpu_sibling_mask (cpu)) { +if (!per_cpu (ici_cpuid4_info, i)) +continue ; + this_leaf =CPUID4_INFO_IDX (i, index); +for_each_cpu (sibling,cpu_sibling_mask (cpu)) { +if (!cpu_online (sibling)) +continue ; +set_bit (sibling, this_leaf->shared_cpu_map); + } + } } + +return ret; +} + +static void __cpuinit cache_shared_cpu_map_setup (unsigned int cpu,int index) +{ +struct _cpuid4_info *this_leaf, *sibling_leaf; +unsigned long num_threads_sharing; +int index_msb, i; +struct cpuinfo_x86 *c = &cpu_data (cpu); + +if (c->x86_vendor ==X86_VENDOR_AMD ) { +if (cache_shared_amd_cpu_map_setup (cpu, index)) +return ; + } + this_leaf =CPUID4_INFO_IDX (cpu, index); num_threads_sharing =1 + this_leaf->base.eax.split.num_threads_sharing;
arch/x86/kernel/cpu/mcheck/mce_amd.c +2 -0
@@ -528,6 +528,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)sprintf (name,"threshold_bank%i" , bank); +#ifdef CONFIG_SMP if (cpu_data (cpu).cpu_core_id && shared_bank[bank]) {/* symlink */ i =cpumask_first (cpu_llc_shared_mask (cpu));
@@ -553,6 +554,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) goto out; } +#endif b =kzalloc (sizeof (struct threshold_bank ),GFP_KERNEL );if (!b) {
arch/x86/kernel/entry_64.S +8 -1
@@ -1532,10 +1532,17 @@ ENTRY(nmi) pushq_cfi %rdx /* + * If %cs was not the kernel segment, then the NMI triggered in user + * space, which means it is definitely not nested. + */ + cmpl $__KERNEL_CS, 16(%rsp) + jne first_nmi + + /* * Check the special variable on the stack to see if NMIs are * executing. */ - cmp $1, -8(%rsp) + cmpl $1, -8(%rsp) je nested_nmi /*
arch/x86/kernel/microcode_amd.c +0 -1
@@ -360,7 +360,6 @@ out:static enum ucode_state request_microcode_user (int cpu,const void __user *buf,size_t size) { -pr_info ("AMD microcode update via /dev/cpu/microcode not supported\n" );return UCODE_ERROR ; }