lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ACPI] enable PNPACPI support for resource types used by HP serial ports

Browse Source 
PNPACPI complained about and ignored devices with ADDRESS16, ADDRESS32, or
ADDRESS64 descriptors in _PRS.  HP firmware uses them for built-in serial
ports, so this patch adds support for parsing these descriptors from _PRS.

Note that this does not add the corresponding support for encoding them in
preparation for _SRS, because I don't have any machine that supports _SRS
on these descriptors, so I couldn't test that support.  Attempts to encode
them will cause a warning and an -EINVAL return.

http://sourceforge.net/mailarchive/forum.php?thread_id=8250154&forum_id=6102

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
2005-09-20 15:26:00 -04:00
committed by Len Brown
parent 0aec63e67c
commit 6f957eaf79
1 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/pnp/pnpacpi/rsparser.c
View File

@@ -453,6 +453,45 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
return; return;
} }
static void
pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
{
struct acpi_resource_address64 addr, *p = &addr;
acpi_status status;
struct pnp_mem * mem;
struct pnp_port * port;
status = acpi_resource_to_address64(r, p);
if (!ACPI_SUCCESS(status)) {
pnp_warn("PnPACPI: failed to convert resource type %d", r->id);
return;
}
if (p->address_length == 0)
return;
if (p->resource_type == ACPI_MEMORY_RANGE) {
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = mem->max = p->min_address_range;
mem->size = p->address_length;
mem->align = 0;
mem->flags = (p->attribute.memory.read_write_attribute ==
ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
pnp_register_mem_resource(option,mem);
} else if (p->resource_type == ACPI_IO_RANGE) {
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = port->max = p->min_address_range;
port->size = p->address_length;
port->align = 0;
port->flags = PNP_PORT_FLAG_FIXED;
pnp_register_port_resource(option,port);
}
}
struct acpipnp_parse_option_s { struct acpipnp_parse_option_s {
struct pnp_option *option; struct pnp_option *option;
struct pnp_option *option_independent; struct pnp_option *option_independent;
@@ -495,6 +534,11 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
pnpacpi_parse_fixed_mem32_option(option, pnpacpi_parse_fixed_mem32_option(option,
&res->data.fixed_memory32); &res->data.fixed_memory32);
break; break;
case ACPI_RSTYPE_ADDRESS16:
case ACPI_RSTYPE_ADDRESS32:
case ACPI_RSTYPE_ADDRESS64:
pnpacpi_parse_address_option(option, res);
break;
case ACPI_RSTYPE_START_DPF: case ACPI_RSTYPE_START_DPF:
switch (res->data.start_dpf.compatibility_priority) { switch (res->data.start_dpf.compatibility_priority) {
case ACPI_GOOD_CONFIGURATION: case ACPI_GOOD_CONFIGURATION:
@@ -568,11 +612,9 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
case ACPI_RSTYPE_MEM24: case ACPI_RSTYPE_MEM24:
case ACPI_RSTYPE_MEM32: case ACPI_RSTYPE_MEM32:
case ACPI_RSTYPE_FIXED_MEM32: case ACPI_RSTYPE_FIXED_MEM32:
#if 0
case ACPI_RSTYPE_ADDRESS16: case ACPI_RSTYPE_ADDRESS16:
case ACPI_RSTYPE_ADDRESS32: case ACPI_RSTYPE_ADDRESS32:
case ACPI_RSTYPE_ADDRESS64: case ACPI_RSTYPE_ADDRESS64:
#endif
(*res_cnt) ++; (*res_cnt) ++;
default: default:
return AE_OK; return AE_OK;
@@ -593,11 +635,9 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
case ACPI_RSTYPE_MEM24: case ACPI_RSTYPE_MEM24:
case ACPI_RSTYPE_MEM32: case ACPI_RSTYPE_MEM32:
case ACPI_RSTYPE_FIXED_MEM32: case ACPI_RSTYPE_FIXED_MEM32:
#if 0
case ACPI_RSTYPE_ADDRESS16: case ACPI_RSTYPE_ADDRESS16:
case ACPI_RSTYPE_ADDRESS32: case ACPI_RSTYPE_ADDRESS32:
case ACPI_RSTYPE_ADDRESS64: case ACPI_RSTYPE_ADDRESS64:
#endif
(*resource)->id = res->id; (*resource)->id = res->id;
(*resource)++; (*resource)++;
default: default: