PNP: replace pnp_resource_table with dynamically allocated resources

PNP used to have a fixed-size pnp_resource_table for tracking the
resources used by a device.  This table often overflowed, so we've
had to increase the table size, which wastes memory because most
devices have very few resources.

This patch replaces the table with a linked list of resources where
the entries are allocated on demand.

This removes messages like these:

    pnpacpi: exceeded the max number of IO resources
    00:01: too many I/O port resources

References:

    http://bugzilla.kernel.org/show_bug.cgi?id=9535
    http://bugzilla.kernel.org/show_bug.cgi?id=9740
    http://lkml.org/lkml/2007/11/30/110

This patch also changes the way PNP uses the IORESOURCE_UNSET,
IORESOURCE_AUTO, and IORESOURCE_DISABLED flags.

Prior to this patch, the pnp_resource_table entries used the flags
like this:

    IORESOURCE_UNSET
	This table entry is unused and available for use.  When this flag
	is set, we shouldn't look at anything else in the resource structure.
	This flag is set when a resource table entry is initialized.

    IORESOURCE_AUTO
	This resource was assigned automatically by pnp_assign_{io,mem,etc}().

	This flag is set when a resource table entry is initialized and
	cleared whenever we discover a resource setting by reading an ISAPNP
	config register, parsing a PNPBIOS resource data stream, parsing an
	ACPI _CRS list, or interpreting a sysfs "set" command.

	Resources marked IORESOURCE_AUTO are reinitialized and marked as
	IORESOURCE_UNSET by pnp_clean_resource_table() in these cases:

	    - before we attempt to assign resources automatically,
	    - if we fail to assign resources automatically,
	    - after disabling a device

    IORESOURCE_DISABLED
	Set by pnp_assign_{io,mem,etc}() when automatic assignment fails.
	Also set by PNPBIOS and PNPACPI for:

	    - invalid IRQs or GSI registration failures
	    - invalid DMA channels
	    - I/O ports above 0x10000
	    - mem ranges with negative length

After this patch, there is no pnp_resource_table, and the resource list
entries use the flags like this:

    IORESOURCE_UNSET
	This flag is no longer used in PNP.  Instead of keeping
	IORESOURCE_UNSET entries in the resource list, we remove
	entries from the list and free them.

    IORESOURCE_AUTO
	No change in meaning: it still means the resource was assigned
	automatically by pnp_assign_{port,mem,etc}(), but these functions
	now set the bit explicitly.

	We still "clean" a device's resource list in the same places,
	but rather than reinitializing IORESOURCE_AUTO entries, we
	just remove them from the list.

	Note that IORESOURCE_AUTO entries are always at the end of the
	list, so removing them doesn't reorder other list entries.
	This is because non-IORESOURCE_AUTO entries are added by the
	ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the
	sysfs "set" command.  In each of these cases, we completely free
	the resource list first.

    IORESOURCE_DISABLED
	In addition to the cases where we used to set this flag, ISAPNP now
	adds an IORESOURCE_DISABLED resource when it reads a configuration
	register with a "disabled" value.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

1 files changed, 55 insertions, 165 deletions

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 90bd9cb65563..165b624081ad 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -19,40 +19,30 @@ DEFINE_MUTEX(pnp_res_mutex);
 
 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 {
-        struct pnp_resource *pnp_res;
-        struct resource *res;
+        struct resource *res, local_res;
 
-        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, idx);
-        if (!pnp_res) {
-                dev_err(&dev->dev, "too many I/O port resources\n");
-                /* pretend we were successful so at least the manager won't try again */
-                return 1;
-        }
-
-        res = &pnp_res->res;
-
-        /* check if this resource has been manually set, if so skip */
-        if (!(res->flags & IORESOURCE_AUTO)) {
+        res = pnp_get_resource(dev, IORESOURCE_IO, idx);
+        if (res) {
                 dev_dbg(&dev->dev, "  io %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
                         (unsigned long long) res->end, res->flags);
                 return 1;
         }
 
-        /* set the initial values */
-        res->flags |= rule->flags | IORESOURCE_IO;
-        res->flags &= ~IORESOURCE_UNSET;
+        res = &local_res;
+        res->flags = rule->flags | IORESOURCE_AUTO;
+        res->start = 0;
+        res->end = 0;
 
         if (!rule->size) {
                 res->flags |= IORESOURCE_DISABLED;
                 dev_dbg(&dev->dev, "  io %d disabled\n", idx);
-                return 1;       /* skip disabled resource requests */
+                goto __add;
         }
 
         res->start = rule->min;
         res->end = res->start + rule->size - 1;
 
-        /* run through until pnp_check_port is happy */
         while (!pnp_check_port(dev, res)) {
                 res->start += rule->align;
                 res->end = res->start + rule->size - 1;
@@ -61,38 +51,29 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
                         return 0;
                 }
         }
