Pull pnpacpi into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:36:43 +0000 (15:36 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:36:43 +0000 (15:36 -0400)
drivers/pnp/pnpacpi/rsparser.c

index 407b4eaddcbffe6202ae40623430f9f638b23cb2..3a4a644c26869bbf7b6ce10820fe65e0fb437c9c 100644 (file)
@@ -36,13 +36,13 @@ static int irq_flags(int triggering, int polarity)
 {
        int flag;
        if (triggering == ACPI_LEVEL_SENSITIVE) {
-               if(polarity == ACPI_ACTIVE_LOW)
+               if (polarity == ACPI_ACTIVE_LOW)
                        flag = IORESOURCE_IRQ_LOWLEVEL;
                else
                        flag = IORESOURCE_IRQ_HIGHLEVEL;
        }
        else {
-               if(polarity == ACPI_ACTIVE_LOW)
+               if (polarity == ACPI_ACTIVE_LOW)
                        flag = IORESOURCE_IRQ_LOWEDGE;
                else
                        flag = IORESOURCE_IRQ_HIGHEDGE;
@@ -57,7 +57,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
                *triggering = ACPI_LEVEL_SENSITIVE;
                *polarity = ACPI_ACTIVE_LOW;
                break;
-       case IORESOURCE_IRQ_HIGHLEVEL:  
+       case IORESOURCE_IRQ_HIGHLEVEL:
                *triggering = ACPI_LEVEL_SENSITIVE;
                *polarity = ACPI_ACTIVE_HIGH;
                break;
@@ -73,7 +73,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
 }
 
 static void
-pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
+pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
        int triggering, int polarity)
 {
        int i = 0;
@@ -101,7 +101,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
 }
 
 static void
-pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)
+pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, u32 dma)
 {
        int i = 0;
        while (i < PNP_MAX_DMA &&
@@ -119,8 +119,8 @@ pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)
 }
 
 static void
-pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,
-       u32 io, u32 len)
+pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
+       u64 io, u64 len)
 {
        int i = 0;
        while (!(res->port_resource[i].flags & IORESOURCE_UNSET) &&
@@ -138,7 +138,7 @@ pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,
 }
 
 static void
-pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res,
+pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
        u64 mem, u64 len)
 {
        int i = 0;
@@ -156,11 +156,32 @@ pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res,
        }
 }
 
+static void
+pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
+       struct acpi_resource *res)
+{
+       struct acpi_resource_address64 addr, *p = &addr;
+       acpi_status status;
+
+       status = acpi_resource_to_address64(res, p);
+       if (!ACPI_SUCCESS(status)) {
+               pnp_warn("PnPACPI: failed to convert resource type %d",
+                       res->type);
+               return;
+       }
+
+       if (p->resource_type == ACPI_MEMORY_RANGE)
+               pnpacpi_parse_allocated_memresource(res_table,
+                               p->minimum, p->address_length);
+       else if (p->resource_type == ACPI_IO_RANGE)
+               pnpacpi_parse_allocated_ioresource(res_table,
+                               p->minimum, p->address_length);
+}
 
 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
        void *data)
 {
-       struct pnp_resource_table * res_table = (struct pnp_resource_table *)data;
+       struct pnp_resource_table *res_table = (struct pnp_resource_table *)data;
        int i;
 
        switch (res->type) {
@@ -221,19 +242,9 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                res->data.fixed_memory32.address_length);
                break;
        case ACPI_RESOURCE_TYPE_ADDRESS16:
-               pnpacpi_parse_allocated_memresource(res_table,
-                               res->data.address16.minimum,
-                               res->data.address16.address_length);
-               break;
        case ACPI_RESOURCE_TYPE_ADDRESS32:
-               pnpacpi_parse_allocated_memresource(res_table,
-                               res->data.address32.minimum,
-                               res->data.address32.address_length);
-               break;
        case ACPI_RESOURCE_TYPE_ADDRESS64:
-               pnpacpi_parse_allocated_memresource(res_table,
-               res->data.address64.minimum,
-               res->data.address64.address_length);
+               pnpacpi_parse_allocated_address_space(res_table, res);
                break;
 
        case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
@@ -255,11 +266,11 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                pnp_warn("PnPACPI: unknown resource type %d", res->type);
                return AE_ERROR;
        }
-                       
+
        return AE_OK;
 }
 
-acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table * res)
+acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table *res)
 {
        /* Blank the resource table values */
        pnp_init_resource_table(res);
@@ -317,17 +328,17 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
                pnp_err("Invalid DMA transfer type");
        }
 
-       pnp_register_dma_resource(option,dma);
+       pnp_register_dma_resource(option, dma);
        return;
 }
 
-       
+
 static void pnpacpi_parse_irq_option(struct pnp_option *option,
        struct acpi_resource_irq *p)
 {
        int i;
-       struct pnp_irq * irq;
-       
+       struct pnp_irq *irq;
+
        if (p->interrupt_count == 0)
                return;
        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
@@ -347,7 +358,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
        struct acpi_resource_extended_irq *p)
 {
        int i;
-       struct pnp_irq * irq;
+       struct pnp_irq *irq;
 
        if (p->interrupt_count == 0)
                return;
@@ -368,7 +379,7 @@ static void
 pnpacpi_parse_port_option(struct pnp_option *option,
        struct acpi_resource_io *io)
 {
-       struct pnp_port * port;
+       struct pnp_port *port;
 
        if (io->address_length == 0)
                return;
@@ -381,7 +392,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
        port->size = io->address_length;
        port->flags = ACPI_DECODE_16 == io->io_decode ?
                PNP_PORT_FLAG_16BITADDR : 0;
-       pnp_register_port_resource(option,port);
+       pnp_register_port_resource(option, port);
        return;
 }
 
@@ -389,7 +400,7 @@ static void
 pnpacpi_parse_fixed_port_option(struct pnp_option *option,
        struct acpi_resource_fixed_io *io)
 {
-       struct pnp_port * port;
+       struct pnp_port *port;
 
        if (io->address_length == 0)
                return;
@@ -400,7 +411,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
        port->size = io->address_length;
        port->align = 0;
        port->flags = PNP_PORT_FLAG_FIXED;
-       pnp_register_port_resource(option,port);
+       pnp_register_port_resource(option, port);
        return;
 }
 
@@ -408,7 +419,7 @@ static void
 pnpacpi_parse_mem24_option(struct pnp_option *option,
        struct acpi_resource_memory24 *p)
 {
-       struct pnp_mem * mem;
+       struct pnp_mem *mem;
 
        if (p->address_length == 0)
                return;
@@ -423,7 +434,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                        IORESOURCE_MEM_WRITEABLE : 0;
 
-       pnp_register_mem_resource(option,mem);
+       pnp_register_mem_resource(option, mem);
        return;
 }
 
@@ -431,7 +442,7 @@ static void
 pnpacpi_parse_mem32_option(struct pnp_option *option,
        struct acpi_resource_memory32 *p)
 {
-       struct pnp_mem * mem;
+       struct pnp_mem *mem;
 
        if (p->address_length == 0)
                return;
@@ -446,7 +457,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                        IORESOURCE_MEM_WRITEABLE : 0;
 
-       pnp_register_mem_resource(option,mem);
+       pnp_register_mem_resource(option, mem);
        return;
 }
 
@@ -454,7 +465,7 @@ static void
 pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
        struct acpi_resource_fixed_memory32 *p)
 {
-       struct pnp_mem * mem;
+       struct pnp_mem *mem;
 
        if (p->address_length == 0)
                return;
@@ -468,7 +479,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                        IORESOURCE_MEM_WRITEABLE : 0;
 
-       pnp_register_mem_resource(option,mem);
+       pnp_register_mem_resource(option, mem);
        return;
 }
 
