Attachment 144583 Details for Bug 259992

[patch] Set correct name of the resource

bug-259992_acpi_resource_conflicts.patch (text/plain), 5.95 KB, created by Alexey Starikovskiy on 2007-06-06 20:31:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Starikovskiy

Created: 2007-06-06 20:31:23 UTC

Size: 5.95 KB

patch

obsolete

>
>
>From: Alexey Starikovskiy <aystarik@gmail.com>
>
>
>---
>
> drivers/acpi/dispatcher/dsopcode.c |    3 ++-
> drivers/acpi/osl.c                 |   20 +++++++++++++++++++-
> include/acpi/acpiosxf.h            |    2 +-
> include/linux/ioport.h             |    8 +++++---
> kernel/resource.c                  |   20 ++++++++++++++------
> 5 files changed, 41 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
>index fc9da48..1bec354 100644
>--- a/drivers/acpi/dispatcher/dsopcode.c
>+++ b/drivers/acpi/dispatcher/dsopcode.c
>@@ -359,7 +359,8 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
> 
> 	status = acpi_os_validate_address(obj_desc->region.space_id,
> 					  obj_desc->region.address,
>-					  (acpi_size) obj_desc->region.length);
>+					  (acpi_size) obj_desc->region.length,
>+					 acpi_ut_get_node_name(node));
> 	if (ACPI_FAILURE(status)) {
> 		/*
> 		 * Invalid address/length. We will emit an error message and mark
>diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
>index 58ceb18..a106cca 100644
>--- a/drivers/acpi/osl.c
>+++ b/drivers/acpi/osl.c
>@@ -1220,9 +1220,27 @@ acpi_status
> acpi_os_validate_address (
>     u8                   space_id,
>     acpi_physical_address   address,
>-    acpi_size               length)
>+    acpi_size               length,
>+    char *name)
> {
> 
>+    switch (space_id){
>+	    case ACPI_ADR_SPACE_SYSTEM_IO:
>+		request_region_soft(address, length, name);
>+		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;
> }
> 
>diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
>index ca882b8..0795059 100644
>--- a/include/acpi/acpiosxf.h
>+++ b/include/acpi/acpiosxf.h
>@@ -240,7 +240,7 @@ acpi_status acpi_osi_invalidate(char* interface);
> 
> acpi_status
> acpi_os_validate_address(u8 space_id,
>-			 acpi_physical_address address, acpi_size length);
>+			 acpi_physical_address address, acpi_size length, char *name);
> 
> u64 acpi_os_get_timer(void);
> 
>diff --git a/include/linux/ioport.h b/include/linux/ioport.h
>index 71ea923..1d8e100 100644
>--- a/include/linux/ioport.h
>+++ b/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, resource_size_t start,
> 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))
>diff --git a/kernel/resource.c b/kernel/resource.c
>index 9bd14fd..d577880 100644
>--- a/kernel/resource.c
>+++ b/kernel/resource.c
>@@ -80,11 +80,12 @@ static int r_show(struct seq_file *m, void *v)
> 	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(struct resource *parent,
> 		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(struct resource *parent,
> 				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 *parent, resource_size_t start,
> {
> 	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(struct device *dev,
> 	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