diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 10:11:33 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 10:11:33 -0700 |
| commit | 149792795d2bab33954bc025fcf145a8009683f6 (patch) | |
| tree | aee13528ef690a64decf22e2c412b15644442a80 /include | |
| parent | Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/numa' and 'pci/virtualization' into next (diff) | |
| parent | s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() (diff) | |
| download | linux-dev-149792795d2bab33954bc025fcf145a8009683f6.tar.xz linux-dev-149792795d2bab33954bc025fcf145a8009683f6.zip | |
Merge branch 'pci/msi' into next
* pci/msi:
s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/msi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index 44f4746d033b..efad12742e45 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -10,6 +10,7 @@ struct msi_msg { u32 data; /* 16 bits of msi message data */ }; +extern int pci_msi_ignore_mask; /* Helper functions */ struct irq_data; struct msi_desc; @@ -21,6 +22,8 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void read_msi_msg(unsigned int irq, struct msi_msg *msg); void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg); void write_msi_msg(unsigned int irq, struct msi_msg *msg); +u32 __msix_mask_irq(struct msi_desc *desc, u32 flag); +u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); struct msi_desc { struct { @@ -61,8 +64,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev); void default_teardown_msi_irqs(struct pci_dev *dev); void default_restore_msi_irqs(struct pci_dev *dev); -u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); -u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag); struct msi_chip { struct module *owner; |