lkml.org 
[lkml]   [2008]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 48/54] PNP: make generic pnp_add_mem_resource()
Add a pnp_add_mem_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 | 3 +++
drivers/pnp/interface.c | 18 +++++++-----------
drivers/pnp/isapnp/core.c | 9 +++------
drivers/pnp/pnpacpi/rsparser.c | 32 ++++++++------------------------
drivers/pnp/pnpbios/rsparser.c | 23 ++++++-----------------
drivers/pnp/resource.c | 29 +++++++++++++++++++++++++++++
6 files changed, 56 insertions(+), 58 deletions(-)
Index: work10/drivers/pnp/base.h
===================================================================
--- work10.orig/drivers/pnp/base.h 2008-04-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/base.h 2008-04-25 11:15:13.000000000 -0600
@@ -45,3 +45,6 @@
struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
resource_size_t start,
resource_size_t end, int flags);
+struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
+ resource_size_t start,
+ resource_size_t end, int flags);
Index: work10/drivers/pnp/resource.c
===================================================================
--- work10.orig/drivers/pnp/resource.c 2008-04-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/resource.c 2008-04-25 11:15:13.000000000 -0600
@@ -650,6 +650,35 @@
return pnp_res;
}

+struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
+ resource_size_t start,
+ resource_size_t end, int flags)
+{
+ struct pnp_resource *pnp_res;
+ struct resource *res;
+ static unsigned char warned;
+
+ pnp_res = pnp_new_resource(dev, IORESOURCE_MEM);
+ if (!pnp_res) {
+ if (!warned) {
+ dev_err(&dev->dev, "can't add resource for MEM "
+ "0x%llx-0x%llx\n",(unsigned long long) start,
+ (unsigned long long) end);
+ warned = 1;
+ }
+ return NULL;
+ }
+
+ res = &pnp_res->res;
+ res->flags = IORESOURCE_MEM | flags;
+ res->start = start;
+ res->end = end;
+
+ dev_dbg(&dev->dev, " add mem 0x%llx-0x%llx flags 0x%x\n",
+ (unsigned long long) start, (unsigned long long) end, 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-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/interface.c 2008-04-25 11:15:13.000000000 -0600
@@ -323,7 +323,6 @@
{
struct pnp_dev *dev = to_pnp_dev(dmdev);
struct pnp_resource *pnp_res;
- struct resource *res;
char *buf = (void *)ubuf;
int retval = 0;
resource_size_t start, end;
@@ -404,23 +403,20 @@
buf += 3;
while (isspace(*buf))
++buf;
- pnp_res = &dev->res->mem[nmem];
- pnp_res->index = nmem;
- res = &pnp_res->res;
- res->start = simple_strtoul(buf, &buf, 0);
+ start = simple_strtoul(buf, &buf, 0);
while (isspace(*buf))
++buf;
if (*buf == '-') {
buf += 1;
while (isspace(*buf))
++buf;
- res->end = simple_strtoul(buf, &buf, 0);
+ end = simple_strtoul(buf, &buf, 0);
} else
- res->end = res->start;
- res->flags = IORESOURCE_MEM;
- nmem++;
- if (nmem >= PNP_MAX_MEM)
- break;
+ end = start;
+ pnp_res = pnp_add_mem_resource(dev, start, end,
+ 0);
+ if (pnp_res)
+ pnp_res->index = nmem++;
continue;
}
if (!strnicmp(buf, "irq", 3)) {
Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-04-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-04-25 11:15:13.000000000 -0600
@@ -932,7 +932,6 @@
static int isapnp_read_resources(struct pnp_dev *dev)
{
struct pnp_resource *pnp_res;
- struct resource *res;
int tmp, ret;

dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
@@ -950,11 +949,9 @@
isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
if (!ret)
continue;
- pnp_res = &dev->res->mem[tmp];
- pnp_res->index = tmp;
- res = &pnp_res->res;
- res->start = ret;
- res->flags = IORESOURCE_MEM;
+ pnp_res = pnp_add_mem_resource(dev, ret, ret, 0);
+ if (pnp_res)
+ pnp_res->index = tmp;
}
for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
ret =
Index: work10/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-25 11:15:13.000000000 -0600
@@ -173,34 +173,18 @@
}

static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev,
- u64 mem, u64 len,
+ u64 start, u64 len,
int write_protect)
{
- struct resource *res;
- int i;
- static unsigned char warned;
+ int flags = 0;
+ u64 end = start + len - 1;

- for (i = 0; i < PNP_MAX_MEM; i++) {
- res = &dev->res->mem[i].res;
- if (res->flags & IORESOURCE_UNSET)
- break;
- }
- if (i < PNP_MAX_MEM) {
- res->flags = IORESOURCE_MEM; // Also clears _UNSET flag
- if (len <= 0) {
- res->flags |= IORESOURCE_DISABLED;
- return;
- }
- if (write_protect == ACPI_READ_WRITE_MEMORY)
- res->flags |= IORESOURCE_MEM_WRITEABLE;
+ if (len == 0)
+ flags |= IORESOURCE_DISABLED;
+ if (write_protect == ACPI_READ_WRITE_MEMORY)
+ flags |= IORESOURCE_MEM_WRITEABLE;

- res->start = mem;
- res->end = mem + len - 1;
- } else if (!warned) {
- printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "
- "resources: %d\n", PNP_MAX_MEM);
- warned = 1;
- }
+ pnp_add_mem_resource(dev, start, end, flags);
}

static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
Index: work10/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-25 11:15:12.000000000 -0600
+++ work10/drivers/pnp/pnpbios/rsparser.c 2008-04-25 11:15:13.000000000 -0600
@@ -67,26 +67,15 @@
}

static void pnpbios_parse_allocated_memresource(struct pnp_dev *dev,
- int mem, int len)
+ int start, int len)
{
- struct resource *res;
- int i;
+ int flags = 0;
+ int end = start + len - 1;

- for (i = 0; i < PNP_MAX_MEM; i++) {
- res = &dev->res->mem[i].res;
- if (res->flags & IORESOURCE_UNSET)
- break;
- }
+ if (len <= 0)
+ flags |= IORESOURCE_DISABLED;

- if (i < PNP_MAX_MEM) {
- res->flags = IORESOURCE_MEM; // Also clears _UNSET flag
- if (len <= 0) {
- res->flags |= IORESOURCE_DISABLED;
- return;
- }
- res->start = (unsigned long)mem;
- res->end = (unsigned long)(mem + len - 1);
- }
+ pnp_add_mem_resource(dev, start, end, flags);
}

static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
--


\
 
 \ /
  Last update: 2008-04-25 21:03    [from the cache]
©2003-2011 Jasper Spaans