mcb: Add support for shared PCI IRQs

Add support for shared PCI IRQs to mcb and mcb-pci.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@men.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 31 insertions, 6 deletions

diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index bbe12932d404..9018ab83517a 100644
--- a/drivers/mcb/mcb-core.c
+++ b/drivers/mcb/mcb-core.c
@@ -183,14 +183,14 @@ EXPORT_SYMBOL_GPL(mcb_device_register);
  *
  * Allocate a new @mcb_bus.
  */
-struct mcb_bus *mcb_alloc_bus(void)
+struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 {
         struct mcb_bus *bus;
         int bus_nr;
 
         bus = kzalloc(sizeof(struct mcb_bus), GFP_KERNEL);
         if (!bus)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         bus_nr = ida_simple_get(&mcb_ida, 0, 0, GFP_KERNEL);
         if (bus_nr < 0) {
@@ -200,7 +200,7 @@ struct mcb_bus *mcb_alloc_bus(void)
 
         INIT_LIST_HEAD(&bus->children);
         bus->bus_nr = bus_nr;
-
+        bus->carrier = carrier;
         return bus;
 }
 EXPORT_SYMBOL_GPL(mcb_alloc_bus);
@@ -378,6 +378,13 @@ void mcb_release_mem(struct resource *mem)
 }
 EXPORT_SYMBOL_GPL(mcb_release_mem);
 
+static int __mcb_get_irq(struct mcb_device *dev)
+{
+        struct resource *irq = &dev->irq;
+
+        return irq->start;
+}
+
 /**
  * mcb_get_irq() - Get device's IRQ number
  * @dev: The @mcb_device the IRQ is for
@@ -386,9 +393,12 @@ EXPORT_SYMBOL_GPL(mcb_release_mem);
  */
 int mcb_get_irq(struct mcb_device *dev)
 {
-        struct resource *irq = &dev->irq;
+        struct mcb_bus *bus = dev->bus;
 
-        return irq->start;
+        if (bus->get_irq)
+                return bus->get_irq(dev);
+
+        return __mcb_get_irq(dev);
 }
 EXPORT_SYMBOL_GPL(mcb_get_irq);
 
diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c
index 99c742cbfb5b..b59181965643 100644
--- a/drivers/mcb/mcb-pci.c
+++ b/drivers/mcb/mcb-pci.c
@@ -20,6 +20,15 @@ struct priv {
         void __iomem *base;
 };
 
+static int mcb_pci_get_irq(struct mcb_device *mdev)
+{
+        struct mcb_bus *mbus = mdev->bus;
+        struct device *dev = mbus->carrier;
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        return pdev->irq;
+}
+
 static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         struct priv *priv;
@@ -67,7 +76,13 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pci_set_drvdata(pdev, priv);
 
-        priv->bus = mcb_alloc_bus();
+        priv->bus = mcb_alloc_bus(&pdev->dev);
+        if (IS_ERR(priv->bus)) {
+                ret = PTR_ERR(priv->bus);
+                goto err_drvdata;
+        }
+
+        priv->bus->get_irq = mcb_pci_get_irq;
 
         ret = chameleon_parse_cells(priv->bus, mapbase, priv->base);
         if (ret < 0)