From nobody Mon Sep 30 12:23:42 2024 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 4XHKxC0txcz5YD2f; Mon, 30 Sep 2024 12:23:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxB6W87z4Lqg; Mon, 30 Sep 2024 12:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699022; 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=kwrG8a4N72euxXXJuW1Gjt4s/QEqazfy/vvK+5Hhcmo=; b=aVFogh+FG3OzzwgNG8GFUxm55OwM1X57exFs41REJ7THrEBXXUgM5OuLfg/bVxcYiGniSh DfX5X5kc9xmTH9qjed0TqHCPQ8la7SwexWAImMaOApFrEG86h3hAVS/H6Er2YqZ7BPQ+aw qJV8RdMxNjJD6rco/lA2QUxDsxvCXMrp33DotNrN67d8J900MS/8cZRUze6HECbT7LxoKl OmErXDNkIt/GrH5oDA0NSf+u9GFHZsB78ItS3hsJwHIzhLZau2pDBlUs8fjKatNfz1PLw5 cDf1q7UwdRWl9am4TG7vv8YwAvfbggAU/jNOoSx5E+Gokd/Tq13mPec1rGganQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699022; 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=kwrG8a4N72euxXXJuW1Gjt4s/QEqazfy/vvK+5Hhcmo=; b=cUpHLq+6PoF4y9nyU9PhKwPruZroMMTEKTLyl1ZJhOvA4qQp3AGmE4MREfkGUuaHJcBpVh g8o5HknOsSpDv8i5GIuyoHlxcfnttrBvL9FgNRNDX1+7risJTQaoEOfD9jcUly2XbxWWdQ ni6NtD86SyCnahNCebsSq4WeUnEHwaEI6fSpz8GSGHrovFZOsokgCcZhbx+3MASGNFUup8 ZfQkf9SFBPKCVrWIQaoptobB2MFWHuJ9jP7OROlu+jTwz86kf/ENl6T8PmA+8eXwcGp94p CCQsggPr79lSmBRpVP8/fYBaL3ASdoeTbl61dn53WqrD7N5HK1bfR382pY0mnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699022; a=rsa-sha256; cv=none; b=TEQ88GLzF2G90Zaax7VA97GJqc4tbV3XGlJrEJdLuBwBhA92QWjJu6Wvx/igWEgDS7IPpm n3dCOpmlAhpgXcJnNGhJBQgjXzD8MlOiMWQoiCnBp4Zh1kTg5DAcYJr8EOcLbBLj/queIR K48uOLHAGllg4pb6IbseQduRzAnnZrFvKGa7/4bR/9+4gMDaef+3WpA+L71txp+rZbOht+ +xdM81OxexYeUNr0c2g2yRxnB95DMkzEUwzgq+LGMRuejEPpBzTZSxx41YyKrTqDb5lqwA 6NS+02TUPHSJkLaH/z2OpM7frN49Kl/A2vwabumKaIyzdI/F4scjfvY4HjsDlg== 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 4XHKxB5rllzsZq; Mon, 30 Sep 2024 12:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNgCU071163; Mon, 30 Sep 2024 12:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNgSJ071160; Mon, 30 Sep 2024 12:23:42 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:42 GMT Message-Id: <202409301223.48UCNgSJ071160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 33f2cf4ad460 - main - arm64: Switch to ACPI by default 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f commit 33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f Author: Andrew Turner AuthorDate: 2024-09-27 15:12:13 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Switch to ACPI by default When the FreeBSD/arm64 port was created we only supported FDT. We now also support ACPI, and have for many years. When this support was added we kept FDT as the default. There are some setups where both ACPI tables and a FDT DTB are passed into the kernel. In most of these cases the DTB is only used to pass in minimal information. To handle the cases where both are passed in prefer ACPI over FDT. Reviewed by: bz, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46750 --- sys/arm64/arm64/machdep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index f9885f4d4e0a..b61fec3fdd11 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -801,10 +801,10 @@ bus_probe(void) } /* If no order or an invalid order was set use the default */ if (arm64_bus_method == ARM64_BUS_NONE) { - if (has_fdt) - arm64_bus_method = ARM64_BUS_FDT; - else if (has_acpi) + if (has_acpi) arm64_bus_method = ARM64_BUS_ACPI; + else if (has_fdt) + arm64_bus_method = ARM64_BUS_FDT; } /*