aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/interface.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-06-27 18:56:57 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:05 -0400
commitaee3ad815dd291a7193ab01da0f1a30c84d00061 (patch)
treeb0549b2a98ddfe6734e1e5f7cedd3958eec18503 /drivers/pnp/interface.c
parent20bfdbba7212d19613b93dcea93f26cb65af91fe (diff)
PNP: replace pnp_resource_table with dynamically allocated resources
PNP used to have a fixed-size pnp_resource_table for tracking the resources used by a device. This table often overflowed, so we've had to increase the table size, which wastes memory because most devices have very few resources. This patch replaces the table with a linked list of resources where the entries are allocated on demand. This removes messages like these: pnpacpi: exceeded the max number of IO resources 00:01: too many I/O port resources References: http://bugzilla.kernel.org/show_bug.cgi?id=9535 http://bugzilla.kernel.org/show_bug.cgi?id=9740 http://lkml.org/lkml/2007/11/30/110 This patch also changes the way PNP uses the IORESOURCE_UNSET, IORESOURCE_AUTO, and IORESOURCE_DISABLED flags. Prior to this patch, the pnp_resource_table entries used the flags like this: IORESOURCE_UNSET This table entry is unused and available for use. When this flag is set, we shouldn't look at anything else in the resource structure. This flag is set when a resource table entry is initialized. IORESOURCE_AUTO This resource was assigned automatically by pnp_assign_{io,mem,etc}(). This flag is set when a resource table entry is initialized and cleared whenever we discover a resource setting by reading an ISAPNP config register, parsing a PNPBIOS resource data stream, parsing an ACPI _CRS list, or interpreting a sysfs "set" command. Resources marked IORESOURCE_AUTO are reinitialized and marked as IORESOURCE_UNSET by pnp_clean_resource_table() in these cases: - before we attempt to assign resources automatically, - if we fail to assign resources automatically, - after disabling a device IORESOURCE_DISABLED Set by pnp_assign_{io,mem,etc}() when automatic assignment fails. Also set by PNPBIOS and PNPACPI for: - invalid IRQs or GSI registration failures - invalid DMA channels - I/O ports above 0x10000 - mem ranges with negative length After this patch, there is no pnp_resource_table, and the resource list entries use the flags like this: IORESOURCE_UNSET This flag is no longer used in PNP. Instead of keeping IORESOURCE_UNSET entries in the resource list, we remove entries from the list and free them. IORESOURCE_AUTO No change in meaning: it still means the resource was assigned automatically by pnp_assign_{port,mem,etc}(), but these functions now set the bit explicitly. We still "clean" a device's resource list in the same places, but rather than reinitializing IORESOURCE_AUTO entries, we just remove them from the list. Note that IORESOURCE_AUTO entries are always at the end of the list, so removing them doesn't reorder other list entries. This is because non-IORESOURCE_AUTO entries are added by the ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the sysfs "set" command. In each of these cases, we completely free the resource list first. IORESOURCE_DISABLED In addition to the cases where we used to set this flag, ISAPNP now adds an IORESOURCE_DISABLED resource when it reads a configuration register with a "disabled" value. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers/pnp/interface.c')
-rw-r--r--drivers/pnp/interface.c60
1 files changed, 26 insertions, 34 deletions
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 3f8007ab94e3..7fc86bbed88e 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -269,46 +269,38 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
269 pnp_printf(buffer, "disabled\n"); 269 pnp_printf(buffer, "disabled\n");
270 270
271 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) { 271 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
272 if (pnp_resource_valid(res)) { 272 pnp_printf(buffer, "io");
273 pnp_printf(buffer, "io"); 273 if (res->flags & IORESOURCE_DISABLED)
274 if (res->flags & IORESOURCE_DISABLED) 274 pnp_printf(buffer, " disabled\n");
275 pnp_printf(buffer, " disabled\n"); 275 else
276 else 276 pnp_printf(buffer, " 0x%llx-0x%llx\n",
277 pnp_printf(buffer, " 0x%llx-0x%llx\n", 277 (unsigned long long) res->start,
278 (unsigned long long) res->start, 278 (unsigned long long) res->end);
279 (unsigned long long) res->end);
280 }
281 } 279 }
282 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) { 280 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
283 if (pnp_resource_valid(res)) { 281 pnp_printf(buffer, "mem");
284 pnp_printf(buffer, "mem"); 282 if (res->flags & IORESOURCE_DISABLED)
285 if (res->flags & IORESOURCE_DISABLED) 283 pnp_printf(buffer, " disabled\n");
286 pnp_printf(buffer, " disabled\n"); 284 else
287 else 285 pnp_printf(buffer, " 0x%llx-0x%llx\n",
288 pnp_printf(buffer, " 0x%llx-0x%llx\n", 286 (unsigned long long) res->start,
289 (unsigned long long) res->start, 287 (unsigned long long) res->end);
290 (unsigned long long) res->end);
291 }
292 } 288 }
293 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) { 289 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) {
294 if (pnp_resource_valid(res)) { 290 pnp_printf(buffer, "irq");
295 pnp_printf(buffer, "irq"); 291 if (res->flags & IORESOURCE_DISABLED)
296 if (res->flags & IORESOURCE_DISABLED) 292 pnp_printf(buffer, " disabled\n");
297 pnp_printf(buffer, " disabled\n"); 293 else
298 else 294 pnp_printf(buffer, " %lld\n",
299 pnp_printf(buffer, " %lld\n", 295 (unsigned long long) res->start);
300 (unsigned long long) res->start);
301 }
302 } 296 }
303 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) { 297 for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) {
304 if (pnp_resource_valid(res)) { 298 pnp_printf(buffer, "dma");
305 pnp_printf(buffer, "dma"); 299 if (res->flags & IORESOURCE_DISABLED)
306 if (res->flags & IORESOURCE_DISABLED) 300 pnp_printf(buffer, " disabled\n");
307 pnp_printf(buffer, " disabled\n"); 301 else
308 else 302 pnp_printf(buffer, " %lld\n",
309 pnp_printf(buffer, " %lld\n", 303 (unsigned long long) res->start);
310 (unsigned long long) res->start);
311 }
312 } 304 }
313 ret = (buffer->curr - buf); 305 ret = (buffer->curr - buf);
314 kfree(buffer); 306 kfree(buffer);