ACPICA: Fix for ACPI_HIDWORD macro
Fixed a regression introduced in version 20071114. The ACPI_HIDWORD macro was inadvertently changed to return a 16-bit value instead of a 32-bit value, truncating the upper Dword of a 64-bit value. This macro is only used to display debug output, so no incorrect calculations were made. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
b1dd9096fe
commit
7823665ecc
1 changed files with 35 additions and 34 deletions
|
@ -61,30 +61,6 @@
|
||||||
|
|
||||||
#define ACPI_ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
|
#define ACPI_ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
|
||||||
|
|
||||||
/*
|
|
||||||
* Full 64-bit integer must be available on both 32-bit and 64-bit platforms
|
|
||||||
*/
|
|
||||||
#define ACPI_LODWORD(l) ((u32)(u64)(l))
|
|
||||||
#define ACPI_HIDWORD(l) ((u16)((((u64)(l)) >> 32) & 0xFFFFFFFF))
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
#define ACPI_HIDWORD(l) ((u32)(((*(struct uint64_struct *)(void *)(&l))).hi))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* printf() format helpers
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Split 64-bit integer into two 32-bit values. Use with %8.8_x%8.8_x */
|
|
||||||
|
|
||||||
#define ACPI_FORMAT_UINT64(i) ACPI_HIDWORD(i),ACPI_LODWORD(i)
|
|
||||||
|
|
||||||
#if ACPI_MACHINE_WIDTH == 64
|
|
||||||
#define ACPI_FORMAT_NATIVE_UINT(i) ACPI_FORMAT_UINT64(i)
|
|
||||||
#else
|
|
||||||
#define ACPI_FORMAT_NATIVE_UINT(i) 0, (i)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Extract data using a pointer. Any more than a byte and we
|
* Extract data using a pointer. Any more than a byte and we
|
||||||
* get into potential aligment issues -- see the STORE macros below.
|
* get into potential aligment issues -- see the STORE macros below.
|
||||||
|
@ -121,6 +97,31 @@
|
||||||
#define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char,(a)), ACPI_CAST_PTR (char,(b)), ACPI_NAME_SIZE))
|
#define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char,(a)), ACPI_CAST_PTR (char,(b)), ACPI_NAME_SIZE))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Full 64-bit integer must be available on both 32-bit and 64-bit platforms
|
||||||
|
*/
|
||||||
|
struct acpi_integer_overlay {
|
||||||
|
u32 lo_dword;
|
||||||
|
u32 hi_dword;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define ACPI_LODWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->lo_dword)
|
||||||
|
#define ACPI_HIDWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->hi_dword)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* printf() format helpers
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Split 64-bit integer into two 32-bit values. Use with %8.8_x%8.8_x */
|
||||||
|
|
||||||
|
#define ACPI_FORMAT_UINT64(i) ACPI_HIDWORD(i),ACPI_LODWORD(i)
|
||||||
|
|
||||||
|
#if ACPI_MACHINE_WIDTH == 64
|
||||||
|
#define ACPI_FORMAT_NATIVE_UINT(i) ACPI_FORMAT_UINT64(i)
|
||||||
|
#else
|
||||||
|
#define ACPI_FORMAT_NATIVE_UINT(i) 0, (i)
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Macros for moving data around to/from buffers that are possibly unaligned.
|
* Macros for moving data around to/from buffers that are possibly unaligned.
|
||||||
* If the hardware supports the transfer of unaligned data, just do the store.
|
* If the hardware supports the transfer of unaligned data, just do the store.
|
||||||
|
@ -137,29 +138,29 @@
|
||||||
|
|
||||||
/* These macros reverse the bytes during the move, converting little-endian to big endian */
|
/* These macros reverse the bytes during the move, converting little-endian to big endian */
|
||||||
|
|
||||||
/* Big Endian <== Little Endian */
|
/* Big Endian <== Little Endian */
|
||||||
/* Hi...Lo Lo...Hi */
|
/* Hi...Lo Lo...Hi */
|
||||||
/* 16-bit source, 16/32/64 destination */
|
/* 16-bit source, 16/32/64 destination */
|
||||||
|
|
||||||
#define ACPI_MOVE_16_TO_16(d,s) {(( u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[1];\
|
#define ACPI_MOVE_16_TO_16(d,s) {(( u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[1];\
|
||||||
(( u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
|
(( u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
|
||||||
|
|
||||||
#define ACPI_MOVE_16_TO_32(d,s) {(*(u32 *)(void *)(d))=0;\
|
#define ACPI_MOVE_16_TO_32(d,s) {(*(u32 *)(void *)(d))=0;\
|
||||||
((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
|
((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
|
||||||
((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
|
((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
|
||||||
|
|
||||||
#define ACPI_MOVE_16_TO_64(d,s) {(*(u64 *)(void *)(d))=0;\
|
#define ACPI_MOVE_16_TO_64(d,s) {(*(u64 *)(void *)(d))=0;\
|
||||||
((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
|
((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
|
||||||
((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
|
((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
|
||||||
|
|
||||||
/* 32-bit source, 16/32/64 destination */
|
/* 32-bit source, 16/32/64 destination */
|
||||||
|
|
||||||
#define ACPI_MOVE_32_TO_16(d,s) ACPI_MOVE_16_TO_16(d,s) /* Truncate to 16 */
|
#define ACPI_MOVE_32_TO_16(d,s) ACPI_MOVE_16_TO_16(d,s) /* Truncate to 16 */
|
||||||
|
|
||||||
#define ACPI_MOVE_32_TO_32(d,s) {(( u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[3];\
|
#define ACPI_MOVE_32_TO_32(d,s) {(( u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[3];\
|
||||||
(( u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
|
(( u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
|
||||||
(( u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
|
(( u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
|
||||||
(( u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
|
(( u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
|
||||||
|
|
||||||
#define ACPI_MOVE_32_TO_64(d,s) {(*(u64 *)(void *)(d))=0;\
|
#define ACPI_MOVE_32_TO_64(d,s) {(*(u64 *)(void *)(d))=0;\
|
||||||
((u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
|
((u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
|
||||||
|
|
Reference in a new issue