PNP: convert resource options to single linked list

ISAPNP, PNPBIOS, and ACPI describe the "possible resource settings" of
a device, i.e., the possibilities an OS bus driver has when it assigns
I/O port, MMIO, and other resources to the device.

PNP used to maintain this "possible resource setting" information in
one independent option structure and a list of dependent option
structures for each device.  Each of these option structures had lists
of I/O, memory, IRQ, and DMA resources, for example:

  dev
    independent options
      ind-io0  -> ind-io1  ...
      ind-mem0 -> ind-mem1 ...
      ...
    dependent option set 0
      dep0-io0  -> dep0-io1  ...
      dep0-mem0 -> dep0-mem1 ...
      ...
    dependent option set 1
      dep1-io0  -> dep1-io1  ...
      dep1-mem0 -> dep1-mem1 ...
      ...
    ...

This data structure was designed for ISAPNP, where the OS configures
device resource settings by writing directly to configuration
registers.  The OS can write the registers in arbitrary order much
like it writes PCI BARs.

However, for PNPBIOS and ACPI devices, the OS uses firmware interfaces
that perform device configuration, and it is important to pass the
desired settings to those interfaces in the correct order.  The OS
learns the correct order by using firmware interfaces that return the
"current resource settings" and "possible resource settings," but the
option structures above doesn't store the ordering information.

This patch replaces the independent and dependent lists with a single
list of options.  For example, a device might have possible resource
settings like this:

  dev
    options
      ind-io0 -> dep0-io0 -> dep1->io0 -> ind-io1 ...

All the possible settings are in the same list, in the order they
come from the firmware "possible resource settings" list.  Each entry
is tagged with an independent/dependent flag.  Dependent entries also
have a "set number" and an optional priority value.  All dependent
entries must be assigned from the same set.  For example, the OS can
use all the entries from dependent set 0, or all the entries from
dependent set 1, but it cannot mix entries from set 0 with entries
from set 1.

Prior to this patch PNP didn't keep track of the order of this list,
and it assigned all independent options first, then all dependent
ones.  Using the example above, that resulted in a "desired
configuration" list like this:

  ind->io0 -> ind->io1 -> depN-io0 ...

instead of the list the firmware expects, which looks like this:

  ind->io0 -> depN-io0 -> ind-io1 ...

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

1 files changed, 35 insertions, 40 deletions

diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 7a9fb5544b80..a876ecf7028c 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -3,6 +3,8 @@
  *
  * Some code, especially possible resource dumping is based on isapnp_proc.c (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2002 Adam Belay <ambx1@neo.rr.com>
+ * Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
  */
 
 #include <linux/pnp.h>
@@ -184,39 +186,22 @@ static void pnp_print_mem(pnp_info_buffer_t * buffer, char *space,
 }
 
 static void pnp_print_option(pnp_info_buffer_t * buffer, char *space,
-                             struct pnp_option *option, int dep)
+                             struct pnp_option *option)
 {
-        char *s;
-        struct pnp_port *port;
-        struct pnp_irq *irq;
-        struct pnp_dma *dma;
-        struct pnp_mem *mem;
-
-        if (dep) {
-                switch (option->priority) {
-                case PNP_RES_PRIORITY_PREFERRED:
-                        s = "preferred";
-                        break;
-                case PNP_RES_PRIORITY_ACCEPTABLE:
-                        s = "acceptable";
-                        break;
-                case PNP_RES_PRIORITY_FUNCTIONAL:
-                        s = "functional";
-                        break;
-                default:
-                        s = "invalid";
-                }
-                pnp_printf(buffer, "Dependent: %02i - Priority %s\n", dep, s);
+        switch (option->type) {
+        case IORESOURCE_IO:
+                pnp_print_port(buffer, space, &option->u.port);
+                break;
+        case IORESOURCE_MEM:
+                pnp_print_mem(buffer, space, &option->u.mem);
+                break;
+        case IORESOURCE_IRQ:
+                pnp_print_irq(buffer, space, &option->u.irq);
+                break;
+        case IORESOURCE_DMA:
+                pnp_print_dma(buffer, space, &option->u.dma);
+                break;
         }
-
-        for (port = option->port; port; port = port->next)
-                pnp_print_port(buffer, space, port);
-        for (irq = option->irq; irq; irq = irq->next)
-                pnp_print_irq(buffer, space, irq);
-        for (dma = option->dma; dma; dma = dma->next)
-                pnp_print_dma(buffer, space, dma);
-        for (mem = option->mem; mem; mem = mem->next)
-                pnp_print_mem(buffer, space, mem);
 }
 
 static ssize_t pnp_show_options(struct device *dmdev,
@@ -224,9 +209,9 @@ static ssize_t pnp_show_options(struct device *dmdev,
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
         pnp_info_buffer_t *buffer;
-        struct pnp_option *independent = dev->independent;
-        struct pnp_option *dependent = dev->dependent;
-        int ret, dep = 1;
+        struct pnp_option *option;
+        int ret, dep = 0, set = 0;
+        char *indent;
 
         buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
         if (!buffer)
@@ -235,14 +220,24 @@ static ssize_t pnp_show_options(struct device *dmdev,
         buffer->len = PAGE_SIZE;
         buffer->buffer = buf;
         buffer->curr = buffer->buffer;
-        if (independent)
-                pnp_print_option(buffer, "", independent, 0);
 
-        while (dependent) {
-                pnp_print_option(buffer, "   ", dependent, dep);
-                dependent = dependent->next;
-                dep++;
+        list_for_each_entry(option, &dev->options, list) {
+                if (pnp_option_is_dependent(option)) {
+                        indent = "  ";
+                        if (!dep || pnp_option_set(option) != set) {
+                                set = pnp_option_set(option);
+                                dep = 1;
+                                pnp_printf(buffer, "Dependent: %02i - "
+                                           "Priority %s\n", set,
+                                           pnp_option_priority_name(option));
+                        }
+                } else {
+                        dep = 0;
+                        indent = "";
+                }
+                pnp_print_option(buffer, indent, option);
         }
+
         ret = (buffer->curr - buf);
         kfree(buffer);
         return ret;