Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7823665e authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b1dd9096

include/acpi/acmacros.h

+35 −34
Original line number Diff line number Diff line
@@ -61,30 +61,6 @@ 


#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

 * 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))

#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.

 * If the hardware supports the transfer of unaligned data, just do the store.