[patch 48/55] PNP: make generic pnp_add_dma_resource()

Bjorn Helgaas
2008-04-28T22:37:26Z

[-- Attachment #1: pnp-common-add-dma-resource --]
[-- Type: text/plain, Size: 6661 bytes --]

Add a pnp_add_dma_resource() that can be used by all the PNP
backends. This consolidates a little more pnp_resource_table
knowledge into one place.

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

---
drivers/pnp/base.h | 2 +
drivers/pnp/interface.c | 14 +++----------
drivers/pnp/isapnp/core.c | 9 ++------
drivers/pnp/pnpacpi/rsparser.c | 42 +++++++----------------------------------
drivers/pnp/pnpbios/rsparser.c | 26 +++----------------------
drivers/pnp/resource.c | 26 +++++++++++++++++++++++++
6 files changed, 47 insertions(+), 72 deletions(-)

Index: work10/drivers/pnp/base.h
===================================================================
--- work10.orig/drivers/pnp/base.h 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/base.h 2008-04-28 16:09:46.000000000 -0600
@@ -43,3 +43,5 @@

struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
int flags);
+struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
+ int flags);
Index: work10/drivers/pnp/resource.c
===================================================================
--- work10.orig/drivers/pnp/resource.c 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/resource.c 2008-04-28 16:09:46.000000000 -0600
@@ -602,6 +602,32 @@
return pnp_res;
}

+struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
+ int flags)
+{
+ struct pnp_resource *pnp_res;
+ struct resource *res;
+ static unsigned char warned;
+
+ pnp_res = pnp_new_resource(dev, IORESOURCE_DMA);
+ if (!pnp_res) {
+ if (!warned) {
+ dev_err(&dev->dev, "can't add resource for DMA %d\n",
+ dma);
+ warned = 1;
+ }
+ return NULL;
+ }
+
+ res = &pnp_res->res;
+ res->flags = IORESOURCE_DMA | flags;
+ res->start = dma;
+ res->end = dma;
+
+ dev_dbg(&dev->dev, " add dma %d flags %#x\n", dma, flags);
+ return pnp_res;
+}
+
/* format is: pnp_reserve_irq=irq1[,irq2] .... */
static int __init pnp_setup_reserve_irq(char *str)
{
Index: work10/drivers/pnp/interface.c
===================================================================
--- work10.orig/drivers/pnp/interface.c 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/interface.c 2008-04-28 16:09:46.000000000 -0600
@@ -440,16 +440,10 @@
buf += 3;
while (isspace(*buf))
++buf;
- pnp_res = pnp_get_pnp_resource(dev,
- IORESOURCE_DMA, ndma);
- if (!pnp_res)
- break;
- pnp_res->index = ndma;
- res = &pnp_res->res;
- res->start = res->end =
- simple_strtoul(buf, &buf, 0);
- res->flags = IORESOURCE_DMA;
- ndma++;
+ start = simple_strtoul(buf, &buf, 0);
+ pnp_res = pnp_add_dma_resource(dev, start, 0);
+ if (pnp_res)
+ pnp_res->index = ndma++;
continue;
}
break;
Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-04-28 16:09:46.000000000 -0600
@@ -973,12 +973,9 @@
ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
if (ret == 4)
continue;
- pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA,
- tmp);
- pnp_res->index = tmp;
- res = &pnp_res->res;
- res->start = res->end = ret;
- res->flags = IORESOURCE_DMA;
+ pnp_res = pnp_add_dma_resource(dev, ret, 0);
+ if (pnp_res)
+ pnp_res->index = tmp;
}
}
return 0;
Index: work10/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:46.000000000 -0600
@@ -158,34 +158,6 @@
return flags;
}

-static void pnpacpi_parse_allocated_dmaresource(struct pnp_dev *dev,
- u32 dma, int flags)
-{
- struct resource *res;
- int i;
- static unsigned char warned;
-
- for (i = 0; i < PNP_MAX_DMA; i++) {
- res = pnp_get_resource(dev, IORESOURCE_DMA, i);
- if (!pnp_resource_valid(res))
- break;
- }
- if (i < PNP_MAX_DMA) {
- res->flags = IORESOURCE_DMA; // Also clears _UNSET flag
- res->flags |= flags;
- if (dma == -1) {
- res->flags |= IORESOURCE_DISABLED;
- return;
- }
- res->start = dma;
- res->end = dma;
- } else if (!warned) {
- printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "
- "resources: %d \n", PNP_MAX_DMA);
- warned = 1;
- }
-}
-
static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev,
u64 io, u64 len, int io_decode)
{
@@ -285,7 +257,7 @@
struct acpi_resource_memory32 *memory32;
struct acpi_resource_fixed_memory32 *fixed_memory32;
struct acpi_resource_extended_irq *extended_irq;
- int i;
+ int i, flags;

switch (res->type) {
case ACPI_RESOURCE_TYPE_IRQ:
@@ -305,11 +277,13 @@

case ACPI_RESOURCE_TYPE_DMA:
dma = &res->data.dma;
- if (dma->channel_count > 0)
- pnpacpi_parse_allocated_dmaresource(dev,
- dma->channels[0],
- dma_flags(dma->type, dma->bus_master,
- dma->transfer));
+ if (dma->channel_count > 0) {
+ flags = dma_flags(dma->type, dma->bus_master,
+ dma->transfer);
+ if (dma->channels[0] == (u8) -1)
+ flags |= IORESOURCE_DISABLED;
+ pnp_add_dma_resource(dev, dma->channels[0], flags);
+ }
break;

case ACPI_RESOURCE_TYPE_IO:
Index: work10/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:46.000000000 -0600
+++ work10/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:46.000000000 -0600
@@ -54,27 +54,6 @@
* Allocated Resources
*/

-static void pnpbios_parse_allocated_dmaresource(struct pnp_dev *dev, int dma)
-{
- struct resource *res;
- int i;
-
- for (i = 0; i < PNP_MAX_DMA; i++) {
- res = pnp_get_resource(dev, IORESOURCE_DMA, i);
- if (!pnp_resource_valid(res))
- break;
- }
-
- if (i < PNP_MAX_DMA) {
- res->flags = IORESOURCE_DMA; // Also clears _UNSET flag
- if (dma == -1) {
- res->flags |= IORESOURCE_DISABLED;
- return;
- }
- res->start = res->end = (unsigned long)dma;
- }
-}
-
static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,
int io, int len)
{
@@ -199,12 +178,15 @@
case SMALL_TAG_DMA:
if (len != 2)
goto len_err;
+ flags = 0;
io = -1;
mask = p[1];
for (i = 0; i < 8; i++, mask = mask >> 1)
if (mask & 0x01)
io = i;
- pnpbios_parse_allocated_dmaresource(dev, io);
+ if (io == -1)
+ flags = IORESOURCE_DISABLED;
+ pnp_add_dma_resource(dev, io, flags);
break;

case SMALL_TAG_PORT:

--