Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81c02a21 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 

Pull x86/apic updates from Thomas Gleixner:
 "This is a major overhaul to the x86 apic subsystem consisting of the
  following parts:

   - Remove obsolete APIC driver abstractions (David Rientjes)

   - Use the irqdomain facilities to dynamically allocate IRQs for
     IOAPICs.  This is a prerequisite to enable IOAPIC hotplug support,
     and it also frees up wasted vectors (Jiang Liu)

   - Misc fixlets.

  Despite the hickup in Ingos previous pull request - caused by the
  missing fixup for the suspend/resume issue reported by Borislav - I
  strongly recommend that this update finds its way into 3.17.  Some
  history for you:

  This is preparatory work for physical IOAPIC hotplug.  The first
  attempt to support this was done by Yinghai and I shot it down because
  it just added another layer of obscurity and complexity to the already
  existing mess without tackling the underlying shortcomings of the
  current implementation.

  After quite some on- and offlist discussions, I requested that the
  design of this functionality must use generic infrastructure, i.e.
  irq domains, which provide all the mechanisms to dynamically map linux
  interrupt numbers to physical interrupts.

  Jiang picked up the idea and did a great job of consolidating the
  existing interfaces to manage the x86 (IOAPIC) interrupt system by
  utilizing irq domains.

  The testing in tip, Linux-next and inside of Intel on various machines
  did not unearth any oddities until Borislav exposed it to one of his
  oddball machines.  The issue was resolved quickly, but unfortunately
  the fix fell through the cracks and did not hit the tip tree before
  Ingo sent the pull request.  Not entirely Ingos fault, I also assumed
  that the fix was already merged when Ingo asked me whether he could
  send it.

  Nevertheless this work has a proper design, has undergone several
  rounds of review and the final fallout after applying it to tip and
  integrating it into Linux-next has been more than moderate.  It's the
  ground work not only for IOAPIC hotplug, it will also allow us to move
  the lowlevel vector allocation into the irqdomain hierarchy, which
  will benefit other architectures as well.  Patches are posted already,
  but they are on hold for two weeks, see below.

  I really appreciate the competence and responsiveness Jiang has shown
  in course of this endavour.  So I'm sure that any fallout of this will
  be addressed in a timely manner.

  FYI, I'm vanishing for 2 weeks into my annual kids summer camp kitchen
  duty^Wvacation, while you folks are drooling at KS/LinuxCon :) But HPA
  will have a look at the hopefully zero fallout until I'm back"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (53 commits)
  x86, irq, PCI: Keep IRQ assignment for PCI devices during suspend/hibernation
  x86/apic/vsmp: Make is_vsmp_box() static
  x86, apic: Remove enable_apic_mode callback
  x86, apic: Remove setup_portio_remap callback
  x86, apic: Remove multi_timer_check callback
  x86, apic: Replace noop_check_apicid_used
  x86, apic: Remove check_apicid_present callback
  x86, apic: Remove mps_oem_check callback
  x86, apic: Remove smp_callin_clear_local_apic callback
  x86, apic: Replace trampoline physical addresses with defaults
  x86, apic: Remove x86_32_numa_cpu_node callback
  x86: intel-mid: Use the new io_apic interfaces
  x86, vsmp: Remove is_vsmp_box() from apic_is_clustered_box()
  x86, irq: Clean up irqdomain transition code
  x86, irq, devicetree: Release IOAPIC pin when PCI device is disabled
  x86, irq, SFI: Release IOAPIC pin when PCI device is disabled
  x86, irq, mpparse: Release IOAPIC pin when PCI device is disabled
  x86, irq, ACPI: Release IOAPIC pin when PCI device is disabled
  x86, irq: Introduce helper functions to release IOAPIC pin
  x86, irq: Simplify the way to handle ISA IRQ
  ...
parents d27c0d90 3eec5952

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ config X86_INTEL_CE 
	bool "CE4100 TV platform"

	depends on PCI

	depends on PCI_GODIRECT

	depends on X86_IO_APIC

	depends on X86_32

	depends on X86_EXTENDED_PLATFORM

	select X86_REBOOTFIXUPS
@@ -840,6 +841,7 @@ config X86_IO_APIC 
	def_bool y

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI

	select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ

	select IRQ_DOMAIN



config X86_REROUTE_FOR_BROKEN_BOOT_IRQS

	bool "Reroute for broken boot IRQs"

arch/x86/include/asm/apic.h

+5 −41
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ static inline bool apic_from_smp_config(void) 
#include <asm/paravirt.h>

#endif



#ifdef CONFIG_X86_64

extern int is_vsmp_box(void);

#else

static inline int is_vsmp_box(void)

{

	return 0;

}

#endif

extern int setup_profiling_timer(unsigned int);



static inline void native_apic_mem_write(u32 reg, u32 v)
@@ -300,7 +292,6 @@ struct apic { 


	int dest_logical;

	unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid);

	unsigned long (*check_apicid_present)(int apicid);



	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask,

					 const struct cpumask *mask);
@@ -309,21 +300,11 @@ struct apic { 
	void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);



	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*cpu_present_to_apicid)(int mps_cpu);

	void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int phys_apicid);

	void (*enable_apic_mode)(void);

	int (*phys_pkg_id)(int cpuid_apic, int index_msb);



	/*

	 * When one of the next two hooks returns 1 the apic

	 * is switched to this. Essentially they are additional

	 * probe functions:

	 */

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem, char *productid);



	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;
@@ -343,11 +324,7 @@ struct apic { 
	/* wakeup_secondary_cpu */

	int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);



	int trampoline_phys_low;

	int trampoline_phys_high;



	bool wait_for_init_deassert;

	void (*smp_callin_clear_local_apic)(void);

	void (*inquire_remote_apic)(int apicid);



	/* apic ops */
@@ -378,14 +355,6 @@ struct apic { 
	 * won't be applied properly during early boot in this case.

	 */

	int (*x86_32_early_logical_apicid)(int cpu);



	/*

	 * Optional method called from setup_local_APIC() after logical

	 * apicid is guaranteed to be known to initialize apicid -> node

	 * mapping if NUMA initialization hasn't done so already.  Don't

	 * add new users.

	 */

	int (*x86_32_numa_cpu_node)(int cpu);

#endif

};
@@ -496,14 +465,12 @@ static inline unsigned default_get_apic_id(unsigned long x) 
}



/*

 * Warm reset vector default position:

 * Warm reset vector position:

 */

#define DEFAULT_TRAMPOLINE_PHYS_LOW		0x467

#define DEFAULT_TRAMPOLINE_PHYS_HIGH		0x469

#define TRAMPOLINE_PHYS_LOW		0x467

#define TRAMPOLINE_PHYS_HIGH		0x469



#ifdef CONFIG_X86_64

extern int default_acpi_madt_oem_check(char *, char *);



extern void apic_send_IPI_self(int vector);



DECLARE_PER_CPU(int, x2apic_extra_bits);
@@ -552,6 +519,8 @@ static inline int default_apic_id_valid(int apicid) 
	return (apicid < 255);

}



extern int default_acpi_madt_oem_check(char *, char *);



extern void default_setup_apic_routing(void);



extern struct apic apic_noop;
@@ -635,11 +604,6 @@ static inline unsigned long default_check_apicid_used(physid_mask_t *map, int ap 
	return physid_isset(apicid, *map);

}



static inline unsigned long default_check_apicid_present(int bit)

{

	return physid_isset(bit, phys_cpu_present_map);

}



static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)

{

	*retmap = *phys_map;

arch/x86/include/asm/hardirq.h

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ typedef struct { 


DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);



/* We can have at most NR_VECTORS irqs routed to a cpu at a time */

#define MAX_HARDIRQS_PER_CPU NR_VECTORS



#define __ARCH_IRQ_STAT



#define inc_irq_stat(member)	this_cpu_inc(irq_stat.member)

arch/x86/include/asm/i8259.h

+5 −0
Original line number Diff line number Diff line
@@ -67,4 +67,9 @@ struct legacy_pic { 
extern struct legacy_pic *legacy_pic;

extern struct legacy_pic null_legacy_pic;



static inline int nr_legacy_irqs(void)

{

	return legacy_pic->nr_legacy_irqs;

}



#endif /* _ASM_X86_I8259_H */

arch/x86/include/asm/io_apic.h

+34 −22
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ struct IR_IO_APIC_route_entry { 
#define IOAPIC_AUTO     -1

#define IOAPIC_EDGE     0

#define IOAPIC_LEVEL    1

#define	IOAPIC_MAP_ALLOC		0x1

#define	IOAPIC_MAP_CHECK		0x2



#ifdef CONFIG_X86_IO_APIC
@@ -118,9 +120,6 @@ extern int mp_irq_entries; 
/* MP IRQ source entries */

extern struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];



/* non-0 if default (table-less) MP configuration */

extern int mpc_default_type;



/* Older SiS APIC requires we rewrite the index register */

extern int sis_apic_bug;
@@ -133,9 +132,6 @@ extern int noioapicquirk; 
/* -1 if "noapic" boot option passed */

extern int noioapicreroute;



/* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */

extern int timer_through_8259;



/*

 * If we use the IO-APIC for IRQ routing, disable automatic

 * assignment of PCI IRQ's.
@@ -145,14 +141,8 @@ extern int timer_through_8259; 


struct io_apic_irq_attr;

struct irq_cfg;

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_insert_resources(void);



extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,

				     unsigned int, int,

				     struct io_apic_irq_attr *);

extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,

				     unsigned int, int,

				     struct io_apic_irq_attr *);
@@ -162,7 +152,6 @@ extern void native_compose_msi_msg(struct pci_dev *pdev, 
				   unsigned int irq, unsigned int dest,

				   struct msi_msg *msg, u8 hpet_id);

extern void native_eoi_ioapic_pin(int apic, int pin, int vector);

int io_apic_setup_irq_pin_once(unsigned int irq, int node, struct io_apic_irq_attr *attr);



extern int save_ioapic_entries(void);

extern void mask_ioapic_entries(void);
@@ -171,15 +160,40 @@ extern int restore_ioapic_entries(void); 
extern void setup_ioapic_ids_from_mpc(void);

extern void setup_ioapic_ids_from_mpc_nocheck(void);



enum ioapic_domain_type {

	IOAPIC_DOMAIN_INVALID,

	IOAPIC_DOMAIN_LEGACY,

	IOAPIC_DOMAIN_STRICT,

	IOAPIC_DOMAIN_DYNAMIC,

};



struct device_node;

struct irq_domain;

struct irq_domain_ops;



struct ioapic_domain_cfg {

	enum ioapic_domain_type		type;

	const struct irq_domain_ops	*ops;

	struct device_node		*dev;

};



struct mp_ioapic_gsi{

	u32 gsi_base;

	u32 gsi_end;

};

extern struct mp_ioapic_gsi  mp_gsi_routing[];

extern u32 gsi_top;

int mp_find_ioapic(u32 gsi);

int mp_find_ioapic_pin(int ioapic, u32 gsi);

void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);



extern int mp_find_ioapic(u32 gsi);

extern int mp_find_ioapic_pin(int ioapic, u32 gsi);

extern u32 mp_pin_to_gsi(int ioapic, int pin);

extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags);

extern void mp_unmap_irq(int irq);

extern void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,

				      struct ioapic_domain_cfg *cfg);

extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,

			    irq_hw_number_t hwirq);

extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq);

extern int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node);

extern void __init pre_init_apic_IRQ0(void);



extern void mp_save_irq(struct mpc_intsrc *m);
@@ -217,14 +231,12 @@ extern void io_apic_eoi(unsigned int apic, unsigned int vector); 


#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_insert_resources(void) { }

#define gsi_top (NR_IRQS_LEGACY)

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



struct io_apic_irq_attr;

static inline int io_apic_set_pci_routing(struct device *dev, int irq,

		 struct io_apic_irq_attr *irq_attr) { return 0; }

static inline u32 mp_pin_to_gsi(int ioapic, int pin) { return UINT_MAX; }

static inline int mp_map_gsi_to_irq(u32 gsi, unsigned int flags) { return gsi; }

static inline void mp_unmap_irq(int irq) { }



static inline int save_ioapic_entries(void)

{