From 81e2152af840c6c7fdcc50ee160a9ffe08705ae2 Mon Sep 17 00:00:00 2001 From: dongshen Date: Tue, 20 Aug 2019 15:56:36 -0700 Subject: [PATCH] hv: cosmetic fixes in acpi.h Minor cosmetic fixes in acpi.h: Move and group similar defines together Rename RSDP_CHECKSUM_LENGTH to ACPI_RSDP_CHECKSUM_LENGTH Add post fix 'U' to define as unsinged int and change code accordingly Tracked-On: #3601 Signed-off-by: dongshen Reviewed-by: Eddie Dong --- hypervisor/boot/acpi_base.c | 5 +++-- hypervisor/boot/include/acpi.h | 41 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/hypervisor/boot/acpi_base.c b/hypervisor/boot/acpi_base.c index 54c08ac13..7daed0da8 100644 --- a/hypervisor/boot/acpi_base.c +++ b/hypervisor/boot/acpi_base.c @@ -41,7 +41,8 @@ static struct acpi_table_rsdp *found_rsdp(char *base, int32_t length) { struct acpi_table_rsdp *rsdp, *ret = NULL; uint8_t *cp, sum; - int32_t ofs, idx; + int32_t ofs; + uint32_t idx; /* search on 16-byte boundaries */ for (ofs = 0; ofs < length; ofs += 16) { @@ -51,7 +52,7 @@ static struct acpi_table_rsdp *found_rsdp(char *base, int32_t length) if (strncmp(rsdp->signature, ACPI_SIG_RSDP, strnlen_s(ACPI_SIG_RSDP, 8U)) == 0) { cp = (uint8_t *)rsdp; sum = 0U; - for (idx = 0; idx < RSDP_CHECKSUM_LENGTH; idx++) { + for (idx = 0; idx < ACPI_RSDP_CHECKSUM_LENGTH; idx++) { sum += *(cp + idx); } diff --git a/hypervisor/boot/include/acpi.h b/hypervisor/boot/include/acpi.h index 93874417e..f4e67d090 100644 --- a/hypervisor/boot/include/acpi.h +++ b/hypervisor/boot/include/acpi.h @@ -9,35 +9,36 @@ #include -#define ACPI_OEM_ID_SIZE 6 -#define RSDP_CHECKSUM_LENGTH 20 -#define ACPI_NAME_SIZE 4U -#define ACPI_MADT_TYPE_LOCAL_APIC 0U -#define ACPI_MADT_TYPE_IOAPIC 1U -#define ACPI_MADT_ENABLED 1U -#define ACPI_OEM_TABLE_ID_SIZE 8 +#define ACPI_RSDP_CHECKSUM_LENGTH 20U +#define ACPI_NAME_SIZE 4U +#define ACPI_OEM_ID_SIZE 6U +#define ACPI_OEM_TABLE_ID_SIZE 8U + +#define ACPI_MADT_TYPE_LOCAL_APIC 0U +#define ACPI_MADT_TYPE_IOAPIC 1U +#define ACPI_MADT_ENABLED 1U /* FACP field offsets */ -#define OFFSET_FACS_ADDR 36U -#define OFFSET_RESET_REGISTER 116U -#define OFFSET_RESET_VALUE 128U -#define OFFSET_FACS_X_ADDR 132U +#define OFFSET_FACS_ADDR 36U +#define OFFSET_RESET_REGISTER 116U +#define OFFSET_RESET_VALUE 128U +#define OFFSET_FACS_X_ADDR 132U #define OFFSET_PM1A_EVT 148U #define OFFSET_PM1A_CNT 172U /* FACS field offsets */ -#define OFFSET_FACS_SIGNATURE 0U -#define OFFSET_FACS_LENGTH 4U -#define OFFSET_WAKE_VECTOR_32 12U -#define OFFSET_WAKE_VECTOR_64 24U +#define OFFSET_FACS_SIGNATURE 0U +#define OFFSET_FACS_LENGTH 4U +#define OFFSET_WAKE_VECTOR_32 12U +#define OFFSET_WAKE_VECTOR_64 24U -#define ACPI_SIG_FADT "FACP" /* Fixed ACPI Description Table */ -#define ACPI_SIG_FACS 0x53434146U /* "FACS" */ -#define ACPI_SIG_RSDP "RSD PTR " /* Root System Description Ptr */ -#define ACPI_SIG_MADT "APIC" /* Multiple APIC Description Table */ -#define ACPI_SIG_DMAR "DMAR" +#define ACPI_SIG_FADT "FACP" /* Fixed ACPI Description Table */ +#define ACPI_SIG_FACS 0x53434146U /* "FACS" */ +#define ACPI_SIG_RSDP "RSD PTR " /* Root System Description Ptr */ +#define ACPI_SIG_MADT "APIC" /* Multiple APIC Description Table */ +#define ACPI_SIG_DMAR "DMAR" struct packed_gas {