Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
pci
/
irq.c
diff --git
a/kernel/arch/x86/pci/irq.c
b/kernel/arch/x86/pci/irq.c
index
32e7034
..
9bd1154
100644
(file)
--- a/
kernel/arch/x86/pci/irq.c
+++ b/
kernel/arch/x86/pci/irq.c
@@
-1202,7
+1202,7
@@
static int pirq_enable_irq(struct pci_dev *dev)
struct pci_dev *temp_dev;
int irq;
struct pci_dev *temp_dev;
int irq;
- if (
pci_has_managed_irq(dev)
)
+ if (
dev->irq_managed && dev->irq > 0
)
return 0;
irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
return 0;
irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
@@
-1230,7
+1230,8
@@
static int pirq_enable_irq(struct pci_dev *dev)
}
dev = temp_dev;
if (irq >= 0) {
}
dev = temp_dev;
if (irq >= 0) {
- pci_set_managed_irq(dev, irq);
+ dev->irq_managed = 1;
+ dev->irq = irq;
dev_info(&dev->dev, "PCI->APIC IRQ transform: "
"INT %c -> IRQ %d\n", 'A' + pin - 1, irq);
return 0;
dev_info(&dev->dev, "PCI->APIC IRQ transform: "
"INT %c -> IRQ %d\n", 'A' + pin - 1, irq);
return 0;
@@
-1256,10
+1257,24
@@
static int pirq_enable_irq(struct pci_dev *dev)
return 0;
}
return 0;
}
+bool mp_should_keep_irq(struct device *dev)
+{
+ if (dev->power.is_prepared)
+ return true;
+#ifdef CONFIG_PM
+ if (dev->power.runtime_status == RPM_SUSPENDING)
+ return true;
+#endif
+
+ return false;
+}
+
static void pirq_disable_irq(struct pci_dev *dev)
{
static void pirq_disable_irq(struct pci_dev *dev)
{
- if (io_apic_assign_pci_irqs && pci_has_managed_irq(dev)) {
+ if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
+ dev->irq_managed && dev->irq) {
mp_unmap_irq(dev->irq);
mp_unmap_irq(dev->irq);
- pci_reset_managed_irq(dev);
+ dev->irq = 0;
+ dev->irq_managed = 0;
}
}
}
}