@@ -477,8 +488,8 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
 {
        struct acpi_resource_address64 addr, *p = &addr;
        acpi_status status;
-       struct pnp_mem * mem;
-       struct pnp_port * port;
+       struct pnp_mem *mem;
+       struct pnp_port *port;
 
        status = acpi_resource_to_address64(r, p);
        if (!ACPI_SUCCESS(status)) {
@@ -498,7 +509,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                mem->align = 0;
                mem->flags = (p->info.mem.write_protect ==
                    ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
-               pnp_register_mem_resource(option,mem);
+               pnp_register_mem_resource(option, mem);
        } else if (p->resource_type == ACPI_IO_RANGE) {
                port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
                if (!port)
@@ -507,7 +518,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                port->size = p->address_length;
                port->align = 0;
                port->flags = PNP_PORT_FLAG_FIXED;
-               pnp_register_port_resource(option,port);
+               pnp_register_port_resource(option, port);
        }
 }
 
@@ -531,7 +542,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                        break;
 
                case ACPI_RESOURCE_TYPE_DMA:
-                       pnpacpi_parse_dma_option(option, &res->data.dma);       
+                       pnpacpi_parse_dma_option(option, &res->data.dma);
                        break;
 
                case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -539,7 +550,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                                case ACPI_GOOD_CONFIGURATION:
                                        priority = PNP_RES_PRIORITY_PREFERRED;
                                        break;
-                                       
+
                                case ACPI_ACCEPTABLE_CONFIGURATION:
                                        priority = PNP_RES_PRIORITY_ACCEPTABLE;
                                        break;
@@ -555,7 +566,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                        option = pnp_register_dependent_option(dev, priority);
                        if (!option)
                                return AE_ERROR;
-                       parse_data->option = option;    
+                       parse_data->option = option;
                        break;
 
                case ACPI_RESOURCE_TYPE_END_DEPENDENT:
@@ -615,7 +626,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                        pnp_warn("PnPACPI: unknown resource type %d", res->type);
                        return AE_ERROR;
        }
-                       
+
        return AE_OK;
 }
 
@@ -636,13 +647,8 @@ acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle,
        return status;
 }
 
-/*
- * Set resource
- */
-static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
-       void *data)
+static int pnpacpi_supported_resource(struct acpi_resource *res)
 {
-       int *res_cnt = (int *)data;
        switch (res->type) {
        case ACPI_RESOURCE_TYPE_IRQ:
        case ACPI_RESOURCE_TYPE_DMA:
@@ -655,43 +661,32 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
        case ACPI_RESOURCE_TYPE_ADDRESS32:
        case ACPI_RESOURCE_TYPE_ADDRESS64:
        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-               (*res_cnt) ++;
-       case ACPI_RESOURCE_TYPE_START_DEPENDENT:
-       case ACPI_RESOURCE_TYPE_END_DEPENDENT:
-       case ACPI_RESOURCE_TYPE_VENDOR:
-       case ACPI_RESOURCE_TYPE_END_TAG:
-       case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
-       default:
-               return AE_OK;
+               return 1;
        }
-       return AE_OK;
+       return 0;
 }
 
