From nobody Thu Jun 27 17:56:45 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 4W95qK74c9z5Q7Xc; Thu, 27 Jun 2024 17:56:45 +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 4W95qK537pz4bJ0; Thu, 27 Jun 2024 17:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719511005; 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=yc+gqUw2oAcll8pou273mpNdFoyRqCWTWIVZbUj8xfg=; b=DnzkLiqVdbFfLZ3oYaN6Bi5YFsNEU2SQnT6u2GhKeerT2keD2ZsJ2RNlERMM2wGWLs5+pF twCxZS6I+mVQptFpv3Bpsymp/RQZo5omNrPU/fq/W3ecgmpctCbKksZkIzBHyhE8wU6SUE /jKLIcgmUQvyzqZZICIhTYjMC3iS7XjTOeW0Ccab/Vc9UBSaG/3vYmq+oyv1OTHk9UzTXU zXq7nXKjQXBjn/eAyqX6TD/bNw7Sgn1rFjao8/sccZuxu+izkCOtstIAJlTRXA9+bcqgi0 ILE7o7cZlNZN5xGuNEIsPXZojhEVmLg2PdDooHcsJi7WlPzpXbbZjgu6DlbE2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719511005; a=rsa-sha256; cv=none; b=Ce2HLLgzvcsa8g1Y2J8fun4jEqQ5dlOSC8DWU48r2ZoLSmQjtAkM9SvAXkDzG/HP9qBQ1Y gSJjvVvt4HBKbRGuDO526/9dlcEMdNgkUc3d7DSsOAIVre1akRUtf16l0LaxfN/FykM3W5 pzhISQh+zCXJKPdx2UEWlCpEeg9e1mkowd9kd4gZP/bRSeiJrYBLpnAHHTrrZf6K9UxPeN vitWYEhf7u5R54bds5LRKF2C2kV8ABZGrymPSsKA1lpslANuDoBAMnXWLXlYdS9je8Pi6t dRrJwpVQ2V0v/n9Nfl8f5HSBzjEQE+1v6WIPN+Gry4rs9uJkJyrUNsh0s9aWtg== 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=1719511005; 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=yc+gqUw2oAcll8pou273mpNdFoyRqCWTWIVZbUj8xfg=; b=NL7qk3jrRF+xIexvVJRDwFMvvBnlRZqS8j2dG5XLnzoQxEpPeWEsc+QJ6qPJOD/SJl1WfU cvjEw+gq4xVAfzDxaZCQ1Fzy33K0649RcLzV5XC+rAb6iX6DfgEqiCFTUVzOOF2hbO406/ vLYImjg7OSIHJf4AiPAPrEZ37TUn5sBN9pjns2QX6YrxOgO8YHxphA1K3nZ0eoC7F6jVVS IBv+uVKGAiZVWRvCOzOaP3MJwvmGT6dCkQ6UKHB0igrxeh3MBGA37KyawELwyhwsPjAfrN 4xg0VjAktsUIGRBOjQUOEAkYyVKx/0ATsBf/qcFvINs4PVSzv6NqT4FaVlK2uw== 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 4W95qK4LKgzMms; Thu, 27 Jun 2024 17:56:45 +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 45RHujNG022068; Thu, 27 Jun 2024 17:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RHujVf022065; Thu, 27 Jun 2024 17:56:45 GMT (envelope-from git) Date: Thu, 27 Jun 2024 17:56:45 GMT Message-Id: <202406271756.45RHujVf022065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9a53391b601d - stable/14 - riscv: adjust physmem reservation 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a53391b601dd19dec2be2b68e356e2378deb085 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9a53391b601dd19dec2be2b68e356e2378deb085 commit 9a53391b601dd19dec2be2b68e356e2378deb085 Author: Mitchell Horne AuthorDate: 2024-06-14 17:57:28 +0000 Commit: Mitchell Horne CommitDate: 2024-06-27 17:56:23 +0000 riscv: adjust physmem reservation Make sure we do this BEFORE pmap_bootstrap(). Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45325 (cherry picked from commit 0e4e77072f65df71644140e41229b868a73f3371) --- sys/riscv/riscv/machdep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 5872ef9f94ac..61f86f9e6958 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -550,10 +550,6 @@ initriscv(struct riscv_bootparams *rvbp) cache_setup(); - /* Bootstrap enough of pmap to enter the kernel proper */ - kernlen = (lastaddr - KERNBASE); - pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); - #ifdef FDT /* * XXX: Unconditionally exclude the lowest 2MB of physical memory, as @@ -566,6 +562,11 @@ initriscv(struct riscv_bootparams *rvbp) physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE, EXFLAG_NODUMP | EXFLAG_NOALLOC); #endif + + /* Bootstrap enough of pmap to enter the kernel proper */ + kernlen = (lastaddr - KERNBASE); + pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); + physmem_init_kernel_globals(); /* Establish static device mappings */