p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Bjorn Helgaas 2014-11-21 10:11:33 -07:00
parent 18e88beceb f833869427
commit 149792795d
6 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/s390/pci/pci.c
View File

@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev)
/* Release MSI interrupts */ /* Release MSI interrupts */
list_for_each_entry(msi, &pdev->msi_list, list) { list_for_each_entry(msi, &pdev->msi_list, list) {
if (msi->msi_attrib.is_msix) if (msi->msi_attrib.is_msix)
default_msix_mask_irq(msi, 1); __msix_mask_irq(msi, 1);
else else
default_msi_mask_irq(msi, 1, 1); __msi_mask_irq(msi, 1, 1);
irq_set_msi_desc(msi->irq, NULL); irq_set_msi_desc(msi->irq, NULL);
irq_free_desc(msi->irq); irq_free_desc(msi->irq);
msi->msg.address_lo = 0; msi->msg.address_lo = 0;

3
arch/x86/include/asm/x86_init.h
View File

@ -172,7 +172,6 @@ struct x86_platform_ops {
struct pci_dev; struct pci_dev;
struct msi_msg; struct msi_msg;
struct msi_desc;
struct x86_msi_ops { struct x86_msi_ops {
int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type); int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
@ -183,8 +182,6 @@ struct x86_msi_ops {
void (*teardown_msi_irqs)(struct pci_dev *dev); void (*teardown_msi_irqs)(struct pci_dev *dev);
void (*restore_msi_irqs)(struct pci_dev *dev); void (*restore_msi_irqs)(struct pci_dev *dev);
int (*setup_hpet_msi)(unsigned int irq, unsigned int id); int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
}; };
struct IO_APIC_route_entry; struct IO_APIC_route_entry;

10
arch/x86/kernel/x86_init.c
View File

@ -116,8 +116,6 @@ struct x86_msi_ops x86_msi = {
.teardown_msi_irqs = default_teardown_msi_irqs, .teardown_msi_irqs = default_teardown_msi_irqs,
.restore_msi_irqs = default_restore_msi_irqs, .restore_msi_irqs = default_restore_msi_irqs,
.setup_hpet_msi = default_setup_hpet_msi, .setup_hpet_msi = default_setup_hpet_msi,
.msi_mask_irq = default_msi_mask_irq,
.msix_mask_irq = default_msix_mask_irq,
}; };
/* MSI arch specific hooks */ /* MSI arch specific hooks */
@ -140,14 +138,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
{ {
x86_msi.restore_msi_irqs(dev); x86_msi.restore_msi_irqs(dev);
} }
u32 arch_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
{
return x86_msi.msi_mask_irq(desc, mask, flag);
}
u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
{
return x86_msi.msix_mask_irq(desc, flag);
}
#endif #endif
struct x86_io_apic_ops x86_io_apic_ops = { struct x86_io_apic_ops x86_io_apic_ops = {

15
arch/x86/pci/xen.c
View File

@ -394,14 +394,7 @@ static void xen_teardown_msi_irq(unsigned int irq)
{ {
xen_destroy_irq(irq); xen_destroy_irq(irq);
} }
static u32 xen_nop_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
{
return 0;
}
static u32 xen_nop_msix_mask_irq(struct msi_desc *desc, u32 flag)
{
return 0;
}
#endif #endif
int __init pci_xen_init(void) int __init pci_xen_init(void)
@ -425,8 +418,7 @@ int __init pci_xen_init(void)
x86_msi.setup_msi_irqs = xen_setup_msi_irqs; x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
x86_msi.teardown_msi_irq = xen_teardown_msi_irq; x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
x86_msi.msi_mask_irq = xen_nop_msi_mask_irq; pci_msi_ignore_mask = 1;
x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
#endif #endif
return 0; return 0;
} }
@ -506,8 +498,7 @@ int __init pci_xen_initial_domain(void)
x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
x86_msi.teardown_msi_irq = xen_teardown_msi_irq; x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
x86_msi.msi_mask_irq = xen_nop_msi_mask_irq; pci_msi_ignore_mask = 1;
x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
#endif #endif
xen_setup_acpi_sci(); xen_setup_acpi_sci();
__acpi_register_gsi = acpi_register_gsi_xen; __acpi_register_gsi = acpi_register_gsi_xen;

29
drivers/pci/msi.c
View File

@ -23,6 +23,7 @@
#include "pci.h" #include "pci.h"
static int pci_msi_enable = 1; static int pci_msi_enable = 1;
int pci_msi_ignore_mask;
#define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) #define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1)
@ -163,11 +164,11 @@ static inline __attribute_const__ u32 msi_mask(unsigned x)
* reliably as devices without an INTx disable bit will then generate a * reliably as devices without an INTx disable bit will then generate a
* level IRQ which will never be cleared. * level IRQ which will never be cleared.
*/ */
u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
{ {
u32 mask_bits = desc->masked; u32 mask_bits = desc->masked;
if (!desc->msi_attrib.maskbit) if (pci_msi_ignore_mask || !desc->msi_attrib.maskbit)
return 0; return 0;
mask_bits &= ~mask; mask_bits &= ~mask;
@ -177,14 +178,9 @@ u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
return mask_bits; return mask_bits;
} }
__weak u32 arch_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
{
return default_msi_mask_irq(desc, mask, flag);
}
static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
{ {
desc->masked = arch_msi_mask_irq(desc, mask, flag); desc->masked = __msi_mask_irq(desc, mask, flag);
} }
/* /*
@ -194,11 +190,15 @@ static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
* file. This saves a few milliseconds when initialising devices with lots * file. This saves a few milliseconds when initialising devices with lots
* of MSI-X interrupts. * of MSI-X interrupts.
*/ */
u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag) u32 __msix_mask_irq(struct msi_desc *desc, u32 flag)
{ {
u32 mask_bits = desc->masked; u32 mask_bits = desc->masked;
unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
PCI_MSIX_ENTRY_VECTOR_CTRL; PCI_MSIX_ENTRY_VECTOR_CTRL;
if (pci_msi_ignore_mask)
return 0;
mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;
if (flag) if (flag)
mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT; mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT;
@ -207,14 +207,9 @@ u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag)
return mask_bits; return mask_bits;
} }
__weak u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
{
return default_msix_mask_irq(desc, flag);
}
static void msix_mask_irq(struct msi_desc *desc, u32 flag) static void msix_mask_irq(struct msi_desc *desc, u32 flag)
{ {
desc->masked = arch_msix_mask_irq(desc, flag); desc->masked = __msix_mask_irq(desc, flag);
} }
static void msi_set_mask_bit(struct irq_data *data, u32 flag) static void msi_set_mask_bit(struct irq_data *data, u32 flag)
@ -869,7 +864,7 @@ void pci_msi_shutdown(struct pci_dev *dev)
/* Return the device with MSI unmasked as initial states */ /* Return the device with MSI unmasked as initial states */
mask = msi_mask(desc->msi_attrib.multi_cap); mask = msi_mask(desc->msi_attrib.multi_cap);
/* Keep cached state to be restored */ /* Keep cached state to be restored */
arch_msi_mask_irq(desc, mask, ~mask); __msi_mask_irq(desc, mask, ~mask);
/* Restore dev->irq to its default pin-assertion irq */ /* Restore dev->irq to its default pin-assertion irq */
dev->irq = desc->msi_attrib.default_irq; dev->irq = desc->msi_attrib.default_irq;
@ -967,7 +962,7 @@ void pci_msix_shutdown(struct pci_dev *dev)
/* Return the device with MSI-X masked as initial states */ /* Return the device with MSI-X masked as initial states */
list_for_each_entry(entry, &dev->msi_list, list) { list_for_each_entry(entry, &dev->msi_list, list) {
/* Keep cached states to be restored */ /* Keep cached states to be restored */
arch_msix_mask_irq(entry, 1); __msix_mask_irq(entry, 1);
} }
msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

5
include/linux/msi.h
View File

@ -10,6 +10,7 @@ struct msi_msg {
u32 data; /* 16 bits of msi message data */ u32 data; /* 16 bits of msi message data */
}; };
extern int pci_msi_ignore_mask;
/* Helper functions */ /* Helper functions */
struct irq_data; struct irq_data;
struct msi_desc; 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 read_msi_msg(unsigned int irq, struct msi_msg *msg);
void get_cached_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); 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 msi_desc {
struct { 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_teardown_msi_irqs(struct pci_dev *dev);
void default_restore_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 msi_chip {
struct module *owner; struct module *owner;