PNP: check for conflicts with all resources, not just earlier ones
[safe/jmp/linux-2.6] / drivers / pnp / resource.c
index ef12869..eab16e5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * resource.c - Contains functions for registering and analyzing resource information
  *
- * based on isapnp.c resource management (c) Jaroslav Kysela <perex@suse.cz>
+ * based on isapnp.c resource management (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2003 Adam Belay <ambx1@neo.rr.com>
  */
 
@@ -51,8 +51,10 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
 
        /* this should never happen but if it does we'll try to continue */
        if (dev->independent)
-               pnp_err("independent resource already registered");
+               dev_err(&dev->dev, "independent resource already registered\n");
        dev->independent = option;
+
+       dev_dbg(&dev->dev, "new independent option\n");
        return option;
 }
 
@@ -70,12 +72,18 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
                parent->next = option;
        } else
                dev->dependent = option;
+
+       dev_dbg(&dev->dev, "new dependent option (priority %#x)\n", priority);
        return option;
 }
 
-int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
+int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
+                             struct pnp_irq *data)
 {
        struct pnp_irq *ptr;
+#ifdef DEBUG
+       char buf[PNP_IRQ_NR];   /* hex-encoded, so this is overkill but safe */
+#endif
 
        ptr = option->irq;
        while (ptr && ptr->next)
@@ -94,10 +102,17 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
                                pcibios_penalize_isa_irq(i, 0);
        }
 #endif
+
+#ifdef DEBUG
+       bitmap_scnprintf(buf, sizeof(buf), data->map, PNP_IRQ_NR);
+       dev_dbg(&dev->dev, "  irq bitmask %s flags %#x\n", buf,
+               data->flags);
+#endif
        return 0;
 }
 
-int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
+int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
+                             struct pnp_dma *data)
 {
        struct pnp_dma *ptr;
 
@@ -109,10 +124,13 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
        else
                option->dma = data;
 
+       dev_dbg(&dev->dev, "  dma bitmask %#x flags %#x\n", data->map,
+               data->flags);
        return 0;
 }
 
-int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
+int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_port *data)
 {
        struct pnp_port *ptr;
 
@@ -124,10 +142,14 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
        else
                option->port = data;
 
+       dev_dbg(&dev->dev, "  io  "
+               "min %#x max %#x align %d size %d flags %#x\n",
+               data->min, data->max, data->align, data->size, data->flags);
        return 0;
 }
 
-int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
+int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
+                             struct pnp_mem *data)
 {
        struct pnp_mem *ptr;
 
@@ -138,6 +160,10 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
                ptr->next = data;
        else
                option->mem = data;
+
+       dev_dbg(&dev->dev, "  mem "
+               "min %#x max %#x align %d size %d flags %#x\n",
+               data->min, data->max, data->align, data->size, data->flags);
        return 0;
 }
 
@@ -215,15 +241,17 @@ void pnp_free_option(struct pnp_option *option)
 
 int pnp_check_port(struct pnp_dev *dev, int idx)
 {
-       int tmp;
+       int i;
        struct pnp_dev *tdev;
+       struct resource *res, *tres;
        resource_size_t *port, *end, *tport, *tend;
 
-       port = &dev->res.port_resource[idx].start;
-       end = &dev->res.port_resource[idx].end;
+       res = &dev->res.port_resource[idx];
+       port = &res->start;
+       end = &res->end;
 
        /* if the resource doesn't exist, don't complain about it */
-       if (cannot_compare(dev->res.port_resource[idx].flags))
+       if (cannot_compare(res->flags))
                return 1;
 
        /* check if the resource is already in use, skip if the
@@ -234,18 +262,19 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
        }
 
        /* check if the resource is reserved */
-       for (tmp = 0; tmp < 8; tmp++) {
-               int rport = pnp_reserve_io[tmp << 1];
-               int rend = pnp_reserve_io[(tmp << 1) + 1] + rport - 1;
+       for (i = 0; i < 8; i++) {
+               int rport = pnp_reserve_io[i << 1];
+               int rend = pnp_reserve_io[(i << 1) + 1] + rport - 1;
                if (ranged_conflict(port, end, &rport, &rend))
                        return 0;
        }
 
        /* check for internal conflicts */
-       for (tmp = 0; tmp < PNP_MAX_PORT && tmp != idx; tmp++) {
-               if (dev->res.port_resource[tmp].flags & IORESOURCE_IO) {
-                       tport = &dev->res.port_resource[tmp].start;
-                       tend = &dev->res.port_resource[tmp].end;
+       for (i = 0; i < PNP_MAX_PORT; i++) {
+               tres = &dev->res.port_resource[i];
+               if (tres != res && tres->flags & IORESOURCE_IO) {
+                       tport = &tres->start;
+                       tend = &tres->end;
                        if (ranged_conflict(port, end, tport, tend))
                                return 0;
                }
@@ -255,13 +284,13 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
        pnp_for_each_dev(tdev) {
                if (tdev == dev)
                        continue;
-               for (tmp = 0; tmp < PNP_MAX_PORT; tmp++) {
-                       if (tdev->res.port_resource[tmp].flags & IORESOURCE_IO) {
-                               if (cannot_compare
-                                   (tdev->res.port_resource[tmp].flags))
+               for (i = 0; i < PNP_MAX_PORT; i++) {
+                       tres = &tdev->res.port_resource[i];
+                       if (tres->flags & IORESOURCE_IO) {
+                               if (cannot_compare(tres->flags))
                                        continue;
-                               tport = &tdev->res.port_resource[tmp].start;
-                               tend = &tdev->res.port_resource[tmp].end;
+                               tport = &tres->start;
+                               tend = &tres->end;
                                if (ranged_conflict(port, end, tport, tend))
                                        return 0;
                        }
@@ -273,15 +302,17 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
 
 int pnp_check_mem(struct pnp_dev *dev, int idx)
 {
-       int tmp;
+       int i;
        struct pnp_dev *tdev;
+       struct resource *res, *tres;
        resource_size_t *addr, *end, *taddr, *tend;
 
-       addr = &dev->res.mem_resource[idx].start;
-       end = &dev->res.mem_resource[idx].end;
+       res = &dev->res.mem_resource[idx];
+       addr = &res->start;
+       end = &res->end;
 
        /* if the resource doesn't exist, don't complain about it */
-       if (cannot_compare(dev->res.mem_resource[idx].flags))
+       if (cannot_compare(res->flags))
                return 1;
 
        /* check if the resource is already in use, skip if the
@@ -292,18 +323,19 @@ int pnp_check_mem(struct pnp_dev *dev, int idx)
        }
 
        /* check if the resource is reserved */
-       for (tmp = 0; tmp < 8; tmp++) {
-               int raddr = pnp_reserve_mem[tmp << 1];
-               int rend = pnp_reserve_mem[(tmp << 1) + 1] + raddr - 1;
+       for (i = 0; i < 8; i++) {
+               int raddr = pnp_reserve_mem[i << 1];
+               int rend = pnp_reserve_mem[(i << 1) + 1] + raddr - 1;
                if (ranged_conflict(addr, end, &raddr, &rend))
                        return 0;
        }
 
        /* check for internal conflicts */
-       for (tmp = 0; tmp < PNP_MAX_MEM && tmp != idx; tmp++) {
-               if (dev->res.mem_resource[tmp].flags & IORESOURCE_MEM) {
-                       taddr = &dev->res.mem_resource[tmp].start;
-                       tend = &dev->res.mem_resource[tmp].end;
+       for (i = 0; i < PNP_MAX_MEM; i++) {
+               tres = &dev->res.mem_resource[i];
+               if (tres != res && tres->flags & IORESOURCE_MEM) {
+                       taddr = &tres->start;
+                       tend = &tres->end;
                        if (ranged_conflict(addr, end, taddr, tend))
                                return 0;
                }
@@ -313,13 +345,13 @@ int pnp_check_mem(struct pnp_dev *dev, int idx)
        pnp_for_each_dev(tdev) {
                if (tdev == dev)
                        continue;
-               for (tmp = 0; tmp < PNP_MAX_MEM; tmp++) {
-                       if (tdev->res.mem_resource[tmp].flags & IORESOURCE_MEM) {
-                               if (cannot_compare
-                                   (tdev->res.mem_resource[tmp].flags))
+               for (i = 0; i < PNP_MAX_MEM; i++) {
+                       tres = &tdev->res.mem_resource[i];
+                       if (tres->flags & IORESOURCE_MEM) {
+                               if (cannot_compare(tres->flags))
                                        continue;
-                               taddr = &tdev->res.mem_resource[tmp].start;
-                               tend = &tdev->res.mem_resource[tmp].end;
+                               taddr = &tres->start;
+                               tend = &tres->end;
                                if (ranged_conflict(addr, end, taddr, tend))
                                        return 0;
                        }
@@ -336,12 +368,16 @@ static irqreturn_t pnp_test_handler(int irq, void *dev_id)
 
 int pnp_check_irq(struct pnp_dev *dev, int idx)
 {
-       int tmp;
+       int i;
        struct pnp_dev *tdev;
-       resource_size_t *irq = &dev->res.irq_resource[idx].start;
+       struct resource *res, *tres;
+       resource_size_t *irq;
+
+       res = &dev->res.irq_resource[idx];
+       irq = &res->start;
 
        /* if the resource doesn't exist, don't complain about it */
-       if (cannot_compare(dev->res.irq_resource[idx].flags))
+       if (cannot_compare(res->flags))
                return 1;
 
        /* check if the resource is valid */
@@ -349,15 +385,16 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
                return 0;
 
        /* check if the resource is reserved */
-       for (tmp = 0; tmp < 16; tmp++) {
-               if (pnp_reserve_irq[tmp] == *irq)
+       for (i = 0; i < 16; i++) {
+               if (pnp_reserve_irq[i] == *irq)
                        return 0;
        }
 
        /* check for internal conflicts */
-       for (tmp = 0; tmp < PNP_MAX_IRQ && tmp != idx; tmp++) {
-               if (dev->res.irq_resource[tmp].flags & IORESOURCE_IRQ) {
-                       if (dev->res.irq_resource[tmp].start == *irq)
+       for (i = 0; i < PNP_MAX_IRQ; i++) {
+               tres = &dev->res.irq_resource[i];
+               if (tres != res && tres->flags & IORESOURCE_IRQ) {
+                       if (tres->start == *irq)
                                return 0;
                }
        }
@@ -367,8 +404,10 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
        {
                struct pci_dev *pci = NULL;
                for_each_pci_dev(pci) {
-                       if (pci->irq == *irq)
+                       if (pci->irq == *irq) {
+                               pci_dev_put(pci);
                                return 0;
+                       }
                }
        }
 #endif
@@ -386,12 +425,12 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
        pnp_for_each_dev(tdev) {
                if (tdev == dev)
                        continue;
-               for (tmp = 0; tmp < PNP_MAX_IRQ; tmp++) {
-                       if (tdev->res.irq_resource[tmp].flags & IORESOURCE_IRQ) {
-                               if (cannot_compare
-                                   (tdev->res.irq_resource[tmp].flags))
+               for (i = 0; i < PNP_MAX_IRQ; i++) {
+                       tres = &tdev->res.irq_resource[i];
+                       if (tres->flags & IORESOURCE_IRQ) {
+                               if (cannot_compare(tres->flags))
                                        continue;
-                               if ((tdev->res.irq_resource[tmp].start == *irq))
+                               if (tres->start == *irq)
                                        return 0;
                        }
                }
@@ -403,12 +442,16 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
 int pnp_check_dma(struct pnp_dev *dev, int idx)
 {
 #ifndef CONFIG_IA64
-       int tmp;
+       int i;
        struct pnp_dev *tdev;
-       resource_size_t *dma = &dev->res.dma_resource[idx].start;
+       struct resource *res, *tres;
+       resource_size_t *dma;
+
+       res = &dev->res.dma_resource[idx];
+       dma = &res->start;
 
        /* if the resource doesn't exist, don't complain about it */
-       if (cannot_compare(dev->res.dma_resource[idx].flags))
+       if (cannot_compare(res->flags))
                return 1;
 
        /* check if the resource is valid */
@@ -416,15 +459,16 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
                return 0;
 
        /* check if the resource is reserved */
-       for (tmp = 0; tmp < 8; tmp++) {
-               if (pnp_reserve_dma[tmp] == *dma)
+       for (i = 0; i < 8; i++) {
+               if (pnp_reserve_dma[i] == *dma)
                        return 0;
        }
 
        /* check for internal conflicts */
-       for (tmp = 0; tmp < PNP_MAX_DMA && tmp != idx; tmp++) {
-               if (dev->res.dma_resource[tmp].flags & IORESOURCE_DMA) {
-                       if (dev->res.dma_resource[tmp].start == *dma)
+       for (i = 0; i < PNP_MAX_DMA; i++) {
+               tres = &dev->res.dma_resource[i];
+               if (tres != res && tres->flags & IORESOURCE_DMA) {
+                       if (tres->start == *dma)
                                return 0;
                }
        }
@@ -441,12 +485,12 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
        pnp_for_each_dev(tdev) {
                if (tdev == dev)
                        continue;
-               for (tmp = 0; tmp < PNP_MAX_DMA; tmp++) {
-                       if (tdev->res.dma_resource[tmp].flags & IORESOURCE_DMA) {
-                               if (cannot_compare
-                                   (tdev->res.dma_resource[tmp].flags))
+               for (i = 0; i < PNP_MAX_DMA; i++) {
+                       tres = &tdev->res.dma_resource[i];
+                       if (tres->flags & IORESOURCE_DMA) {
+                               if (cannot_compare(tres->flags))
                                        continue;
-                               if ((tdev->res.dma_resource[tmp].start == *dma))
+                               if (tres->start == *dma)
                                        return 0;
                        }
                }
@@ -459,6 +503,33 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
 #endif
 }
 
+struct resource *pnp_get_resource(struct pnp_dev *dev,
+                                 unsigned int type, unsigned int num)
+{
+       struct pnp_resource_table *res = &dev->res;
+
+       switch (type) {
+       case IORESOURCE_IO:
+               if (num >= PNP_MAX_PORT)
+                       return NULL;
+               return &res->port_resource[num];
+       case IORESOURCE_MEM:
+               if (num >= PNP_MAX_MEM)
+                       return NULL;
+               return &res->mem_resource[num];
+       case IORESOURCE_IRQ:
+               if (num >= PNP_MAX_IRQ)
+                       return NULL;
+               return &res->irq_resource[num];
+       case IORESOURCE_DMA:
+               if (num >= PNP_MAX_DMA)
+                       return NULL;
+               return &res->dma_resource[num];
+       }
+       return NULL;
+}
+EXPORT_SYMBOL(pnp_get_resource);
+
 /* format is: pnp_reserve_irq=irq1[,irq2] .... */
 static int __init pnp_setup_reserve_irq(char *str)
 {