Commit 67b02431 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Skip cpus with apic-ids >= 255 in !x2apic_mode
  x86, x2apic: Allow "nox2apic" to disable x2apic mode setup by BIOS
  x86, x2apic: Fallback to xapic when BIOS doesn't setup interrupt-remapping
  x86, acpi: Skip acpi x2apic entries if the x2apic feature is not present
  x86, apic: Add probe() for apic_flat
  x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
  x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat
  x86: Add per-cpu stat counter for APIC ICR read tries
  pci, x86/io-apic: Allow PCI_IOAPIC to be user configurable on x86
  x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support
  x86: Add NumaChip support
  x86: Add x86_init platform override to fix up NUMA core numbering
  x86: Make flat_init_apic_ldr() available
parents 376613e8 c284b42a

arch/x86/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ config X86_EXTENDED_PLATFORM 


	  If you enable this option then you'll be able to select support

	  for the following (non-PC) 64 bit x86 platforms:

		Numascale NumaChip

		ScaleMP vSMP

		SGI Ultraviolet
@@ -350,6 +351,18 @@ config X86_EXTENDED_PLATFORM 
endif

# This is an alphabetically sorted list of 64 bit extended platforms

# Please maintain the alphabetic order if and when there are additions

config X86_NUMACHIP

	bool "Numascale NumaChip"

	depends on X86_64

	depends on X86_EXTENDED_PLATFORM

	depends on NUMA

	depends on SMP

	depends on X86_X2APIC

	depends on !EDAC_AMD64

	---help---

	  Adds support for Numascale NumaChip large-SMP systems. Needed to

	  enable more than ~168 cores.

	  If you don't have one of these, you should say N here.



config X86_VSMP

	bool "ScaleMP vSMP"

arch/x86/include/asm/apic.h

+6 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static inline u64 native_x2apic_icr_read(void) 
}



extern int x2apic_phys;

extern int x2apic_preenabled;

extern void check_x2apic(void);

extern void enable_x2apic(void);

extern void x2apic_icr_write(u32 low, u32 id);
@@ -198,6 +199,9 @@ static inline void x2apic_force_phys(void) 
	x2apic_phys = 1;

}

#else

static inline void disable_x2apic(void)

{

}

static inline void check_x2apic(void)

{

}
@@ -212,6 +216,7 @@ static inline void x2apic_force_phys(void) 
{

}



#define	nox2apic	0

#define	x2apic_preenabled 0

#define	x2apic_supported()	0

#endif
@@ -410,6 +415,7 @@ extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); 
#endif



#ifdef CONFIG_X86_LOCAL_APIC



static inline u32 apic_read(u32 reg)

{

	return apic->read(reg);

arch/x86/include/asm/apic_flat_64.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_APIC_FLAT_64_H

#define _ASM_X86_APIC_FLAT_64_H



extern void flat_init_apic_ldr(void);



#endif

arch/x86/include/asm/apicdef.h

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 


#define APIC_BASE (fix_to_virt(FIX_APIC_BASE))

#define APIC_BASE_MSR	0x800

#define XAPIC_ENABLE	(1UL << 11)

#define X2APIC_ENABLE	(1UL << 10)



#ifdef CONFIG_X86_32

arch/x86/include/asm/hardirq.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ typedef struct { 
#ifdef CONFIG_X86_LOCAL_APIC

	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq_spurious_count;

	unsigned int icr_read_retry_count;

#endif

	unsigned int x86_platform_ipis;	/* arch dependent */

	unsigned int apic_perf_irqs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE