From patchwork Mon Jan 27 05:05:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1229522 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OiYbozVc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 485dDM2bsRz9sR1 for ; Mon, 27 Jan 2020 16:12:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8A3E8178D; Mon, 27 Jan 2020 06:10:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="OiYbozVc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 553D1817DC; Mon, 27 Jan 2020 06:08:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5D0568176E for ; Mon, 27 Jan 2020 06:08:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd42.google.com with SMTP id i11so8534931ioi.12 for ; Sun, 26 Jan 2020 21:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MpA/QvF9AURc7guFAiCerO9UFfjsVAWKKLB/fmLcezs=; b=OiYbozVcNM1h6OLVrJW4cZNdrRzbUxSXg9IKx8tkz326+2Kga10nvytZC3HOz5R2Xz CQO6xY1WCKetNBHi67ODfYe5Nk/aJ7JG7Ylm76D2QBwI7ZrZHpIyXnlJjBS46mwwIexT 76AtdSISBsGANNygZDPhGUBnj6D1b3yIRkrs4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpA/QvF9AURc7guFAiCerO9UFfjsVAWKKLB/fmLcezs=; b=q5ZLi0+AfSq5ociq8RPaq85UwckqJZ3kYSinuKE7VK2x5uotqUwP7dmNr2DaASs8af 7fRokWGQBNeuKAAsmUOFTDgBFKbpkdxsDmUqINApB9pn2mkdg93czSQ6Eh7vHxk6dYIl Qi+m/Gn8lTPIhuMtVPIbmaRYqXcORKSwZE7iQKlda2AJX7UvB34Wm1dkS8rAUPqRnb1T NZoj+NohTnDfsAYrMob/Ct5WLkR4UTIBZu9p9ZFKBpmVaJ+/LRY1J4HIsSMnMUKgHDSR p3Sps8tU9W1AcoyryFTcP5qo+H/a5kQfESoMwHMgxngmarwyoZcWW4ukqr5Dq2lpdKbv CEew== X-Gm-Message-State: APjAAAV3vobs2SMmLyxj3JNWsredF/GMxXb2zmF3nnH+2JkWCzC6E2yZ vBd62SM7FzBPAkpQvTpT2jQnP9vTj09DIg== X-Google-Smtp-Source: APXvYqy8rAWU/teuWPmbxzaEMfg1Mr7pnX6ZC5sVNNIb+Uz0YK/reUKPGXR9QieJ9wnBWzDmwN81vg== X-Received: by 2002:a6b:6018:: with SMTP id r24mr10072259iog.284.1580101723174; Sun, 26 Jan 2020 21:08:43 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id h23sm4313195ilf.57.2020.01.26.21.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2020 21:08:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH 023/108] acpi: Drop code for missing XSDT from acpi_write_rsdp() Date: Sun, 26 Jan 2020 22:05:30 -0700 Message-Id: <20200126220508.23.I4566efe7db4c618499115f6973d851e0aa502da9@changeid> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200127050655.170614-1-sjg@chromium.org> References: <20200127050655.170614-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean We don't actually support tables without an XSDT so we can drop this dead code. Signed-off-by: Simon Glass --- 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 b7bdd86e91..bc6d19ea2e 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);