-        dev_dbg(&dev->dev, "  assign io  %d %#llx-%#llx\n", idx,
-                (unsigned long long) res->start, (unsigned long long) res->end);
+
+__add:
+        pnp_add_io_resource(dev, res->start, res->end, res->flags);
         return 1;
 }
 
 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 {
-        struct pnp_resource *pnp_res;
-        struct resource *res;
+        struct resource *res, local_res;
 
-        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, idx);
-        if (!pnp_res) {
-                dev_err(&dev->dev, "too many memory resources\n");
-                /* pretend we were successful so at least the manager won't try again */
-                return 1;
-        }
-
-        res = &pnp_res->res;
-
-        /* check if this resource has been manually set, if so skip */
-        if (!(res->flags & IORESOURCE_AUTO)) {
+        res = pnp_get_resource(dev, IORESOURCE_MEM, idx);
+        if (res) {
                 dev_dbg(&dev->dev, "  mem %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
                         (unsigned long long) res->end, res->flags);
                 return 1;
         }
 
-        /* set the initial values */
-        res->flags |= rule->flags | IORESOURCE_MEM;
-        res->flags &= ~IORESOURCE_UNSET;
+        res = &local_res;
+        res->flags = rule->flags | IORESOURCE_AUTO;
+        res->start = 0;
+        res->end = 0;
 
-        /* convert pnp flags to standard Linux flags */
         if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
                 res->flags |= IORESOURCE_READONLY;
         if (rule->flags & IORESOURCE_MEM_CACHEABLE)
@@ -105,13 +86,12 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
         if (!rule->size) {
                 res->flags |= IORESOURCE_DISABLED;
                 dev_dbg(&dev->dev, "  mem %d disabled\n", idx);
-                return 1;       /* skip disabled resource requests */
+                goto __add;
         }
 
         res->start = rule->min;
         res->end = res->start + rule->size - 1;
 
-        /* run through until pnp_check_mem is happy */
         while (!pnp_check_mem(dev, res)) {
                 res->start += rule->align;
                 res->end = res->start + rule->size - 1;
@@ -120,15 +100,15 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
                         return 0;
                 }
         }
-        dev_dbg(&dev->dev, "  assign mem %d %#llx-%#llx\n", idx,
-                (unsigned long long) res->start, (unsigned long long) res->end);
+
+__add:
+        pnp_add_mem_resource(dev, res->start, res->end, res->flags);
         return 1;
 }
 
 static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 {
-        struct pnp_resource *pnp_res;
-        struct resource *res;
+        struct resource *res, local_res;
         int i;
 
         /* IRQ priority: this table is good for i386 */
@@ -136,58 +116,48 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
         };
 
-        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, idx);
-        if (!pnp_res) {
-                dev_err(&dev->dev, "too many IRQ resources\n");
-                /* pretend we were successful so at least the manager won't try again */
-                return 1;
-        }
-
-        res = &pnp_res->res;
-
-        /* check if this resource has been manually set, if so skip */
-        if (!(res->flags & IORESOURCE_AUTO)) {
+        res = pnp_get_resource(dev, IORESOURCE_IRQ, idx);
+        if (res) {
                 dev_dbg(&dev->dev, "  irq %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);
                 return 1;
         }
 
-        /* set the initial values */
-        res->flags |= rule->flags | IORESOURCE_IRQ;
-        res->flags &= ~IORESOURCE_UNSET;
+        res = &local_res;
+        res->flags = rule->flags | IORESOURCE_AUTO;
+        res->start = -1;
+        res->end = -1;
 
         if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
                 res->flags |= IORESOURCE_DISABLED;
                 dev_dbg(&dev->dev, "  irq %d disabled\n", idx);
-                return 1;       /* skip disabled resource requests */
+                goto __add;
         }
 
         /* TBD: need check for >16 IRQ */
         res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
         if (res->start < PNP_IRQ_NR) {
                 res->end = res->start;
-                dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
-                        (int) res->start);
-                return 1;
+                goto __add;
         }
         for (i = 0; i < 16; i++) {
                 if (test_bit(xtab[i], rule->map)) {
                         res->start = res->end = xtab[i];
-                        if (pnp_check_irq(dev, res)) {
-                                dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
-                                        (int) res->start);
-                                return 1;
-                        }
+                        if (pnp_check_irq(dev, res))
+                                goto __add;
                 }
         }
         dev_dbg(&dev->dev, "  couldn't assign irq %d\n", idx);
         return 0;
+
+__add:
+        pnp_add_irq_resource(dev, res->start, res->flags);
+        return 1;
 }
 
 static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
