Attachment 144232 Details for Bug 259992

[patch] Request IO and mem resources for ACPI operation regions

acpi_resource_conflicts.patch (text/plain), 4.67 KB, created by Thomas Renninger on 2007-06-05 14:22:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2007-06-05 14:22:03 UTC

Size: 4.67 KB

patch

obsolete

>---
> drivers/acpi/osl.c     |   17 +++++++++++++++++
> include/linux/ioport.h |    8 +++++---
> kernel/resource.c      |   20 ++++++++++++++------
> 3 files changed, 36 insertions(+), 9 deletions(-)
>
>Index: linux-2.6.22-rc3/drivers/acpi/osl.c
>===================================================================
>--- linux-2.6.22-rc3.orig/drivers/acpi/osl.c
>+++ linux-2.6.22-rc3/drivers/acpi/osl.c
>@@ -1171,6 +1171,23 @@ acpi_os_validate_address (
>     acpi_size               length)
> {
> 
>+    switch (space_id){
>+	    case ACPI_ADR_SPACE_SYSTEM_IO:
>+		request_region_soft(address, length, "acpi");
>+		break;
>+
>+	    case ACPI_ADR_SPACE_SYSTEM_MEMORY:
>+	    case ACPI_ADR_SPACE_PCI_CONFIG:
>+	    case ACPI_ADR_SPACE_EC:
>+	    case ACPI_ADR_SPACE_SMBUS:
>+	    case ACPI_ADR_SPACE_CMOS:
>+	    case ACPI_ADR_SPACE_PCI_BAR_TARGET:
>+	    case ACPI_ADR_SPACE_DATA_TABLE:
>+	    case ACPI_ADR_SPACE_FIXED_HARDWARE:
>+	    default:
>+		break;
>+    }
>+
>     return AE_OK;
> }
> 
>Index: linux-2.6.22-rc3/include/linux/ioport.h
>===================================================================
>--- linux-2.6.22-rc3.orig/include/linux/ioport.h
>+++ linux-2.6.22-rc3/include/linux/ioport.h
>@@ -45,6 +45,7 @@ struct resource_list {
> #define IORESOURCE_SHADOWABLE	0x00010000
> #define IORESOURCE_BUS_HAS_VGA	0x00080000
> 
>+#define IORESOURCE_BUSY_SOFT    0x01000000	/* This IO address appears in ACPI namespace */
> #define IORESOURCE_DISABLED	0x10000000
> #define IORESOURCE_UNSET	0x20000000
> #define IORESOURCE_AUTO		0x40000000
>@@ -114,13 +115,14 @@ int adjust_resource(struct resource *res
> extern int find_next_system_ram(struct resource *res);
> 
> /* Convenience shorthand with allocation */
>-#define request_region(start,n,name)	__request_region(&ioport_resource, (start), (n), (name))
>-#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
>+#define request_region(start,n,name)	__request_region(&ioport_resource, (start), (n), (name), IORESOURCE_BUSY)
>+#define request_region_soft(start,n,name)	__request_region(&ioport_resource, (start), (n), (name), IORESOURCE_BUSY_SOFT)
>+#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name), IORESOURCE_BUSY)
> #define rename_region(region, newname) do { (region)->name = (newname); } while (0)
> 
> extern struct resource * __request_region(struct resource *,
> 					resource_size_t start,
>-					resource_size_t n, const char *name);
>+					resource_size_t n, const char *name, u32 flags);
> 
> /* Compatibility cruft */
> #define release_region(start,n)	__release_region(&ioport_resource, (start), (n))
>Index: linux-2.6.22-rc3/kernel/resource.c
>===================================================================
>--- linux-2.6.22-rc3.orig/kernel/resource.c
>+++ linux-2.6.22-rc3/kernel/resource.c
>@@ -80,11 +80,12 @@ static int r_show(struct seq_file *m, vo
> 	for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent)
> 		if (p->parent == root)
> 			break;
>-	seq_printf(m, "%*s%0*llx-%0*llx : %s\n",
>+	seq_printf(m, "%*s%0*llx-%0*llx : %s%c\n",
> 			depth * 2, "",
> 			width, (unsigned long long) r->start,
> 			width, (unsigned long long) r->end,
>-			r->name ? r->name : "<BAD>");
>+			r->name ? r->name : "<BAD>", r->flags &
>+		        IORESOURCE_BUSY_SOFT ? '*' : ' ');
> 	return 0;
> }
> 
>@@ -484,7 +485,7 @@ EXPORT_SYMBOL(adjust_resource);
>  */
> struct resource * __request_region(struct resource *parent,
> 				   resource_size_t start, resource_size_t n,
>-				   const char *name)
>+				   const char *name, u32 flag)
> {
> 	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
> 
>@@ -492,7 +493,7 @@ struct resource * __request_region(struc
> 		res->name = name;
> 		res->start = start;
> 		res->end = start + n - 1;
>-		res->flags = IORESOURCE_BUSY;
>+		res->flags = flag;
> 
> 		write_lock(&resource_lock);
> 
>@@ -504,6 +505,13 @@ struct resource * __request_region(struc
> 				break;
> 			if (conflict != parent) {
> 				parent = conflict;
>+				if ((conflict->flags & IORESOURCE_BUSY_SOFT)){
>+					printk(KERN_ERR "IO resource region"
>+					       " conflicts with IO %s regions,"
>+					       " conflict is ignored, system"
>+					       " might run unstable.\n",
>+					       res->name);
>+				}
> 				if (!(conflict->flags & IORESOURCE_BUSY))
> 					continue;
> 			}
>@@ -539,7 +547,7 @@ int __check_region(struct resource *pare
> {
> 	struct resource * res;
> 
>-	res = __request_region(parent, start, n, "check-region");
>+	res = __request_region(parent, start, n, "check-region", IORESOURCE_BUSY);
> 	if (!res)
> 		return -EBUSY;
> 
>@@ -636,7 +644,7 @@ struct resource * __devm_request_region(
> 	dr->start = start;
> 	dr->n = n;
> 
>-	res = __request_region(parent, start, n, name);
>+	res = __request_region(parent, start, n, name, IORESOURCE_BUSY);
> 	if (res)
> 		devres_add(dev, dr);
> 	else

Actions: View | Diff

Attachments on bug 259992: 128495 | 142653 | 142976 | 144232 | 144583 | 144838 | 159317 | 159321