ix86: fix placement of mp_should_keep_irq()
PATCH 1/1 ix86: fix placement of mp_should_keep_irq()
While f3761db164 ("x86, irq: Fix build error caused by 9eabc99a635a77cbf09") 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.
---
Note: This replaces (rather than fixes) the previously sent "ix86: fix build failure when !CONFIG_X86_IO_APIC" (which conflicts with the commit mentioned above).
--- arch/x86/include/asm/io_apic.h | 3 --- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 15 deletions(-)
arch/x86/include/asm/io_apic.h +0 -3
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsignextern 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 gsistatic 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
@@ -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
@@ -3964,18 +3964,6 @@ int mp_set_gsi_attr(u32 gsi, int triggerreturn 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
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dereturn 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) &&
tip-bot for Jan Beulich
merge bot[tip:x86/apic] x86: irq: Fix placement of mp_should_keep_irq()
x86: irq: Fix placement of mp_should_keep_irq()
Commit-ID: 3b67bdc6599e25b082f12dbde6b0ce91dd235549 Gitweb: http://git.kernel.org/tip/3b67bdc6599e25b082f12dbde6b0ce91dd235549 Author: Jan Beulich <[email protected]> AuthorDate: Mon, 3 Nov 2014 08:15:42 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 4 Nov 2014 19:12:41 +0100
x86: irq: Fix placement of mp_should_keep_irq()
While f3761db164 ("x86, irq: Fix build error caused by 9eabc99a635a77cbf09") 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.
--- arch/x86/include/asm/io_apic.h | 3 --- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 15 deletions(-)
arch/x86/include/asm/io_apic.h +0 -3
@@ -229,8 +229,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsignedextern 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
@@ -241,7 +239,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
@@ -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
@@ -4116,18 +4116,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
@@ -1258,6 +1258,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) &&
tip-bot for Jan Beulich
merge bot[tip:x86/apic] x86: irq: Fix placement of mp_should_keep_irq()
In reply to Jan Beulichx86: irq: Fix placement of mp_should_keep_irq()
Commit-ID: e10679825924580845c4825deaaddf5331ff627c Gitweb: http://git.kernel.org/tip/e10679825924580845c4825deaaddf5331ff627c Author: Jan Beulich <[email protected]> AuthorDate: Mon, 3 Nov 2014 08:15:42 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Dec 2014 14:08:14 +0100
x86: irq: Fix placement of mp_should_keep_irq()
While f3761db164 ("x86, irq: Fix build error caused by 9eabc99a635a77cbf09") 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.
--- arch/x86/include/asm/io_apic.h | 3 --- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 15 deletions(-)
arch/x86/include/asm/io_apic.h +0 -3
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsignedextern 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
@@ -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
@@ -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
@@ -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) &&