From nobody Sat Jul 2 14:04:07 2022 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 A414A87B6B5; Sat, 2 Jul 2022 14:04:07 +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 4LZv1z40G1z3DTC; Sat, 2 Jul 2022 14:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656770647; 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=H5EBO7S1XkjPyqpLfrKEaz9ps7EOXE5WbkUNyP9wUjQ=; b=Da616BpbZBkpOLVWZ1vLa4pAAALeS1B39zVq5FwXOttQdPvFepM5CWxplyPz1Wpj/OoMvk Q4MYGHLUn/oLHFf5FWReYGHhUOkydnGLTLteYqxivHBVZT4pSC5EDOKvzqTLdNC1BN1fK8 qQaMPZlLGtq+G24NUTBZgHzMhy2giWrLA4Ed78JvFANyKdfLTx04mU8sYkUcqKwucRgm8s b5UWrk7HqByEIrKliAKi56Cm6fD6Xzjpo4fd9RvkxKH/HRAdAVKoD/2yLQRxdwuM8kT5N3 DLwzr/Jw33uLKPEuWc99xOMEnXqtwAOgzN16cUYqoKP7zXN+DAz2SELARcFDcQ== 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 59E3B11727; Sat, 2 Jul 2022 14:04:07 +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 262E47DB038828; Sat, 2 Jul 2022 14:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 262E47u9038827; Sat, 2 Jul 2022 14:04:07 GMT (envelope-from git) Date: Sat, 2 Jul 2022 14:04:07 GMT Message-Id: <202207021404.262E47u9038827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 064f00ec274f - main - arm64: Grab the RSDP from acpi.rsdp like x86 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 064f00ec274fbfdcab19ed8150afb187468a0c4f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656770647; 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=H5EBO7S1XkjPyqpLfrKEaz9ps7EOXE5WbkUNyP9wUjQ=; b=TVehXUMYqslw2E0ObhEtZHKsKvBM/A1Kf/TuTVjKiGPyKwtx8Yyhcq3E19FIVM1G5x4cTY pL5LABMcZoXDuoQdKAF1bKk3bfTsDRCXrn6dIu/4Ex6b4AVVDfDdTN5hiZTr//duqzSxcN p4arbJ2NyfmfwWAJC+9/TpdYEaD+Z0aH1FA8HeC6DkvxZUrlAcP8yXoRgTTfIFZ49ZDbGz 1JMFXQTu1LHn8KBCaYslePZMAYEfWq7OeQ1dMNotGVXUIY5L2WGlUFU6XaCIvUt4USbUyj DpLg1YV/pRM1djfMGmDerHfBWSSe4CLfjtpgNNWkdx3GiM2Rs3rOKXD8M5Eibw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656770647; a=rsa-sha256; cv=none; b=tpsgqDi9Rt9CHJ1sg78QFeJ0GQzs/BXdBpGaGhtiAJnLvpTc5hg5E4RWvzAcBgbAl+00L7 pnWIVSUTk16EsZHfuwmUfMjgJ/Q/SOx3f28KN4hm/kmEDjf/WZ2e6ltDfuzdH25P4AEA/X xOSAlbmUDqqOIBiawkBJKAm1sDrEE675NwW9UqR6YQA3Y8rXRaD6+oagvwlLnp2LgxrFkp gsC/IEB8X+hK5EdZ8/P2KKRiy7lV6At1Dd+hm1P+Vu53bqmeN/NCTiAGR0SwlzjUqDDcYG vBoWodnYEUVJiPNhk2ERasjumF1ircnsiTrrqrxNbFsbQiEfz/2nBDXErlmupw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=064f00ec274fbfdcab19ed8150afb187468a0c4f commit 064f00ec274fbfdcab19ed8150afb187468a0c4f Author: Warner Losh AuthorDate: 2022-07-02 14:00:27 +0000 Commit: Warner Losh CommitDate: 2022-07-02 14:02:12 +0000 arm64: Grab the RSDP from acpi.rsdp like x86 arm64 wasn't updated to grab this from acpi.rsdp when x86 was update. belatedly update the kernel to grab this information from the preferred kenv. Sponsored by: Netflix Reviewed by: andrew, jhb Differential Revision: https://reviews.freebsd.org/D35631 --- sys/arm64/acpica/OsdEnvironment.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/arm64/acpica/OsdEnvironment.c b/sys/arm64/acpica/OsdEnvironment.c index 6efcee9646d0..3d8afd0ab2d5 100644 --- a/sys/arm64/acpica/OsdEnvironment.c +++ b/sys/arm64/acpica/OsdEnvironment.c @@ -60,6 +60,16 @@ acpi_get_root_from_loader(void) { long acpi_root; + if (TUNABLE_ULONG_FETCH("acpi.rsdp", &acpi_root)) + return (acpi_root); + + /* + * The hints mechanism is unreliable (it fails if anybody ever + * compiled in hints to the kernel). It has been replaced + * by the tunable method, but is used here as a fallback to + * retain maximum compatibility between old loaders and new + * kernels. It can be removed after 14.0R. + */ if (resource_long_value("acpi", 0, "rsdp", &acpi_root) == 0) return (acpi_root);