[PATCH] PNPACPI: support shareable interrupts
ACPI supplies a "shareable" indication, but PNPACPI ignores it. If a PNP device uses a shared interrupt, request_irq() fails because the PNP driver can't tell whether to supply SA_SHIRQ. This patch allows PNP drivers to test (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE) Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Adam Belay <ambx1@neo.rr.com> Cc: Matthieu Castet <castet.matthieu@free.fr> Cc: Li Shaohua <shaohua.li@intel.com> Cc: Len Brown <len.brown@intel.com> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
c61a8416ed
commit
c32928c579
|
@ -74,7 +74,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
|
||||||
|
|
||||||
static void
|
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 triggering, int polarity, int shareable)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int irq;
|
int irq;
|
||||||
|
@ -95,6 +95,9 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (shareable)
|
||||||
|
res->irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;
|
||||||
|
|
||||||
res->irq_resource[i].start = irq;
|
res->irq_resource[i].start = irq;
|
||||||
res->irq_resource[i].end = irq;
|
res->irq_resource[i].end = irq;
|
||||||
pcibios_penalize_isa_irq(irq, 1);
|
pcibios_penalize_isa_irq(irq, 1);
|
||||||
|
@ -194,7 +197,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
|
||||||
pnpacpi_parse_allocated_irqresource(res_table,
|
pnpacpi_parse_allocated_irqresource(res_table,
|
||||||
res->data.irq.interrupts[i],
|
res->data.irq.interrupts[i],
|
||||||
res->data.irq.triggering,
|
res->data.irq.triggering,
|
||||||
res->data.irq.polarity);
|
res->data.irq.polarity,
|
||||||
|
res->data.irq.sharable);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -255,7 +259,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
|
||||||
pnpacpi_parse_allocated_irqresource(res_table,
|
pnpacpi_parse_allocated_irqresource(res_table,
|
||||||
res->data.extended_irq.interrupts[i],
|
res->data.extended_irq.interrupts[i],
|
||||||
res->data.extended_irq.triggering,
|
res->data.extended_irq.triggering,
|
||||||
res->data.extended_irq.polarity);
|
res->data.extended_irq.polarity,
|
||||||
|
res->data.extended_irq.sharable);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,7 @@ struct resource_list {
|
||||||
#define IORESOURCE_IRQ_LOWEDGE (1<<1)
|
#define IORESOURCE_IRQ_LOWEDGE (1<<1)
|
||||||
#define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
|
#define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
|
||||||
#define IORESOURCE_IRQ_LOWLEVEL (1<<3)
|
#define IORESOURCE_IRQ_LOWLEVEL (1<<3)
|
||||||
|
#define IORESOURCE_IRQ_SHAREABLE (1<<4)
|
||||||
|
|
||||||
/* ISA PnP DMA specific bits (IORESOURCE_BITS) */
|
/* ISA PnP DMA specific bits (IORESOURCE_BITS) */
|
||||||
#define IORESOURCE_DMA_TYPE_MASK (3<<0)
|
#define IORESOURCE_DMA_TYPE_MASK (3<<0)
|
||||||
|
|
Loading…
Reference in New Issue