Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2b8de5f50e4a302b83ebcd5b0120621336d50bd6

Authored by matthieu castet
Committed by Linus Torvalds
1 parent b4c76fa721
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] pnpacpi: reject ACPI_PRODUCER resources 

A patch in -mm kernel correct the parsing of "address resources" of pnpacpi.
Before we assumed it was memory only, but it could be also IO.

But this change show an hidden bug : some resources could be producer type
that are not handled by pnp layer.  So we should ignore the producer
resources.

This patch fixes bug 6292 (http://bugzilla.kernel.org/show_bug.cgi?id=6292).
Some devices like PNP0A03 have 0xd00-0xffff and 0x0-0xcf7 as IO producer
resources.

Before correcting "address resources" parsing, it was seen as memory and was
harmless, because nobody tried to reserve this memory range as it should be
IO.

With the correction it become IO resources, and make failed all others device
that want to register IO in this range and use pnp layer (like a ISA sound
card).

The solution is to ignore producer resources

Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: "Brown, Len" <len.brown@intel.com>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 8 additions and 0 deletions Side-by-side Diff

drivers/pnp/pnpacpi/rsparser.c
Diff comments   View file @ 2b8de5f
... ... @@ -173,6 +173,9 @@
173 173 return;
174 174 }
175 175  
  176 + if (p->producer_consumer == ACPI_PRODUCER)
  177 + return;
  178 +
176 179 if (p->resource_type == ACPI_MEMORY_RANGE)
177 180 pnpacpi_parse_allocated_memresource(res_table,
178 181 p->minimum, p->address_length);
179 182  
... ... @@ -252,9 +255,14 @@
252 255 break;
253 256  
254 257 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
  258 + if (res->data.ext_address64.producer_consumer == ACPI_PRODUCER)
  259 + return AE_OK;
255 260 break;
256 261  
257 262 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
  263 + if (res->data.extended_irq.producer_consumer == ACPI_PRODUCER)
  264 + return AE_OK;
  265 +
258 266 for (i = 0; i < res->data.extended_irq.interrupt_count; i++) {
259 267 pnpacpi_parse_allocated_irqresource(res_table,
260 268 res->data.extended_irq.interrupts[i],