Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / pnp / pnpacpi / rsparser.c

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index b13f85e0bc342ea44a2206d027bdf4be6b9ae1d0..379048fdf05dccf01575a5727219529ac7d39fac 100644 (file)
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -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,8 +73,8 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
 }
 
 static void
-pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
-       int triggering, int polarity)
+pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
+       int triggering, int polarity, int shareable)
 {
        int i = 0;
        int irq;
@@ -95,13 +95,16 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
                return;
        }
 
+       if (shareable)
+               res->irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;
+
        res->irq_resource[i].start = irq;
        res->irq_resource[i].end = irq;
        pcibios_penalize_isa_irq(irq, 1);
 }
 
 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,7 +122,7 @@ pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)
 }
 
 static void
-pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,
+pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
        u64 io, u64 len)
 {
        int i = 0;
@@ -138,7 +141,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;
@@ -170,6 +173,9 @@ pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
                return;
        }
 
+       if (p->producer_consumer == ACPI_PRODUCER)
+               return;
+
        if (p->resource_type == ACPI_MEMORY_RANGE)
                pnpacpi_parse_allocated_memresource(res_table,
                                p->minimum, p->address_length);
@@ -181,7 +187,7 @@ pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
 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) {
@@ -194,7 +200,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                        pnpacpi_parse_allocated_irqresource(res_table,
                                res->data.irq.interrupts[i],
                                res->data.irq.triggering,
-                               res->data.irq.polarity);
+                               res->data.irq.polarity,
+                               res->data.irq.sharable);
                }
                break;
 
@@ -248,14 +255,20 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                break;
 
        case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+               if (res->data.ext_address64.producer_consumer == ACPI_PRODUCER)
+                       return AE_OK;
                break;
 
        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+               if (res->data.extended_irq.producer_consumer == ACPI_PRODUCER)
+                       return AE_OK;
+
                for (i = 0; i < res->data.extended_irq.interrupt_count; i++) {
                        pnpacpi_parse_allocated_irqresource(res_table,
                                res->data.extended_irq.interrupts[i],
                                res->data.extended_irq.triggering,
-                               res->data.extended_irq.polarity);
+                               res->data.extended_irq.polarity,
+                               res->data.extended_irq.sharable);
                }
                break;
 
@@ -266,11 +279,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);
@@ -328,17 +341,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);
@@ -358,7 +371,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;
@@ -379,7 +392,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;
@@ -392,7 +405,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;
 }
 
@@ -400,7 +413,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;
@@ -411,7 +424,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;
 }
 
@@ -419,7 +432,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;
@@ -434,7 +447,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;
 }
 
@@ -442,7 +455,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;
@@ -457,7 +470,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;
 }
 
@@ -465,7 +478,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;
@@ -479,7 +492,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;
 }
 
@@ -488,8 +501,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)) {
@@ -509,7 +522,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)
@@ -518,7 +531,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);
        }
 }
 
@@ -542,7 +555,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:
@@ -550,7 +563,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;
@@ -566,7 +579,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:
@@ -626,7 +639,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;
 }
 
@@ -679,10 +692,9 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
        return AE_OK;
 }
 
-static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
-       void *data)
+static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
 {
-       struct acpi_resource **resource = (struct acpi_resource **)data;        
+       struct acpi_resource **resource = (struct acpi_resource **)data;
 
        if (pnpacpi_supported_resource(res)) {
                (*resource)->type = res->type;
@@ -731,9 +743,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);
+
+       decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
        resource->data.irq.triggering = triggering;
        resource->data.irq.polarity = polarity;
        if (triggering == ACPI_EDGE_SENSITIVE)
@@ -748,9 +759,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);
+
+       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;
@@ -766,21 +776,32 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,
        struct resource *p)
 {
        /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
-       if (p->flags & IORESOURCE_DMA_COMPATIBLE)
-               resource->data.dma.type = ACPI_COMPATIBILITY;
-       else if (p->flags & IORESOURCE_DMA_TYPEA)
-               resource->data.dma.type = ACPI_TYPE_A;
-       else if (p->flags & IORESOURCE_DMA_TYPEB)
-               resource->data.dma.type = ACPI_TYPE_B;
-       else if (p->flags & IORESOURCE_DMA_TYPEF)
-               resource->data.dma.type = ACPI_TYPE_F;
-       if (p->flags & IORESOURCE_DMA_8BIT)
-               resource->data.dma.transfer = ACPI_TRANSFER_8;
-       else if (p->flags & IORESOURCE_DMA_8AND16BIT)
-               resource->data.dma.transfer = ACPI_TRANSFER_8_16;
-       else if (p->flags & IORESOURCE_DMA_16BIT)
-               resource->data.dma.transfer = ACPI_TRANSFER_16;
-       resource->data.dma.bus_master = p->flags & IORESOURCE_DMA_MASTER;
+       switch (p->flags & IORESOURCE_DMA_SPEED_MASK) {
+               case IORESOURCE_DMA_TYPEA:
+                       resource->data.dma.type = ACPI_TYPE_A;
+                       break;
+               case IORESOURCE_DMA_TYPEB:
+                       resource->data.dma.type = ACPI_TYPE_B;
+                       break;
+               case IORESOURCE_DMA_TYPEF:
+                       resource->data.dma.type = ACPI_TYPE_F;
+                       break;
+               default:
+                       resource->data.dma.type = ACPI_COMPATIBILITY;
+       }
+
+       switch (p->flags & IORESOURCE_DMA_TYPE_MASK) {
+               case IORESOURCE_DMA_8BIT:
+                       resource->data.dma.transfer = ACPI_TRANSFER_8;
+                       break;
+               case IORESOURCE_DMA_8AND16BIT:
+                       resource->data.dma.transfer = ACPI_TRANSFER_8_16;
+                       break;
+               default:
+                       resource->data.dma.transfer = ACPI_TRANSFER_16;
+       }
+
+       resource->data.dma.bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
        resource->data.dma.channel_count = 1;
        resource->data.dma.channels[0] = p->start;
 }
@@ -862,37 +883,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");
@@ -913,8 +934,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;
 }