-static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
+/*
+ * Set resource
+ */
+static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
        void *data)
 {
-       struct acpi_resource **resource = (struct acpi_resource **)data;        
-       switch (res->type) {
-       case ACPI_RESOURCE_TYPE_IRQ:
-       case ACPI_RESOURCE_TYPE_DMA:
-       case ACPI_RESOURCE_TYPE_IO:
-       case ACPI_RESOURCE_TYPE_FIXED_IO:
-       case ACPI_RESOURCE_TYPE_MEMORY24:
-       case ACPI_RESOURCE_TYPE_MEMORY32:
-       case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-       case ACPI_RESOURCE_TYPE_ADDRESS16:
-       case ACPI_RESOURCE_TYPE_ADDRESS32:
-       case ACPI_RESOURCE_TYPE_ADDRESS64:
-       case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+       int *res_cnt = (int *)data;
+
+       if (pnpacpi_supported_resource(res))
+               (*res_cnt)++;
+       return AE_OK;
+}
+
+static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
+{
+       struct acpi_resource **resource = (struct acpi_resource **)data;
+
+       if (pnpacpi_supported_resource(res)) {
                (*resource)->type = res->type;
+               (*resource)->length = sizeof(struct acpi_resource);
                (*resource)++;
-       case ACPI_RESOURCE_TYPE_START_DEPENDENT:
-       case ACPI_RESOURCE_TYPE_END_DEPENDENT:
-       case ACPI_RESOURCE_TYPE_VENDOR:
-       case ACPI_RESOURCE_TYPE_END_TAG:
-       case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
-       default:
-               return AE_OK;
        }
 
        return AE_OK;
@@ -735,11 +730,8 @@ static void pnpacpi_encode_irq(struct acpi_resource *resource,
        struct resource *p)
 {
        int triggering, polarity;
-       
-       decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
-               &polarity);
-       resource->type = ACPI_RESOURCE_TYPE_IRQ;
-       resource->length = sizeof(struct acpi_resource);
+
+       decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
        resource->data.irq.triggering = triggering;
        resource->data.irq.polarity = polarity;
        if (triggering == ACPI_EDGE_SENSITIVE)
@@ -754,11 +746,8 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
        struct resource *p)
 {
        int triggering, polarity;
-       
-       decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
-               &polarity);
-       resource->type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;
-       resource->length = sizeof(struct acpi_resource);
+
+       decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
        resource->data.extended_irq.producer_consumer = ACPI_CONSUMER;
        resource->data.extended_irq.triggering = triggering;
        resource->data.extended_irq.polarity = polarity;
@@ -773,8 +762,6 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
 static void pnpacpi_encode_dma(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_DMA;
-       resource->length = sizeof(struct acpi_resource);
        /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
        if (p->flags & IORESOURCE_DMA_COMPATIBLE)
                resource->data.dma.type = ACPI_COMPATIBILITY;
@@ -798,8 +785,6 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,
 static void pnpacpi_encode_io(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_IO;
-       resource->length = sizeof(struct acpi_resource);
        /* Note: pnp_assign_port will copy pnp_port->flags into p->flags */
        resource->data.io.io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR)?
                ACPI_DECODE_16 : ACPI_DECODE_10;
@@ -812,8 +797,6 @@ static void pnpacpi_encode_io(struct acpi_resource *resource,
 static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_FIXED_IO;
-       resource->length = sizeof(struct acpi_resource);
        resource->data.fixed_io.address = p->start;
        resource->data.fixed_io.address_length = p->end - p->start + 1;
 }
@@ -821,8 +804,6 @@ static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,
 static void pnpacpi_encode_mem24(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_MEMORY24;
-       resource->length = sizeof(struct acpi_resource);
        /* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */
        resource->data.memory24.write_protect =
                (p->flags & IORESOURCE_MEM_WRITEABLE) ?
@@ -836,8 +817,6 @@ static void pnpacpi_encode_mem24(struct acpi_resource *resource,
 static void pnpacpi_encode_mem32(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_MEMORY32;
-       resource->length = sizeof(struct acpi_resource);
        resource->data.memory32.write_protect =
                (p->flags & IORESOURCE_MEM_WRITEABLE) ?
                ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
@@ -850,8 +829,6 @@ static void pnpacpi_encode_mem32(struct acpi_resource *resource,
 static void pnpacpi_encode_fixed_mem32(struct acpi_resource *resource,
        struct resource *p)
 {
-       resource->type = ACPI_RESOURCE_TYPE_FIXED_MEMORY32;
-       resource->length = sizeof(struct acpi_resource);
        resource->data.fixed_memory32.write_protect =
                (p->flags & IORESOURCE_MEM_WRITEABLE) ?
                ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
@@ -882,37 +859,37 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
                        pnp_dbg("Encode dma");
                        pnpacpi_encode_dma(resource,
                                &res_table->dma_resource[dma]);
-                       dma ++;
+                       dma++;
                        break;
                case ACPI_RESOURCE_TYPE_IO:
                        pnp_dbg("Encode io");
                        pnpacpi_encode_io(resource,
                                &res_table->port_resource[port]);
-                       port ++;
+                       port++;
                        break;
                case ACPI_RESOURCE_TYPE_FIXED_IO:
                        pnp_dbg("Encode fixed io");
                        pnpacpi_encode_fixed_io(resource,
                                &res_table->port_resource[port]);
-                       port ++;
+                       port++;
                        break;
                case ACPI_RESOURCE_TYPE_MEMORY24:
                        pnp_dbg("Encode mem24");
                        pnpacpi_encode_mem24(resource,
                                &res_table->mem_resource[mem]);
-                       mem ++;
+                       mem++;
                        break;
                case ACPI_RESOURCE_TYPE_MEMORY32:
                        pnp_dbg("Encode mem32");
                        pnpacpi_encode_mem32(resource,
                                &res_table->mem_resource[mem]);
-                       mem ++;
+                       mem++;
                        break;
                case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
                        pnp_dbg("Encode fixed mem32");
                        pnpacpi_encode_fixed_mem32(resource,
                                &res_table->mem_resource[mem]);
-                       mem ++;
+                       mem++;
                        break;
                case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                        pnp_dbg("Encode ext irq");
@@ -933,8 +910,8 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
                        pnp_warn("unknown resource type %d", resource->type);
                        return -EINVAL;
                }
-               resource ++;
-               i ++;
+               resource++;
+               i++;
        }
        return 0;
 }