git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
acpi
/
executer
/
exregion.c
diff --git
a/drivers/acpi/executer/exregion.c
b/drivers/acpi/executer/exregion.c
index
6a4cfdf
..
3cc97ba
100644
(file)
--- a/
drivers/acpi/executer/exregion.c
+++ b/
drivers/acpi/executer/exregion.c
@@
-81,7
+81,7
@@
acpi_ex_system_memory_space_handler(u32 function,
u32 remainder;
#endif
u32 remainder;
#endif
- ACPI_FUNCTION_TRACE(
"ex_system_memory_space_handler"
);
+ ACPI_FUNCTION_TRACE(
ex_system_memory_space_handler
);
/* Validate and translate the bit width */
/* Validate and translate the bit width */
@@
-103,7
+103,7
@@
acpi_ex_system_memory_space_handler(u32 function,
break;
default:
break;
default:
- ACPI_ERROR((AE_INFO, "Invalid
system_m
emory width %d",
+ ACPI_ERROR((AE_INFO, "Invalid
SystemM
emory width %d",
bit_width));
return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
}
bit_width));
return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
}
@@
-135,6
+135,7
@@
acpi_ex_system_memory_space_handler(u32 function,
* Delete the existing mapping and create a new one.
*/
if (mem_info->mapped_length) {
* Delete the existing mapping and create a new one.
*/
if (mem_info->mapped_length) {
+
/* Valid mapping, delete it */
acpi_os_unmap_memory(mem_info->mapped_logical_address,
/* Valid mapping, delete it */
acpi_os_unmap_memory(mem_info->mapped_logical_address,
@@
-181,8
+182,8
@@
acpi_ex_system_memory_space_handler(u32 function,
(acpi_integer) mem_info->mapped_physical_address);
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
(acpi_integer) mem_info->mapped_physical_address);
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "
system_memory %d (%d width)
Address=%8.8X%8.8X\n",
-
function, bit_width
, ACPI_FORMAT_UINT64(address)));
+ "
System-Memory (width %d) R/W %d
Address=%8.8X%8.8X\n",
+
bit_width, function
, ACPI_FORMAT_UINT64(address)));
/*
* Perform the memory read or write
/*
* Perform the memory read or write
@@
-283,11
+284,11
@@
acpi_ex_system_io_space_handler(u32 function,
acpi_status status = AE_OK;
u32 value32;
acpi_status status = AE_OK;
u32 value32;
- ACPI_FUNCTION_TRACE(
"ex_system_io_space_handler"
);
+ ACPI_FUNCTION_TRACE(
ex_system_io_space_handler
);
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "
system_iO %d (%d width)
Address=%8.8X%8.8X\n",
-
function, bit_width
, ACPI_FORMAT_UINT64(address)));
+ "
System-IO (width %d) R/W %d
Address=%8.8X%8.8X\n",
+
bit_width, function
, ACPI_FORMAT_UINT64(address)));
/* Decode the function parameter */
/* Decode the function parameter */
@@
-342,7
+343,7
@@
acpi_ex_pci_config_space_handler(u32 function,
struct acpi_pci_id *pci_id;
u16 pci_register;
struct acpi_pci_id *pci_id;
u16 pci_register;
- ACPI_FUNCTION_TRACE(
"ex_pci_config_space_handler"
);
+ ACPI_FUNCTION_TRACE(
ex_pci_config_space_handler
);
/*
* The arguments to acpi_os(Read|Write)pci_configuration are:
/*
* The arguments to acpi_os(Read|Write)pci_configuration are:
@@
-360,7
+361,7
@@
acpi_ex_pci_config_space_handler(u32 function,
pci_register = (u16) (u32) address;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
pci_register = (u16) (u32) address;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "
pci_c
onfig %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",
+ "
Pci-C
onfig %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",
function, bit_width, pci_id->segment, pci_id->bus,
pci_id->device, pci_id->function, pci_register));
function, bit_width, pci_id->segment, pci_id->bus,
pci_id->device, pci_id->function, pci_register));
@@
-414,7
+415,7
@@
acpi_ex_cmos_space_handler(u32 function,
{
acpi_status status = AE_OK;
{
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ex_cmos_space_handler"
);
+ ACPI_FUNCTION_TRACE(
ex_cmos_space_handler
);
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}
@@
-446,7
+447,7
@@
acpi_ex_pci_bar_space_handler(u32 function,
{
acpi_status status = AE_OK;
{
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ex_pci_bar_space_handler"
);
+ ACPI_FUNCTION_TRACE(
ex_pci_bar_space_handler
);
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}
@@
-476,23
+477,16
@@
acpi_ex_data_table_space_handler(u32 function,
acpi_integer * value,
void *handler_context, void *region_context)
{
acpi_integer * value,
void *handler_context, void *region_context)
{
- acpi_status status = AE_OK;
- u32 byte_width = ACPI_DIV_8(bit_width);
- u32 i;
- char *logical_addr_ptr;
-
- ACPI_FUNCTION_TRACE("ex_data_table_space_handler");
-
- logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address);
+ ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
/* Perform the memory read or write */
switch (function) {
case ACPI_READ:
/* Perform the memory read or write */
switch (function) {
case ACPI_READ:
- for (i = 0; i < byte_width; i++) {
- ((char *)value)[i] = logical_addr_ptr[i];
- }
+ ACPI_MEMCPY(ACPI_CAST_PTR(char, value),
+ ACPI_PHYSADDR_TO_PTR(address),
+ ACPI_DIV_8(bit_width));
break;
case ACPI_WRITE:
break;
case ACPI_WRITE:
@@
-501,5
+495,5
@@
acpi_ex_data_table_space_handler(u32 function,
return_ACPI_STATUS(AE_SUPPORT);
}
return_ACPI_STATUS(AE_SUPPORT);
}
- return_ACPI_STATUS(
status
);
+ return_ACPI_STATUS(
AE_OK
);
}
}