Commit 017892c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of... 

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

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion
  x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
  x86, acpi: Add MAX_LOCAL_APIC for 32bit
  x86: io_apic: Split setup_ioapic_ids_from_mpc()
  x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage
  x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
  x86: Allow platforms to force enable apic
parents 42cbd8ef cb2ded37

arch/x86/include/asm/apic.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ extern void setup_boot_APIC_clock(void); 
extern void setup_secondary_APIC_clock(void);

extern int APIC_init_uniprocessor(void);

extern void enable_NMI_through_LVT0(void);

extern int apic_force_enable(void);



/*

 * On 32bit this is mach-xxx local

arch/x86/include/asm/apicdef.h

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


#ifdef CONFIG_X86_32

# define MAX_IO_APICS 64

# define MAX_LOCAL_APIC 256

#else

# define MAX_IO_APICS 128

# define MAX_LOCAL_APIC 32768

arch/x86/include/asm/io_apic.h

+3 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ struct io_apic_irq_attr; 
extern int io_apic_set_pci_routing(struct device *dev, int irq,

		 struct io_apic_irq_attr *irq_attr);

void setup_IO_APIC_irq_extra(u32 gsi);

extern void ioapic_init_mappings(void);

extern void ioapic_and_gsi_init(void);

extern void ioapic_insert_resources(void);



extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);
@@ -168,10 +168,9 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); 
extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);

extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);



extern void probe_nr_irqs_gsi(void);

extern int get_nr_irqs_gsi(void);



extern void setup_ioapic_ids_from_mpc(void);

extern void setup_ioapic_ids_from_mpc_nocheck(void);



struct mp_ioapic_gsi{

	u32 gsi_base;
@@ -189,9 +188,8 @@ extern void __init pre_init_apic_IRQ0(void); 
#define io_apic_assign_pci_irqs 0

#define setup_ioapic_ids_from_mpc x86_init_noop

static const int timer_through_8259 = 0;

static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_and_gsi_init(void) { }

static inline void ioapic_insert_resources(void) { }

static inline void probe_nr_irqs_gsi(void)	{ }

#define gsi_top (NR_IRQS_LEGACY)

static inline int mp_find_ioapic(u32 gsi) { return 0; }

arch/x86/include/asm/mpspec.h

+12 −19
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ 


#include <asm/mpspec_def.h>

#include <asm/x86_init.h>

#include <asm/apicdef.h>



extern int apic_version[MAX_APICS];

extern int apic_version[];

extern int pic_mode;



#ifdef CONFIG_X86_32
@@ -107,7 +108,7 @@ extern int mp_register_gsi(struct device *dev, u32 gsi, int edge_level, 
				 int active_high_low);

#endif /* CONFIG_ACPI */



#define PHYSID_ARRAY_SIZE	BITS_TO_LONGS(MAX_APICS)

#define PHYSID_ARRAY_SIZE	BITS_TO_LONGS(MAX_LOCAL_APIC)



struct physid_mask {

	unsigned long mask[PHYSID_ARRAY_SIZE];
@@ -122,31 +123,31 @@ typedef struct physid_mask physid_mask_t; 
	test_and_set_bit(physid, (map).mask)



#define physids_and(dst, src1, src2)					\

	bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS)

	bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_LOCAL_APIC)



#define physids_or(dst, src1, src2)					\

	bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS)

	bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_LOCAL_APIC)



#define physids_clear(map)					\

	bitmap_zero((map).mask, MAX_APICS)

	bitmap_zero((map).mask, MAX_LOCAL_APIC)



#define physids_complement(dst, src)				\

	bitmap_complement((dst).mask, (src).mask, MAX_APICS)

	bitmap_complement((dst).mask, (src).mask, MAX_LOCAL_APIC)



#define physids_empty(map)					\

	bitmap_empty((map).mask, MAX_APICS)

	bitmap_empty((map).mask, MAX_LOCAL_APIC)



#define physids_equal(map1, map2)				\

	bitmap_equal((map1).mask, (map2).mask, MAX_APICS)

	bitmap_equal((map1).mask, (map2).mask, MAX_LOCAL_APIC)



#define physids_weight(map)					\

	bitmap_weight((map).mask, MAX_APICS)

	bitmap_weight((map).mask, MAX_LOCAL_APIC)



#define physids_shift_right(d, s, n)				\

	bitmap_shift_right((d).mask, (s).mask, n, MAX_APICS)

	bitmap_shift_right((d).mask, (s).mask, n, MAX_LOCAL_APIC)



#define physids_shift_left(d, s, n)				\

	bitmap_shift_left((d).mask, (s).mask, n, MAX_APICS)

	bitmap_shift_left((d).mask, (s).mask, n, MAX_LOCAL_APIC)



static inline unsigned long physids_coerce(physid_mask_t *map)

{
@@ -159,14 +160,6 @@ static inline void physids_promote(unsigned long physids, physid_mask_t *map) 
	map->mask[0] = physids;

}



/* Note: will create very large stack frames if physid_mask_t is big */

#define physid_mask_of_physid(physid)					\

	({								\

		physid_mask_t __physid_mask = PHYSID_MASK_NONE;		\

		physid_set(physid, __physid_mask);			\

		__physid_mask;						\

	})



static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)

{

	physids_clear(*map);

arch/x86/include/asm/mpspec_def.h

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ 


#ifdef CONFIG_X86_32

# define MAX_MPC_ENTRY 1024

# define MAX_APICS      256

#else

# if NR_CPUS <= 255

#  define MAX_APICS     255

# else

#  define MAX_APICS   32768

# endif

#endif



/* Intel MP Floating Pointer Structure */

CRA Git | Maintained and supported by SUSTech CRA and CCSE