Re: [PATCH v3] uio/pdrv_genirq: Add OF support

[Michal Simek]

Grant Likely wrote:
> On Mon, Apr 18, 2011 at 10:50:54AM +0200, Michal Simek wrote:
> > Adding OF binding to genirq.
> > Version string is setup to the "devicetree".
> >
> > Compatible string is not setup for now but you can add your
> > custom compatible string to uio_of_genirq_match structure.
> >
> > For example with "uio" compatible string:
> > static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
> > 	{ .compatible = "uio", },
> > 	{ /* empty for now */ },
> > };
> >
> > Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
> >
> > ---
> >
> > v3: Fix irq binding
> >     Use "devicetree" as version string
> >
> > v2: Remove additional resource binding
> >     Setup correct version string
> >     Clear compatible string
> > ---
> >  drivers/uio/uio_pdrv_genirq.c |   42 +++++++++++++++++++++++++++++++++++++++++
> >  1 files changed, 42 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> > index 7174d51..c8d565a 100644
> > --- a/drivers/uio/uio_pdrv_genirq.c
> > +++ b/drivers/uio/uio_pdrv_genirq.c
> > @@ -23,6 +23,10 @@
> >  #include <linux/pm_runtime.h>
> >  #include <linux/slab.h>
> >  
> > +#include <linux/of.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/of_address.h>
> > +
> >  #define DRIVER_NAME "uio_pdrv_genirq"
> >  
> >  struct uio_pdrv_genirq_platdata {
> > @@ -97,6 +101,30 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
> >  	int ret = -EINVAL;
> >  	int i;
> >  
> > +	if (!uioinfo) {
> > +		int irq;
> > +
> > +		/* alloc uioinfo for one device */
> > +		uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL);
> > +		if (!uioinfo) {
> > +			ret = -ENOMEM;
> > +			dev_err(&pdev->dev, "unable to kmalloc\n");
> > +			goto bad2;
> > +		}
> > +		uioinfo->name = pdev->dev.of_node->name;
> > +		uioinfo->version = "devicetree";
> > +
> > +		/* Multiple IRQs are not supported */
> > +		irq = platform_get_irq(pdev, 0);
> > +		if (irq < 0) {
>
> PowerPC and x86 will return 0 for an unassigned IRQ, as will most platforms.

I have looked at it and platform_get_irq for unassigned IRQ returns -ENXIO.

It is there from 2006 (drivers/base/platform.c)
"[PATCH] driver core: platform_get_irq*(): return -ENXIO on error"
(sha1 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0)

Maybe you have this patch in your queue but it is not in the mainline 2.6.39-rc5.

Maybe should return NO_IRQ instead.
But anyway for current code I would prefer to use this condition to cover all 
architectures NO_IRQ definition.

irq = platform_get_irq(pdev, 0);
if (irq == -ENXIO || irq == NO_IRQ)
	uioinfo->irq = UIO_IRQ_NONE;
else
	uioinfo->irq = irq;

or of course to only NO_IRQ if we do s/-ENXIO/NO_IRQ in platform_get_irq.

if (irq == NO_IRQ)
	uioinfo->irq = UIO_IRQ_NONE;
else
	uioinfo->irq = irq;

What do you think?

Thanks,
Michal


--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/