From nobody Tue Apr 02 02:19:22 2024 X-Original-To: dev-commits-src-branches@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 4V7s5Q6yhdz5FlDh; Tue, 2 Apr 2024 02:19:22 +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 4V7s5Q6RLHz4h4s; Tue, 2 Apr 2024 02:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712024362; 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=ABJEsE5d135f3pUgE7eyE5hHUKNQjvrRngQFyHM6JbA=; b=Qpyqemb17rXy+bUBp+I05nkQW6vhIrOmmEanCZjX+q4LNPtaLXiz8XjR9eBX8HFU0vTurP lFYB1rDvSbU4tOH4MW6zqeX2zQWQaor9iub1SxYrYNeDD0sdjp6J/3nekqRVd6rjjWHdAa I328InWNtUiKm58D4yCoZITkpDsLcuIVmBNJ3FjdLprqtbc4DZ88s61Qsf4w4EC7X4N2oJ dPiwPNwVtPkCtzfd9qP4xXYPq0VGrel4vFPIkXNcD3UOZRQIfef2+nW960Ttk1e5FSo9re 8eISCA4sE7dtpAIs0LbR2TVDJ1CHdF+idcYDn5+EdfS9cAYDS92/JVIp1hU3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712024362; a=rsa-sha256; cv=none; b=Dge3aV3Ghrwn1MCqXBMyMfXEFX7dXYsP4T63TprOqqjy8WasVU146o+uHFumBGYeF66Em3 YBZnDyYMxwkbhwazl/3tSOq54WEpQXD5uFU7GwroueXoJMIKzHcejkOjWNu9JZjXc5rCtf xaeYHO3PCpLyf4P9brX7lxkrpNNf/nhE7v0hbAaualplGDw9OabZEY+NgR/Of/BrOl5kVp nc5zGm1rwb5/7pKJJfTb38F0A7fTIIzbqDattMQOBUvao7joRmyY8F485WAlcREGq94bwY rJ3uGBaMUD2nheySxQjip97wATaQ2d7yg9CSMrQdXxtvE0Cr/ck3A6YkMHMJUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712024362; 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=ABJEsE5d135f3pUgE7eyE5hHUKNQjvrRngQFyHM6JbA=; b=ROwnM04la8ONLJGFiSKDFaFNbFY1Jy/vvAHmjp+zFflIFpudUxqi9QLRxfFY9cu3vS7Ns3 OQ26U+ZsK4m026aaAF5ro+uxgx43hH6p1C0X/vMqXhnnso7VNyGucNMg5kuVheXGJ4HPw0 Na+UjGwoziUFtHZmKkBmTUj21MqeRKHmBhgRS5abtTwHpaw9dzTYeV2qimZhAcZWL1JW7Z bpnswR3yPw4BE3bNu2GibpmdKqsDvn9rMlSg1Lh2pWBSQt33+BdoxQXP24LQqMCyZZd/Lv fCA8+oSxJGyaz9Tomvmhs8G2hVUZFW/V0NwsRkVHnxjXyHwYBgsWoE2cvBnUOA== 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 4V7s5Q5wJqzX3r; Tue, 2 Apr 2024 02:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4322JM28037518; Tue, 2 Apr 2024 02:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4322JMXH037515; Tue, 2 Apr 2024 02:19:22 GMT (envelope-from git) Date: Tue, 2 Apr 2024 02:19:22 GMT Message-Id: <202404020219.4322JMXH037515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 44aac9115f75 - stable/14 - powerpc: Bump maximum number of FDT reserved mem entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44aac9115f75fc98c955758c202e0025ae4a0876 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=44aac9115f75fc98c955758c202e0025ae4a0876 commit 44aac9115f75fc98c955758c202e0025ae4a0876 Author: Shawn Anastasio AuthorDate: 2024-02-27 19:40:50 +0000 Commit: Justin Hibbits CommitDate: 2024-04-02 02:09:57 +0000 powerpc: Bump maximum number of FDT reserved mem entries Newer firmware on POWER systems, including v2.10 of the Talos II and Blackbird firmware can end up reserving more than 32 memory regions in the device tree, which exceeded an assumption made by ofw_machdep.c's excise_fdt_reserved(). Bump the maximum number of FDT reservations to the next power of 2 in order to fix booting on newer firmware. PR: 277097 Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D44015 (cherry picked from commit b52dceb838116391996909ff50b49f950ee01f48) --- sys/powerpc/ofw/ofw_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c index f850efa6c713..6d7b0b01fc84 100644 --- a/sys/powerpc/ofw/ofw_machdep.c +++ b/sys/powerpc/ofw/ofw_machdep.c @@ -426,7 +426,7 @@ excise_msi_region(struct mem_region *avail, int asz) static int excise_fdt_reserved(struct mem_region *avail, int asz) { - struct mem_region fdtmap[32]; + struct mem_region fdtmap[64]; ssize_t fdtmapsize; phandle_t chosen; int j, fdtentries;