Commit 6e325a62 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Greg Kroah-Hartman

[PATCH] PCI: make MSI quirk inheritable from the pci bus

It turns out AMD 8131 quirk only affects MSI for devices behind the 8131 bridge.
Handle this by adding a flags field in pci_bus, inherited from parent to child.
Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e5548e96
...@@ -703,6 +703,9 @@ int pci_enable_msi(struct pci_dev* dev) ...@@ -703,6 +703,9 @@ int pci_enable_msi(struct pci_dev* dev)
if (dev->no_msi) if (dev->no_msi)
return status; return status;
if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
return -EINVAL;
temp = dev->irq; temp = dev->irq;
status = msi_init(); status = msi_init();
......
...@@ -347,6 +347,7 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr) ...@@ -347,6 +347,7 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr)
child->parent = parent; child->parent = parent;
child->ops = parent->ops; child->ops = parent->ops;
child->sysdata = parent->sysdata; child->sysdata = parent->sysdata;
child->bus_flags = parent->bus_flags;
child->bridge = get_device(&bridge->dev); child->bridge = get_device(&bridge->dev);
child->class_dev.class = &pcibus_class; child->class_dev.class = &pcibus_class;
......
...@@ -575,8 +575,11 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) ...@@ -575,8 +575,11 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
{ {
unsigned char revid, tmp; unsigned char revid, tmp;
pci_msi_quirk = 1; if (dev->subordinate) {
printk(KERN_WARNING "PCI: MSI quirk detected. pci_msi_quirk set.\n"); printk(KERN_WARNING "PCI: MSI quirk detected. "
"PCI_BUS_FLAGS_NO_MSI set for subordinate bus.\n");
dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
}
if (nr_ioapics == 0) if (nr_ioapics == 0)
return; return;
......
...@@ -95,6 +95,11 @@ enum pci_channel_state { ...@@ -95,6 +95,11 @@ enum pci_channel_state {
pci_channel_io_perm_failure = (__force pci_channel_state_t) 3, pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
}; };
typedef unsigned short __bitwise pci_bus_flags_t;
enum pci_bus_flags {
PCI_BUS_FLAGS_NO_MSI = (pci_bus_flags_t) 1,
};
/* /*
* The pci_dev structure is used to describe PCI devices. * The pci_dev structure is used to describe PCI devices.
*/ */
...@@ -203,7 +208,7 @@ struct pci_bus { ...@@ -203,7 +208,7 @@ struct pci_bus {
char name[48]; char name[48];
unsigned short bridge_ctl; /* manage NO_ISA/FBB/et al behaviors */ unsigned short bridge_ctl; /* manage NO_ISA/FBB/et al behaviors */
unsigned short pad2; pci_bus_flags_t bus_flags; /* Inherited by child busses */
struct device *bridge; struct device *bridge;
struct class_device class_dev; struct class_device class_dev;
struct bin_attribute *legacy_io; /* legacy I/O for this bus */ struct bin_attribute *legacy_io; /* legacy I/O for this bus */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment