Commit a993273b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

pnpacpi: fix shareable IRQ encode/decode

When we encode IRQ resources, we should use the "shareable" flag we got
from _PRS rather than guessing based on the IRQ trigger mode.

This is based on a patch by Tom Jaeger:
    http://bugzilla.kernel.org/show_bug.cgi?id=9487#c32Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e9fe9e18
...@@ -50,14 +50,14 @@ static int irq_flags(int triggering, int polarity, int shareable) ...@@ -50,14 +50,14 @@ static int irq_flags(int triggering, int polarity, int shareable)
flags = IORESOURCE_IRQ_HIGHEDGE; flags = IORESOURCE_IRQ_HIGHEDGE;
} }
if (shareable) if (shareable == ACPI_SHARED)
flags |= IORESOURCE_IRQ_SHAREABLE; flags |= IORESOURCE_IRQ_SHAREABLE;
return flags; return flags;
} }
static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering, static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering,
int *polarity) int *polarity, int *shareable)
{ {
switch (flags & (IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL | switch (flags & (IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL |
IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE)) { IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE)) {
...@@ -84,6 +84,11 @@ static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering, ...@@ -84,6 +84,11 @@ static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering,
*polarity = ACPI_ACTIVE_HIGH; *polarity = ACPI_ACTIVE_HIGH;
break; break;
} }
if (flags & IORESOURCE_IRQ_SHAREABLE)
*shareable = ACPI_SHARED;
else
*shareable = ACPI_EXCLUSIVE;
} }
static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
...@@ -796,15 +801,12 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev, ...@@ -796,15 +801,12 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
struct resource *p) struct resource *p)
{ {
struct acpi_resource_irq *irq = &resource->data.irq; struct acpi_resource_irq *irq = &resource->data.irq;
int triggering, polarity; int triggering, polarity, shareable;
decode_irq_flags(dev, p->flags, &triggering, &polarity); decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
irq->triggering = triggering; irq->triggering = triggering;
irq->polarity = polarity; irq->polarity = polarity;
if (triggering == ACPI_EDGE_SENSITIVE) irq->sharable = shareable;
irq->sharable = ACPI_EXCLUSIVE;
else
irq->sharable = ACPI_SHARED;
irq->interrupt_count = 1; irq->interrupt_count = 1;
irq->interrupts[0] = p->start; irq->interrupts[0] = p->start;
...@@ -819,16 +821,13 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev, ...@@ -819,16 +821,13 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
struct resource *p) struct resource *p)
{ {
struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq; struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq;
int triggering, polarity; int triggering, polarity, shareable;
decode_irq_flags(dev, p->flags, &triggering, &polarity); decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
extended_irq->producer_consumer = ACPI_CONSUMER; extended_irq->producer_consumer = ACPI_CONSUMER;
extended_irq->triggering = triggering; extended_irq->triggering = triggering;
extended_irq->polarity = polarity; extended_irq->polarity = polarity;
if (triggering == ACPI_EDGE_SENSITIVE) extended_irq->sharable = shareable;
extended_irq->sharable = ACPI_EXCLUSIVE;
else
extended_irq->sharable = ACPI_SHARED;
extended_irq->interrupt_count = 1; extended_irq->interrupt_count = 1;
extended_irq->interrupts[0] = p->start; extended_irq->interrupts[0] = p->start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment