From nobody Tue Dec 14 11:07:23 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E778618DDA0C; Tue, 14 Dec 2021 11:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCwZN2Crlz3Nyc; Tue, 14 Dec 2021 11:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF1FC26D62; Tue, 14 Dec 2021 11:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEB7Nlm040275; Tue, 14 Dec 2021 11:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEB7Ncc040274; Tue, 14 Dec 2021 11:07:23 GMT (envelope-from git) Date: Tue, 14 Dec 2021 11:07:23 GMT Message-Id: <202112141107.1BEB7Ncc040274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: efa206137718 - stable/13 - Only change the fadt revision in acpidump on i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: efa206137718f4881518a69e7760685a1f751a8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639480044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTM3nq2Qn6Csc1xbh1/1viiTqoAHPmO0a40keUsfvoU=; b=MowXEp4RdwN4BBLHsv7XuwKkepTvgH770HH4CfqycN9+7XseMOg9lCITLkQLcRZCjS86gT cUiNbxOoqpkxtzlRHhulkQbfzCvcVTHHzyZR0q4twTItfPd4TVGT7X1GOSMESd6z8UPHkI 2U3Ge865r8M3U3K16007hJvncdRaTy30jWXVXsDG+WpGrHcSZp12up1p8RLkKb5S5fEuaZ PqaK2Ats2tUCNF7KkriP3AGGP/zyhx92wv+RbnrrCnDPnoBCcugmvZ4WbyVZXY58euWFSF b/Vaa5KxTZYq2mrSSvVueS67pqEDlDvzBaA/xelEUl7gkiP1XfLaXxMGc7VX1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639480044; a=rsa-sha256; cv=none; b=IpQeUoo3YeVR8On+4jmDSaYTcjPj6nHKMEbWvWGznA6Ar+/Xn0dzJKfu5vNf+pZ4bsshkp b5rBa10kBL7EtS8p8v2AaPGyNclKVW0R0iSpq7FlwyFDgPG99TRgcPDb1BAwp21Blq/KEj iP2YPPues4/H7gDzbQesZyRsvkGGLpJDwQicV4cIj8LYIHOoGxP08PlzU766JBPZ9cWRK3 y73v5RgHPYQj5P1SiyiBSzImtzMINAgAq/qBMUUfnXhsPM2i/w64G7VEVHAcejvsF89igk D/F/f88FeIllarPczyHOWWxFPV0aLFeyidDVxdtdcntIK7GZR+cpVLmohY9zNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=efa206137718f4881518a69e7760685a1f751a8f commit efa206137718f4881518a69e7760685a1f751a8f Author: Andrew Turner AuthorDate: 2021-10-20 09:19:55 +0000 Commit: Andrew Turner CommitDate: 2021-12-14 10:58:01 +0000 Only change the fadt revision in acpidump on i386 There is a workaround in acpidump for an old IBM laptop. This is being hit on a modern arm64 system causing acpidump to use the wrong field when reading a later address. As the laptop has a 32-bit CPU the only FreeBSD support for it is i386. As such limit the workaround to that architecture. Reviewed by: emaste, jkim, jhb (all earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32573 (cherry picked from commit 01593a0ff9f16e2cb23ab2ebc4ca3b8bd2434425) --- usr.sbin/acpi/acpidump/acpi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index adb5b968f441..0e91a85f6a90 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -219,16 +219,22 @@ acpi_get_fadt_revision(ACPI_TABLE_FADT *fadt) if (addr_size == 8) { fadt_revision = 2; +#if defined(__i386__) /* * A few systems (e.g., IBM T23) have an RSDP that claims * revision 2 but the 64 bit addresses are invalid. If * revision 2 and the 32 bit address is non-zero but the * 32 and 64 bit versions don't match, prefer the 32 bit * version for all subsequent tables. + * + * The only known ACPI systems this affects are early + * implementations on 32-bit x86. Because of this limit the + * workaround to i386. */ if (fadt->Facs != 0 && (fadt->XFacs & 0xffffffff) != fadt->Facs) fadt_revision = 1; +#endif } else fadt_revision = 1; return (fadt_revision);