From patchwork Sun Apr 19 20:36:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 238039 List-Id: U-Boot discussion From: sjg at chromium.org (Simon Glass) Date: Sun, 19 Apr 2020 14:36:53 -0600 Subject: [PATCH v7 5/9] acpi: Drop code for missing XSDT from acpi_write_rsdp() In-Reply-To: <20200419203657.163143-1-sjg@chromium.org> References: <20200419203657.163143-1-sjg@chromium.org> Message-ID: <20200419143624.v7.5.I4566efe7db4c618499115f6973d851e0aa502da9@changeid> We don't actually support tables without an XSDT so we can drop this dead code. Signed-off-by: Simon Glass Reviewed-by: Wolfgang Wallner --- Changes in v7: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None arch/x86/lib/acpi_table.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index d8622da394..de1acb0ebb 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -42,19 +42,8 @@ static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt, rsdp->length = sizeof(struct acpi_rsdp); rsdp->rsdt_address = (u32)rsdt; - /* - * Revision: ACPI 1.0: 0, ACPI 2.0/3.0/4.0: 2 - * - * Some OSes expect an XSDT to be present for RSD PTR revisions >= 2. - * If we don't have an ACPI XSDT, force ACPI 1.0 (and thus RSD PTR - * revision 0) - */ - if (xsdt == NULL) { - rsdp->revision = ACPI_RSDP_REV_ACPI_1_0; - } else { - rsdp->xsdt_address = (u64)(u32)xsdt; - rsdp->revision = ACPI_RSDP_REV_ACPI_2_0; - } + rsdp->xsdt_address = (u64)(u32)xsdt; + rsdp->revision = ACPI_RSDP_REV_ACPI_2_0; /* Calculate checksums */ rsdp->checksum = table_compute_checksum((void *)rsdp, 20);