Commit 78e1ca49 authored by Zhao Yakui's avatar Zhao Yakui Committed by Len Brown

ACPI: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0

If hpet has been initialized before registering hpet driver, the callback
function of hpet_resources will return the status code of -EBUSY, which is
not defined in the ACPI exception table.  So when ACPI checks the status
code of callback function, it will report the unknown exception code.

So the status code in ACPI is used instead of the generic error code in the
ACPI callback function of hpet_resources.
For example: -EBUSY is replaced by AE_ALREADY_EXISTS
	     -EINVAL is replaced by AE_NO_MEMORY

http://bugzilla.kernel.org/show_bug.cgi?id=8630Signed-off-by: default avatarZhao Yakui  <yakui.zhao@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 853298bc
...@@ -943,14 +943,14 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) ...@@ -943,14 +943,14 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
printk(KERN_DEBUG "%s: 0x%lx is busy\n", printk(KERN_DEBUG "%s: 0x%lx is busy\n",
__FUNCTION__, hdp->hd_phys_address); __FUNCTION__, hdp->hd_phys_address);
iounmap(hdp->hd_address); iounmap(hdp->hd_address);
return -EBUSY; return AE_ALREADY_EXISTS;
} }
} else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) { } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
struct acpi_resource_fixed_memory32 *fixmem32; struct acpi_resource_fixed_memory32 *fixmem32;
fixmem32 = &res->data.fixed_memory32; fixmem32 = &res->data.fixed_memory32;
if (!fixmem32) if (!fixmem32)
return -EINVAL; return AE_NO_MEMORY;
hdp->hd_phys_address = fixmem32->address; hdp->hd_phys_address = fixmem32->address;
hdp->hd_address = ioremap(fixmem32->address, hdp->hd_address = ioremap(fixmem32->address,
...@@ -960,7 +960,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) ...@@ -960,7 +960,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
printk(KERN_DEBUG "%s: 0x%lx is busy\n", printk(KERN_DEBUG "%s: 0x%lx is busy\n",
__FUNCTION__, hdp->hd_phys_address); __FUNCTION__, hdp->hd_phys_address);
iounmap(hdp->hd_address); iounmap(hdp->hd_address);
return -EBUSY; return AE_ALREADY_EXISTS;
} }
} else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
struct acpi_resource_extended_irq *irqp; struct acpi_resource_extended_irq *irqp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment