Commit 5f6fb454 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-core-for-linus' of... 

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

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (116 commits)
  x86: Enable forced interrupt threading support
  x86: Mark low level interrupts IRQF_NO_THREAD
  x86: Use generic show_interrupts
  x86: ioapic: Avoid redundant lookup of irq_cfg
  x86: ioapic: Use new move_irq functions
  x86: Use the proper accessors in fixup_irqs()
  x86: ioapic: Use irq_data->state
  x86: ioapic: Simplify irq chip and handler setup
  x86: Cleanup the genirq name space
  genirq: Add chip flag to force mask on suspend
  genirq: Add desc->irq_data accessor
  genirq: Add comments to Kconfig switches
  genirq: Fixup fasteoi handler for oneshot mode
  genirq: Provide forced interrupt threading
  sched: Switch wait_task_inactive to schedule_hrtimeout()
  genirq: Add IRQF_NO_THREAD
  genirq: Allow shared oneshot interrupts
  genirq: Prepare the handling of shared oneshot interrupts
  genirq: Make warning in handle_percpu_event useful
  x86: ioapic: Move trigger defines to io_apic.h
  ...

Fix up trivial(?) conflicts in arch/x86/pci/xen.c due to genirq name
space changes clashing with the Xen cleanups.  The set_irq_msi() had
moved to xen_bind_pirq_msi_to_irq().
parents 3904afb4 c0185808

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -2444,6 +2444,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			<deci-seconds>: poll all this frequency

			0: no polling (default)



	threadirqs	[KNL]

			Force threading of all interrupt handlers except those

			marked explicitely IRQF_NO_THREAD.



	topology=	[S390]

			Format: {off | on}

			Specify if the kernel should make use of the cpu

arch/x86/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ config X86 
	select GENERIC_FIND_NEXT_BIT

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select GENERIC_IRQ_SHOW

	select IRQ_FORCED_THREADING

	select USE_GENERIC_SMP_HELPERS if SMP



config INSTRUCTION_DECODER
@@ -813,7 +815,7 @@ config X86_LOCAL_APIC 


config X86_IO_APIC

	def_bool y

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC

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



config X86_VISWS_APIC

	def_bool y

arch/x86/include/asm/apicdef.h

+12 −0
Original line number Diff line number Diff line
@@ -426,4 +426,16 @@ struct local_apic { 
#else

 #define BAD_APICID 0xFFFFu

#endif



enum ioapic_irq_destination_types {

	dest_Fixed		= 0,

	dest_LowestPrio		= 1,

	dest_SMI		= 2,

	dest__reserved_1	= 3,

	dest_NMI		= 4,

	dest_INIT		= 5,

	dest__reserved_2	= 6,

	dest_ExtINT		= 7

};



#endif /* _ASM_X86_APICDEF_H */

arch/x86/include/asm/io_apic.h

+28 −16
Original line number Diff line number Diff line
@@ -63,17 +63,6 @@ union IO_APIC_reg_03 { 
	} __attribute__ ((packed)) bits;

};



enum ioapic_irq_destination_types {

	dest_Fixed = 0,

	dest_LowestPrio = 1,

	dest_SMI = 2,

	dest__reserved_1 = 3,

	dest_NMI = 4,

	dest_INIT = 5,

	dest__reserved_2 = 6,

	dest_ExtINT = 7

};



struct IO_APIC_route_entry {

	__u32	vector		:  8,

		delivery_mode	:  3,	/* 000: FIXED
@@ -106,6 +95,10 @@ struct IR_IO_APIC_route_entry { 
		index		: 15;

} __attribute__ ((packed));



#define IOAPIC_AUTO     -1

#define IOAPIC_EDGE     0

#define IOAPIC_LEVEL    1



#ifdef CONFIG_X86_IO_APIC



/*
@@ -150,11 +143,6 @@ extern int timer_through_8259; 
#define io_apic_assign_pci_irqs \

	(mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)



extern u8 io_apic_unique_id(u8 id);

extern int io_apic_get_unique_id(int ioapic, int apic_id);

extern int io_apic_get_version(int ioapic);

extern int io_apic_get_redir_entries(int ioapic);



struct io_apic_irq_attr;

extern int io_apic_set_pci_routing(struct device *dev, int irq,

		 struct io_apic_irq_attr *irq_attr);
@@ -162,6 +150,8 @@ void setup_IO_APIC_irq_extra(u32 gsi); 
extern void ioapic_and_gsi_init(void);

extern void ioapic_insert_resources(void);



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



extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);

extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries);

extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
@@ -186,6 +176,8 @@ extern void __init pre_init_apic_IRQ0(void); 


extern void mp_save_irq(struct mpc_intsrc *m);



extern void disable_ioapic_support(void);



#else  /* !CONFIG_X86_IO_APIC */



#define io_apic_assign_pci_irqs 0
@@ -199,6 +191,26 @@ 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 struct IO_APIC_route_entry **alloc_ioapic_entries(void)

{

	return NULL;

}



static inline void free_ioapic_entries(struct IO_APIC_route_entry **ent) { }

static inline int save_IO_APIC_setup(struct IO_APIC_route_entry **ent)

{

	return -ENOMEM;

}



static inline void mask_IO_APIC_setup(struct IO_APIC_route_entry **ent) { }

static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)

{

	return -ENOMEM;

}



static inline void mp_save_irq(struct mpc_intsrc *m) { };

static inline void disable_ioapic_support(void) { }

#endif



#endif /* _ASM_X86_IO_APIC_H */

arch/x86/kernel/apic/apic.c

+3 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/i8259.h>

#include <asm/proto.h>

#include <asm/apic.h>

#include <asm/io_apic.h>

#include <asm/desc.h>

#include <asm/hpet.h>

#include <asm/idle.h>
@@ -1209,7 +1210,7 @@ void __cpuinit setup_local_APIC(void) 
		rdtscll(tsc);



	if (disable_apic) {

		arch_disable_smp_support();

		disable_ioapic_support();

		return;

	}
@@ -1448,7 +1449,7 @@ int __init enable_IR(void) 
void __init enable_IR_x2apic(void)

{

	unsigned long flags;

	struct IO_APIC_route_entry **ioapic_entries = NULL;

	struct IO_APIC_route_entry **ioapic_entries;

	int ret, x2apic_enabled = 0;

	int dmar_table_init_ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE