Commit 4ec65b77 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman
Browse files

mcb: Add support for shared PCI IRQs 



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

Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@men.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e1c951f

drivers/mcb/mcb-core.c

+15 −5
Original line number Diff line number Diff line
@@ -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);

drivers/mcb/mcb-pci.c

+16 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/mcb.h

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/irqreturn.h>



struct mcb_driver;

struct mcb_device;



/**

 * struct mcb_bus - MEN Chameleon Bus
@@ -23,11 +24,14 @@ struct mcb_driver; 
 * @dev: pointer to carrier device

 * @children: the child busses

 * @bus_nr: mcb bus number

 * @get_irq: callback to get IRQ number

 */

struct mcb_bus {

	struct list_head children;

	struct device dev;

	struct device *carrier;

	int bus_nr;

	int (*get_irq)(struct mcb_device *dev);

};

#define to_mcb_bus(b) container_of((b), struct mcb_bus, dev)
@@ -105,7 +109,7 @@ extern void mcb_unregister_driver(struct mcb_driver *driver); 
	module_driver(__mcb_driver, mcb_register_driver, mcb_unregister_driver);

extern void mcb_bus_add_devices(const struct mcb_bus *bus);

extern int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev);

extern struct mcb_bus *mcb_alloc_bus(void);

extern struct mcb_bus *mcb_alloc_bus(struct device *carrier);

extern struct mcb_bus *mcb_bus_get(struct mcb_bus *bus);

extern void mcb_bus_put(struct mcb_bus *bus);

extern struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus);