Commit cc6baa4f authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Andy Grover

[PATCH] resolve ACPI lockup

A much needed (and widely tested) ACPI bugfix for kernel 2.5.28:
An u8 was casted into an u32, then all 32 bits were zeroed. This can cause
other values, e.g. "unsigned long flags" to be corrupted. When these
flags==0 are "restored", the system locks hard.
parent 173d4827
...@@ -134,7 +134,7 @@ static int ...@@ -134,7 +134,7 @@ static int
acpi_ec_read ( acpi_ec_read (
struct acpi_ec *ec, struct acpi_ec *ec,
u8 address, u8 address,
u8 *data) u32 *data)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
int result = 0; int result = 0;
...@@ -167,7 +167,7 @@ acpi_ec_read ( ...@@ -167,7 +167,7 @@ acpi_ec_read (
goto end; goto end;
acpi_hw_low_level_read(8, (u32*) data, &ec->data_addr, 0); acpi_hw_low_level_read(8, data, &ec->data_addr, 0);
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Read [%02x] from address [%02x]\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Read [%02x] from address [%02x]\n",
*data, address)); *data, address));
...@@ -237,7 +237,7 @@ acpi_ec_write ( ...@@ -237,7 +237,7 @@ acpi_ec_write (
static int static int
acpi_ec_query ( acpi_ec_query (
struct acpi_ec *ec, struct acpi_ec *ec,
u8 *data) u32 *data)
{ {
int result = 0; int result = 0;
acpi_status status = AE_OK; acpi_status status = AE_OK;
...@@ -269,7 +269,7 @@ acpi_ec_query ( ...@@ -269,7 +269,7 @@ acpi_ec_query (
if (result) if (result)
goto end; goto end;
acpi_hw_low_level_read(8, (u32*) data, &ec->data_addr, 0); acpi_hw_low_level_read(8, data, &ec->data_addr, 0);
if (!*data) if (!*data)
result = -ENODATA; result = -ENODATA;
...@@ -328,7 +328,7 @@ acpi_ec_gpe_handler ( ...@@ -328,7 +328,7 @@ acpi_ec_gpe_handler (
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
struct acpi_ec *ec = (struct acpi_ec *) data; struct acpi_ec *ec = (struct acpi_ec *) data;
u8 value = 0; u32 value = 0;
unsigned long flags = 0; unsigned long flags = 0;
struct acpi_ec_query_data *query_data = NULL; struct acpi_ec_query_data *query_data = NULL;
...@@ -336,7 +336,7 @@ acpi_ec_gpe_handler ( ...@@ -336,7 +336,7 @@ acpi_ec_gpe_handler (
return; return;
spin_lock_irqsave(&ec->lock, flags); spin_lock_irqsave(&ec->lock, flags);
acpi_hw_low_level_read(8, (u32*) &value, &ec->command_addr, 0); acpi_hw_low_level_read(8, &value, &ec->command_addr, 0);
spin_unlock_irqrestore(&ec->lock, flags); spin_unlock_irqrestore(&ec->lock, flags);
/* TBD: Implement asynch events! /* TBD: Implement asynch events!
...@@ -398,6 +398,7 @@ acpi_ec_space_handler ( ...@@ -398,6 +398,7 @@ acpi_ec_space_handler (
{ {
int result = 0; int result = 0;
struct acpi_ec *ec = NULL; struct acpi_ec *ec = NULL;
u32 tmp = 0;
ACPI_FUNCTION_TRACE("acpi_ec_space_handler"); ACPI_FUNCTION_TRACE("acpi_ec_space_handler");
...@@ -408,7 +409,8 @@ acpi_ec_space_handler ( ...@@ -408,7 +409,8 @@ acpi_ec_space_handler (
switch (function) { switch (function) {
case ACPI_READ: case ACPI_READ:
result = acpi_ec_read(ec, (u8) address, (u8*) value); result = acpi_ec_read(ec, (u8) address, &tmp);
*value = (acpi_integer) tmp;
break; break;
case ACPI_WRITE: case ACPI_WRITE:
result = acpi_ec_write(ec, (u8) address, (u8) *value); result = acpi_ec_write(ec, (u8) address, (u8) *value);
......
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