From 991aef97957da8cb1fe5bf6ae4bbce4f8098a734 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 1 Sep 2022 10:39:34 -0600 Subject: [PATCH] acpi: Move some errors with RSDP and XSLT out from under bootverbose Failure to map RSDP, XSLT and checksum failures are events that can't happen unless something has gone wrong. As such, they should be reported always, and not in bootverbose. This has been this way since it was originally brought in to parse APIC tables. Sponsored by: Netflix Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D36406 --- sys/amd64/acpica/acpi_machdep.c | 12 ++++-------- sys/arm64/acpica/acpi_machdep.c | 9 +++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index 1a9f44969d0..41ec1554147 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -184,8 +184,7 @@ acpi_find_table(const char *sig) return (0); rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { - if (bootverbose) - printf("ACPI: Failed to map RSDP\n"); + printf("ACPI: Failed to map RSDP\n"); return (0); } @@ -201,16 +200,14 @@ acpi_find_table(const char *sig) * an additional checksum that we verify first. */ if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { - if (bootverbose) - printf("ACPI: RSDP failed extended checksum\n"); + printf("ACPI: RSDP failed extended checksum\n"); pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); } xsdt = map_table(rsdp->XsdtPhysicalAddress, ACPI_SIG_XSDT); if (xsdt == NULL) { - if (bootverbose) - printf("ACPI: Failed to map XSDT\n"); + printf("ACPI: Failed to map XSDT\n"); pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); @@ -226,8 +223,7 @@ acpi_find_table(const char *sig) } else { rsdt = map_table(rsdp->RsdtPhysicalAddress, ACPI_SIG_RSDT); if (rsdt == NULL) { - if (bootverbose) - printf("ACPI: Failed to map RSDT\n"); + printf("ACPI: Failed to map RSDT\n"); pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c index 6145dfbbc78..c9de5385254 100644 --- a/sys/arm64/acpica/acpi_machdep.c +++ b/sys/arm64/acpica/acpi_machdep.c @@ -161,8 +161,7 @@ acpi_find_table(const char *sig) return (0); rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { - if (bootverbose) - printf("ACPI: Failed to map RSDP\n"); + printf("ACPI: Failed to map RSDP\n"); return (0); } @@ -174,16 +173,14 @@ acpi_find_table(const char *sig) * an additional checksum that we verify first. */ if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { - if (bootverbose) - printf("ACPI: RSDP failed extended checksum\n"); + printf("ACPI: RSDP failed extended checksum\n"); pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); } xsdt = map_table(rsdp->XsdtPhysicalAddress, ACPI_SIG_XSDT); if (xsdt == NULL) { - if (bootverbose) - printf("ACPI: Failed to map XSDT\n"); + printf("ACPI: Failed to map XSDT\n"); pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); return (0);