Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/pci/msi.c

+3 −0
Original line number Diff line number Diff line
@@ -703,6 +703,9 @@ int pci_enable_msi(struct pci_dev* dev) 
	if (dev->no_msi)

		return status;



	if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)

		return -EINVAL;



	temp = dev->irq;



	status = msi_init();

drivers/pci/probe.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr) 
	child->parent = parent;

	child->ops = parent->ops;

	child->sysdata = parent->sysdata;

	child->bus_flags = parent->bus_flags;

	child->bridge = get_device(&bridge->dev);



	child->class_dev.class = &pcibus_class;

drivers/pci/quirks.c

+5 −2
Original line number Diff line number Diff line
@@ -575,8 +575,11 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) 
{ 

        unsigned char revid, tmp;

        

	pci_msi_quirk = 1;

	printk(KERN_WARNING "PCI: MSI quirk detected. pci_msi_quirk set.\n");

	if (dev->subordinate) {

		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) 

                return;

include/linux/pci.h

+6 −1
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ enum pci_channel_state { 
	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.

 */
@@ -203,7 +208,7 @@ struct pci_bus { 
	char		name[48];



	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 class_device	class_dev;

	struct bin_attribute	*legacy_io; /* legacy I/O for this bus */