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

Commit cacba865 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Tables: Cleanup RSDP signature codes. 



This patch introduces new macors to handle RSDP signature and cleans up the
affected codes.  Lv Zheng.
Some updates are only used for ACPICA utilities which are not shipped in
the kernel yet.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Reviewed-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 94d4be67

drivers/acpi/acpica/tbprint.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ acpi_tb_print_table_header(acpi_physical_address address, 
		ACPI_INFO((AE_INFO, "%4.4s %p %05X",

			   header->signature, ACPI_CAST_PTR(void, address),

			   header->length));

	} else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {

	} else if (ACPI_VALIDATE_RSDP_SIG(header->signature)) {



		/* RSDP has no common fields */

drivers/acpi/acpica/tbxfroot.c

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp) 
	 * Note: Sometimes there exists more than one RSDP in memory; the valid

	 * RSDP has a valid checksum, all others have an invalid checksum.

	 */

	if (ACPI_STRNCMP((char *)rsdp->signature, ACPI_SIG_RSDP,

			 sizeof(ACPI_SIG_RSDP) - 1) != 0) {

	if (!ACPI_VALIDATE_RSDP_SIG(rsdp->signature)) {



		/* Nope, BAD Signature */

include/acpi/actypes.h

+5 −0
Original line number Diff line number Diff line
@@ -474,6 +474,11 @@ typedef u64 acpi_integer; 
#define ACPI_MOVE_NAME(dest,src)        (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))

#endif



/* Support for the special RSDP signature (8 characters) */



#define ACPI_VALIDATE_RSDP_SIG(a)       (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))

#define ACPI_MAKE_RSDP_SIG(dest)        (ACPI_MEMCPY (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))



/*******************************************************************************

 *

 * Miscellaneous constants