lkml.org 
[lkml]   [2008]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 14/37] PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate
    This simplifies IRQ resource parsing slightly by computing all the
    IORESOURCE_IRQ_* flags at the same time.

    This also keeps track of shareability information when parsing options
    from _PRS. Previously we ignored shareability in _PRS.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

    Index: work7/drivers/pnp/pnpacpi/rsparser.c
    ===================================================================
    --- work7.orig/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:10:22.000000000 -0600
    +++ work7/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:10:23.000000000 -0600
    @@ -32,19 +32,26 @@
    /*
    * Allocated Resources
    */
    -static int irq_flags(int triggering, int polarity)
    +static int irq_flags(int triggering, int polarity, int shareable)
    {
    + int flags;
    +
    if (triggering == ACPI_LEVEL_SENSITIVE) {
    if (polarity == ACPI_ACTIVE_LOW)
    - return IORESOURCE_IRQ_LOWLEVEL;
    + flags = IORESOURCE_IRQ_LOWLEVEL;
    else
    - return IORESOURCE_IRQ_HIGHLEVEL;
    + flags = IORESOURCE_IRQ_HIGHLEVEL;
    } else {
    if (polarity == ACPI_ACTIVE_LOW)
    - return IORESOURCE_IRQ_LOWEDGE;
    + flags = IORESOURCE_IRQ_LOWEDGE;
    else
    - return IORESOURCE_IRQ_HIGHEDGE;
    + flags = IORESOURCE_IRQ_HIGHEDGE;
    }
    +
    + if (shareable)
    + flags |= IORESOURCE_IRQ_SHAREABLE;
    +
    + return flags;
    }

    static void decode_irq_flags(int flag, int *triggering, int *polarity)
    @@ -108,16 +115,13 @@
    }

    res->irq_resource[i].flags = IORESOURCE_IRQ; // Also clears _UNSET flag
    - res->irq_resource[i].flags |= irq_flags(triggering, polarity);
    + res->irq_resource[i].flags |= irq_flags(triggering, polarity, shareable);
    irq = acpi_register_gsi(gsi, triggering, polarity);
    if (irq < 0) {
    res->irq_resource[i].flags |= IORESOURCE_DISABLED;
    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);
    @@ -439,7 +443,7 @@
    for (i = 0; i < p->interrupt_count; i++)
    if (p->interrupts[i])
    __set_bit(p->interrupts[i], irq->map);
    - irq->flags = irq_flags(p->triggering, p->polarity);
    + irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);

    pnp_register_irq_resource(option, irq);
    }
    @@ -459,7 +463,7 @@
    for (i = 0; i < p->interrupt_count; i++)
    if (p->interrupts[i])
    __set_bit(p->interrupts[i], irq->map);
    - irq->flags = irq_flags(p->triggering, p->polarity);
    + irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);

    pnp_register_irq_resource(option, irq);
    }
    --


    \
     
     \ /
      Last update: 2008-04-01 17:27    [W:0.027 / U:0.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site