diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-08-09 16:27:08 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-12 11:26:58 -0400 |
commit | 0cbdcfcf427b63b9670e56760ef5e67cd7081b35 (patch) | |
tree | 941122e2248ac4b8dd107bc1702c83cbc0961166 /drivers/pci/msi.c | |
parent | ebd97be635bff43239f391a49c78b98818c589fe (diff) |
PCI: Introduce new MSI chip infrastructure
The new struct msi_chip is used to associated an MSI controller with a
PCI bus. It is automatically handed down from the root to its children
during bus enumeration.
This patch provides default (weak) implementations for the architecture-
specific MSI functions (arch_setup_msi_irq(), arch_teardown_msi_irq()
and arch_msi_check_device()) which check if a PCI device's bus has an
attached MSI chip and forward the call appropriately.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Daniel Price <daniel.price@gmail.com>
Tested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r-- | drivers/pci/msi.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 823c3861c4d8..2837285c4e83 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -32,16 +32,39 @@ static int pci_msi_enable = 1; | |||
32 | 32 | ||
33 | int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | 33 | int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) |
34 | { | 34 | { |
35 | return -EINVAL; | 35 | struct msi_chip *chip = dev->bus->msi; |
36 | int err; | ||
37 | |||
38 | if (!chip || !chip->setup_irq) | ||
39 | return -EINVAL; | ||
40 | |||
41 | err = chip->setup_irq(chip, dev, desc); | ||
42 | if (err < 0) | ||
43 | return err; | ||
44 | |||
45 | irq_set_chip_data(desc->irq, chip); | ||
46 | |||
47 | return 0; | ||
36 | } | 48 | } |
37 | 49 | ||
38 | void __weak arch_teardown_msi_irq(unsigned int irq) | 50 | void __weak arch_teardown_msi_irq(unsigned int irq) |
39 | { | 51 | { |
52 | struct msi_chip *chip = irq_get_chip_data(irq); | ||
53 | |||
54 | if (!chip || !chip->teardown_irq) | ||
55 | return; | ||
56 | |||
57 | chip->teardown_irq(chip, irq); | ||
40 | } | 58 | } |
41 | 59 | ||
42 | int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type) | 60 | int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type) |
43 | { | 61 | { |
44 | return 0; | 62 | struct msi_chip *chip = dev->bus->msi; |
63 | |||
64 | if (!chip || !chip->check_device) | ||
65 | return 0; | ||
66 | |||
67 | return chip->check_device(chip, dev, nvec, type); | ||
45 | } | 68 | } |
46 | 69 | ||
47 | int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | 70 | int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) |