-        struct pnp_resource *pnp_res;
-        struct resource *res;
+        struct resource *res, local_res;
         int i;
 
         /* DMA priority: this table is good for i386 */
@@ -195,127 +165,47 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 1, 3, 5, 6, 7, 0, 2, 4
         };
 
-        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, idx);
-        if (!pnp_res) {
-                dev_err(&dev->dev, "too many DMA resources\n");
-                return;
-        }
-
-        res = &pnp_res->res;
-
-        /* check if this resource has been manually set, if so skip */
-        if (!(res->flags & IORESOURCE_AUTO)) {
+        res = pnp_get_resource(dev, IORESOURCE_DMA, idx);
+        if (res) {
                 dev_dbg(&dev->dev, "  dma %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);
                 return;
         }
 
-        /* set the initial values */
-        res->flags |= rule->flags | IORESOURCE_DMA;
-        res->flags &= ~IORESOURCE_UNSET;
+        res = &local_res;
+        res->flags = rule->flags | IORESOURCE_AUTO;
+        res->start = -1;
+        res->end = -1;
 
         for (i = 0; i < 8; i++) {
                 if (rule->map & (1 << xtab[i])) {
                         res->start = res->end = xtab[i];
-                        if (pnp_check_dma(dev, res)) {
-                                dev_dbg(&dev->dev, "  assign dma %d %d\n", idx,
-                                        (int) res->start);
-                                return;
-                        }
+                        if (pnp_check_dma(dev, res))
+                                goto __add;
                 }
         }
 #ifdef MAX_DMA_CHANNELS
         res->start = res->end = MAX_DMA_CHANNELS;
 #endif
-        res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+        res->flags |= IORESOURCE_DISABLED;
         dev_dbg(&dev->dev, "  disable dma %d\n", idx);
-}
 
-void pnp_init_resource(struct resource *res)
-{
-        unsigned long type;
-
-        type = res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
-                             IORESOURCE_IRQ | IORESOURCE_DMA);
-
-        res->name = NULL;
-        res->flags = type | IORESOURCE_AUTO | IORESOURCE_UNSET;
-        if (type == IORESOURCE_IRQ || type == IORESOURCE_DMA) {
-                res->start = -1;
-                res->end = -1;
-        } else {
-                res->start = 0;
-                res->end = 0;
-        }
+__add:
+        pnp_add_dma_resource(dev, res->start, res->flags);
 }
 
-/**
- * pnp_init_resources - Resets a resource table to default values.
- * @table: pointer to the desired resource table
- */
 void pnp_init_resources(struct pnp_dev *dev)
 {
-        struct resource *res;
-        int idx;
-
-        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-                res = &dev->res->irq[idx].res;
-                res->flags = IORESOURCE_IRQ;
-                pnp_init_resource(res);
-        }
-        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-                res = &dev->res->dma[idx].res;
-                res->flags = IORESOURCE_DMA;
-                pnp_init_resource(res);
-        }
-        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-                res = &dev->res->port[idx].res;
-                res->flags = IORESOURCE_IO;
-                pnp_init_resource(res);
-        }
-        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-                res = &dev->res->mem[idx].res;
-                res->flags = IORESOURCE_MEM;
-                pnp_init_resource(res);
-        }
+        pnp_free_resources(dev);
 }
 
-/**
- * pnp_clean_resources - clears resources that were not manually set
- * @res: the resources to clean
- */
 static void pnp_clean_resource_table(struct pnp_dev *dev)
 {
-        struct resource *res;
-        int idx;
-
-        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-                res = &dev->res->irq[idx].res;
-                if (res->flags & IORESOURCE_AUTO) {
-                        res->flags = IORESOURCE_IRQ;
-                        pnp_init_resource(res);
-                }
-        }
-        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-                res = &dev->res->dma[idx].res;
-                if (res->flags & IORESOURCE_AUTO) {
-                        res->flags = IORESOURCE_DMA;
-                        pnp_init_resource(res);
-                }
-        }
-        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-                res = &dev->res->port[idx].res;
-                if (res->flags & IORESOURCE_AUTO) {
-                        res->flags = IORESOURCE_IO;
-                        pnp_init_resource(res);
-                }
-        }
-        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-                res = &dev->res->mem[idx].res;
-                if (res->flags & IORESOURCE_AUTO) {
-                        res->flags = IORESOURCE_MEM;
-                        pnp_init_resource(res);
-                }
+        struct pnp_resource *pnp_res, *tmp;
+
+        list_for_each_entry_safe(pnp_res, tmp, &dev->resources, list) {
+                if (pnp_res->res.flags & IORESOURCE_AUTO)
+                        pnp_free_resource(pnp_res);
         }
 }