Commit 75d089d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:
 "Misc fixes from all around the map, plus a commit that introduces a
  new header of Intel model name symbols (unused) that will make the
  next merge window easier"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioapic: Fix incorrect pointers in ioapic_setup_resources()
  x86/entry/traps: Don't force in_interrupt() to return true in IST handlers
  x86/cpu/AMD: Extend X86_FEATURE_TOPOEXT workaround to newer models
  x86/cpu/intel: Introduce macros for Intel family numbers
  x86, build: copy ldlinux.c32 to image.iso
  x86/msr: Use the proper trace point conditional for writes
parents 60e38303 9d98bcec

arch/x86/boot/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ isoimage: $(obj)/bzImage 
	for i in lib lib64 share end ; do \

		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \

			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \

			if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \

				cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \

			fi ; \

			break ; \

		fi ; \

		if [ $$i = end ] ; then exit 1 ; fi ; \

arch/x86/include/asm/intel-family.h

0 → 100644
+68 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_INTEL_FAMILY_H

#define _ASM_X86_INTEL_FAMILY_H



/*

 * "Big Core" Processors (Branded as Core, Xeon, etc...)

 *

 * The "_X" parts are generally the EP and EX Xeons, or the

 * "Extreme" ones, like Broadwell-E.

 *

 * Things ending in "2" are usually because we have no better

 * name for them.  There's no processor called "WESTMERE2".

 */



#define INTEL_FAM6_CORE_YONAH		0x0E

#define INTEL_FAM6_CORE2_MEROM		0x0F

#define INTEL_FAM6_CORE2_MEROM_L	0x16

#define INTEL_FAM6_CORE2_PENRYN		0x17

#define INTEL_FAM6_CORE2_DUNNINGTON	0x1D



#define INTEL_FAM6_NEHALEM		0x1E

#define INTEL_FAM6_NEHALEM_EP		0x1A

#define INTEL_FAM6_NEHALEM_EX		0x2E

#define INTEL_FAM6_WESTMERE		0x25

#define INTEL_FAM6_WESTMERE2		0x1F

#define INTEL_FAM6_WESTMERE_EP		0x2C

#define INTEL_FAM6_WESTMERE_EX		0x2F



#define INTEL_FAM6_SANDYBRIDGE		0x2A

#define INTEL_FAM6_SANDYBRIDGE_X	0x2D

#define INTEL_FAM6_IVYBRIDGE		0x3A

#define INTEL_FAM6_IVYBRIDGE_X		0x3E



#define INTEL_FAM6_HASWELL_CORE		0x3C

#define INTEL_FAM6_HASWELL_X		0x3F

#define INTEL_FAM6_HASWELL_ULT		0x45

#define INTEL_FAM6_HASWELL_GT3E		0x46



#define INTEL_FAM6_BROADWELL_CORE	0x3D

#define INTEL_FAM6_BROADWELL_XEON_D	0x56

#define INTEL_FAM6_BROADWELL_GT3E	0x47

#define INTEL_FAM6_BROADWELL_X		0x4F



#define INTEL_FAM6_SKYLAKE_MOBILE	0x4E

#define INTEL_FAM6_SKYLAKE_DESKTOP	0x5E

#define INTEL_FAM6_SKYLAKE_X		0x55

#define INTEL_FAM6_KABYLAKE_MOBILE	0x8E

#define INTEL_FAM6_KABYLAKE_DESKTOP	0x9E



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



#define INTEL_FAM6_ATOM_PINEVIEW	0x1C

#define INTEL_FAM6_ATOM_LINCROFT	0x26

#define INTEL_FAM6_ATOM_PENWELL		0x27

#define INTEL_FAM6_ATOM_CLOVERVIEW	0x35

#define INTEL_FAM6_ATOM_CEDARVIEW	0x36

#define INTEL_FAM6_ATOM_SILVERMONT1	0x37 /* BayTrail/BYT / Valleyview */

#define INTEL_FAM6_ATOM_SILVERMONT2	0x4D /* Avaton/Rangely */

#define INTEL_FAM6_ATOM_AIRMONT		0x4C /* CherryTrail / Braswell */

#define INTEL_FAM6_ATOM_MERRIFIELD1	0x4A /* Tangier */

#define INTEL_FAM6_ATOM_MERRIFIELD2	0x5A /* Annidale */

#define INTEL_FAM6_ATOM_GOLDMONT	0x5C

#define INTEL_FAM6_ATOM_DENVERTON	0x5F /* Goldmont Microserver */



/* Xeon Phi */



#define INTEL_FAM6_XEON_PHI_KNL		0x57 /* Knights Landing */



#endif /* _ASM_X86_INTEL_FAMILY_H */

arch/x86/include/asm/msr.h

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr, 
		     "2:\n"

		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)

		     : : "c" (msr), "a"(low), "d" (high) : "memory");

	if (msr_tracepoint_active(__tracepoint_read_msr))

	if (msr_tracepoint_active(__tracepoint_write_msr))

		do_trace_write_msr(msr, ((u64)high << 32 | low), 0);

}
@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr, 
		     : "c" (msr), "0" (low), "d" (high),

		       [fault] "i" (-EIO)

		     : "memory");

	if (msr_tracepoint_active(__tracepoint_read_msr))

	if (msr_tracepoint_active(__tracepoint_write_msr))

		do_trace_write_msr(msr, ((u64)high << 32 | low), err);

	return err;

}

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2588,8 +2588,8 @@ static struct resource * __init ioapic_setup_resources(void) 
		res[num].flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);

		mem += IOAPIC_RESOURCE_NAME_SIZE;

		ioapics[i].iomem_res = &res[num];

		num++;

		ioapics[i].iomem_res = res;

	}



	ioapic_resources = res;

arch/x86/kernel/cpu/amd.c

+2 −2
Original line number Diff line number Diff line
@@ -674,14 +674,14 @@ static void init_amd_bd(struct cpuinfo_x86 *c) 
	u64 value;



	/* re-enable TopologyExtensions if switched off by BIOS */

	if ((c->x86_model >= 0x10) && (c->x86_model <= 0x1f) &&

	if ((c->x86_model >= 0x10) && (c->x86_model <= 0x6f) &&

	    !cpu_has(c, X86_FEATURE_TOPOEXT)) {



		if (msr_set_bit(0xc0011005, 54) > 0) {

			rdmsrl(0xc0011005, value);

			if (value & BIT_64(54)) {

				set_cpu_cap(c, X86_FEATURE_TOPOEXT);

				pr_info(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");

				pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");

			}

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE