Commit e1067982 authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

x86: irq: Fix placement of mp_should_keep_irq() 



While f3761db1 ("x86, irq: Fix build error caused by
9eabc99a") addressed the original build problem,
declaration, inline stub, and definition still seem misplaced: It isn't
really IO-APIC related, and it's being used solely in arch/x86/pci/.
This also means stubbing it out when !CONFIG_X86_IO_APIC was at least
questionable.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Link: http://lkml.kernel.org/r/545747BE020000780004436E@mail.emea.novell.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9f50c6ea

arch/x86/include/asm/io_apic.h

+0 −3
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned 


extern void io_apic_eoi(unsigned int apic, unsigned int vector);



extern bool mp_should_keep_irq(struct device *dev);



#else  /* !CONFIG_X86_IO_APIC */



#define io_apic_assign_pci_irqs 0
@@ -239,7 +237,6 @@ static inline int mp_find_ioapic(u32 gsi) { 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 bool mp_should_keep_irq(struct device *dev) { return 1; }



static inline int save_ioapic_entries(void)

{

arch/x86/include/asm/pci_x86.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ extern raw_spinlock_t pci_config_lock; 
extern int (*pcibios_enable_irq)(struct pci_dev *dev);

extern void (*pcibios_disable_irq)(struct pci_dev *dev);



extern bool mp_should_keep_irq(struct device *dev);



struct pci_raw_ops {

	int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,

						int reg, int len, u32 *val);

arch/x86/kernel/apic/io_apic.c

+0 −12
Original line number Diff line number Diff line
@@ -3964,18 +3964,6 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node) 
	return ret;

}



bool mp_should_keep_irq(struct device *dev)

{

	if (dev->power.is_prepared)

		return true;

#ifdef	CONFIG_PM_RUNTIME

	if (dev->power.runtime_status == RPM_SUSPENDING)

		return true;

#endif



	return false;

}



/* Enable IOAPIC early just for system timer */

void __init pre_init_apic_IRQ0(void)

{

arch/x86/pci/irq.c

+12 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dev *dev) 
	return 0;

}



bool mp_should_keep_irq(struct device *dev)

{

	if (dev->power.is_prepared)

		return true;

#ifdef CONFIG_PM_RUNTIME

	if (dev->power.runtime_status == RPM_SUSPENDING)

		return true;

#endif



	return false;

}



static void pirq_disable_irq(struct pci_dev *dev)

{

	if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE