From nobody Thu Jun 20 19:00:23 2024 X-Original-To: dev-commits-src-main@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 4W4qZ01DXlz5PJGy; Thu, 20 Jun 2024 19:00: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 4W4qYz60Ntz55rP; Thu, 20 Jun 2024 19:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910023; 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=VmTsSC7PvEm6ZsUgycNebsF33DrYrm7g4chpOIz3Mc4=; b=JDc6+Togt2gh1dqNN2pqYK0T6hNvBbzLPDImidomRX4mQ+pMhrrjednThetSnzo7ob2ykQ pkFrSglPemq6OFrlNz+m/bhGP7vvua0au4LwbWwF/9b9ddS16NxEsKFWZwP+Yk2yW5kmPA D7VD4e3fKCI8S2gJd5m9ko3k2jliEc4OSVQriRuppQdut1mxdFG1UKmituBy9Nqo44YJPu yoQ2cJ9c9i03kg0j1ls7IPE3qXEh99KuGp0NzAwHh1APvN8CDTXq0CYFQOTS+8AUzq25W4 fHtpMArAwzUlUI+/EW6gLu+c9HjgGpXlveqyXCzl033mLgY7fiFaagcBn04YOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718910023; a=rsa-sha256; cv=none; b=qxHTqFpP6jQdnns8ZayjxOO4wm7Q6Ptfh63zowlpGG7ynYYa1Qzfq8AiEYcAx+zvHCrF64 J3Q+K5EIfA255kDP9tLz75U/7H1smGV5oaa9p0/XSBIKMxqsMgo1lJ3Kstds/1JF5jwAEf o/WijCeTawY3QXIJNBXBhSRyhLwO+R35IJaAjdCR4pXoFhlETIGCZeQZZo7oG6mIO8gERa ZHhR2TQeojciMGeOOaZmhLDXmRp5G1yz/zEB4IXQGiJWcUE9LvvWauFVid5EWM7ppA2Oxz Iji2Q11vcfnl2+ujR1HLJwzpe5k0UUe13rmXlByctDD4IqLrdmXPMpyAUDX2Hw== 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=1718910023; 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=VmTsSC7PvEm6ZsUgycNebsF33DrYrm7g4chpOIz3Mc4=; b=iBR3RvVHrmaYkFnjoeUR6EBCvDYwJ2CVOPG0nxkxnSvZ6k/SRjR3gjGN46QSOSAzaRouLa FFggDYkaONTWxY+EzzmkHe/7c3oTbvBtIS5pW96dxDdUqQg8lxHjXxArkeBJ7Jjwrmmfe5 t6yACgpWQ76qQ3wjDsYtbICmrd9+ffKDJQ7aEZWP6fD8XVlJ0wVCKniePVE1DUVALRCG2m SZHwszpcTJJQZLXr+dBkQ9zDh5oR39kQrjESx9CwHgtGYgg2bTHKddXRR0YLV1ZS4NngDj yIGC5+gPh0VTsGfrBdwwDVbMmS1RAU0fHSP7ymW/+5w5vGpGtk2J1r8MkTo2lQ== 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 4W4qYz5MhWzcV8; Thu, 20 Jun 2024 19:00:23 +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 45KJ0NS3077848; Thu, 20 Jun 2024 19:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJ0Nrc077845; Thu, 20 Jun 2024 19:00:23 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:00:23 GMT Message-Id: <202406201900.45KJ0Nrc077845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 18051cc694be - main - riscv: drop l1pt argument from pmap_bootstrap() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 18051cc694be7949e289c10e696dc1d56b8b69ca Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=18051cc694be7949e289c10e696dc1d56b8b69ca commit 18051cc694be7949e289c10e696dc1d56b8b69ca Author: Mitchell Horne AuthorDate: 2024-06-20 18:32:54 +0000 Commit: Mitchell Horne CommitDate: 2024-06-20 18:33:19 +0000 riscv: drop l1pt argument from pmap_bootstrap() And from struct riscv_bootparams. It is no longer needed. Reviewed by: br, markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45470 --- sys/riscv/include/machdep.h | 1 - sys/riscv/include/pmap.h | 2 +- sys/riscv/riscv/genassym.c | 1 - sys/riscv/riscv/machdep.c | 2 +- sys/riscv/riscv/pmap.c | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/riscv/include/machdep.h b/sys/riscv/include/machdep.h index 581749f44d76..cfe95e5d81aa 100644 --- a/sys/riscv/include/machdep.h +++ b/sys/riscv/include/machdep.h @@ -36,7 +36,6 @@ #define _MACHINE_MACHDEP_H_ struct riscv_bootparams { - vm_offset_t kern_l1pt; /* Kernel L1 base */ vm_offset_t kern_phys; /* Kernel base (physical) addr */ vm_offset_t kern_stack; vm_offset_t dtbp_phys; /* Device tree blob physical addr */ diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index 8123231144bb..74e15d965826 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -133,7 +133,7 @@ struct thread; void pmap_activate_boot(pmap_t); void pmap_activate_sw(struct thread *); -void pmap_bootstrap(vm_offset_t, vm_paddr_t, vm_size_t); +void pmap_bootstrap(vm_paddr_t, vm_size_t); int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode); void pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode); void pmap_kenter_device(vm_offset_t, vm_size_t, vm_paddr_t); diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index 105e17e679b7..637510db242e 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -99,7 +99,6 @@ ASSYM(TF_SCAUSE, offsetof(struct trapframe, tf_scause)); ASSYM(TF_SSTATUS, offsetof(struct trapframe, tf_sstatus)); ASSYM(RISCV_BOOTPARAMS_SIZE, sizeof(struct riscv_bootparams)); -ASSYM(RISCV_BOOTPARAMS_KERN_L1PT, offsetof(struct riscv_bootparams, kern_l1pt)); ASSYM(RISCV_BOOTPARAMS_KERN_PHYS, offsetof(struct riscv_bootparams, kern_phys)); ASSYM(RISCV_BOOTPARAMS_KERN_STACK, offsetof(struct riscv_bootparams, kern_stack)); diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 0d04bf0d3544..ffb29e53b88e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -567,7 +567,7 @@ initriscv(struct riscv_bootparams *rvbp) /* Bootstrap enough of pmap to enter the kernel proper */ kernlen = (lastaddr - KERNBASE); - pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); + pmap_bootstrap(rvbp->kern_phys, kernlen); physmem_init_kernel_globals(); diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8839a944de32..377d038a9a8a 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -797,7 +797,7 @@ pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, * Bootstrap the system enough to run with virtual memory. */ void -pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) +pmap_bootstrap(vm_paddr_t kernstart, vm_size_t kernlen) { vm_paddr_t freemempos, pa; vm_paddr_t root_pt_phys; @@ -806,7 +806,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) pt_entry_t *pte; int i; - printf("pmap_bootstrap %lx %lx %lx\n", l1pt, kernstart, kernlen); + printf("pmap_bootstrap %lx %lx\n", kernstart, kernlen); PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvchunk);