[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/8] hw: arm: acpi: Fix incorrect checksums in RS
From: |
Samuel Ortiz |
Subject: |
[Qemu-devel] [PATCH v3 2/8] hw: arm: acpi: Fix incorrect checksums in RSDP |
Date: |
Fri, 30 Nov 2018 14:00:26 +0100 |
From: Igor Mammedov <address@hidden>
When RSDP table was introduced (d4bec5d87), we calculated only legacy
checksum, and that was incorrect as it
- specified rev=2 and forgot about extended checksum.
- legacy checksum calculated on full table instead of the 1st 20 bytes
Fix it by adding extended checksum calculation and using correct
size for legacy checksum.
While at it use explicit constants to specify sub/full tables
sizes instead of relying on AcpiRsdpDescriptor size and fields offsets.
The follow up commits will convert this table to build_append_int_noprefix()
API,
will use constants anyway and remove unused AcpiRsdpDescriptor structure.
Based on "[PATCH v5 05/24] hw: acpi: Implement XSDT support for RSDP"
by Samuel Ortiz, who did it right in his impl.
Fixes: d4bec5d87 (hw/arm/virt-acpi-build: Generate RSDP table)
Signed-off-by: Igor Mammedov <address@hidden>
CC: Ard Biesheuvel <address@hidden>
CC: Shannon Zhao <address@hidden>
Reviewed-by: Samuel Ortiz <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
Signed-off-by: Samuel Ortiz <address@hidden>
---
hw/arm/virt-acpi-build.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index fcaa350892..0835900052 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -390,8 +390,13 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker,
unsigned xsdt_tbl_offset)
/* Checksum to be filled by Guest linker */
bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- (char *)rsdp - rsdp_table->data, sizeof *rsdp,
+ (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
(char *)&rsdp->checksum - rsdp_table->data);
+
+ /* Extended checksum to be filled by Guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ (char *)rsdp - rsdp_table->data, 36 /* ACPI rev 2.0 RSDP size */,
+ (char *)&rsdp->extended_checksum - rsdp_table->data);
}
static void
--
2.19.2
- [Qemu-devel] [PATCH v3 0/8] hw: acpi: RSDP fixes and refactoring, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 3/8] hw: i386: Use correct RSDT length for checksum, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 5/8] hw: arm: Convert the RSDP build to the buid_append_foo() API, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 1/8] hw: acpi: The RSDP build API can return void, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 2/8] hw: arm: acpi: Fix incorrect checksums in RSDP,
Samuel Ortiz <=
- [Qemu-devel] [PATCH v3 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 6/8] hw: arm: Support both legacy and current RSDP build, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 7/8] hw: acpi: Export and share the ARM RSDP build, Samuel Ortiz, 2018/11/30
- [Qemu-devel] [PATCH v3 8/8] hw: acpi: Remove AcpiRsdpDescriptor and fix tests, Samuel Ortiz, 2018/11/30