From nobody Mon Apr 4 11:06:03 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 1FF3B1A9729A; Mon, 4 Apr 2022 11:06:05 +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 4KX7Hc3KXCz3NX2; Mon, 4 Apr 2022 11:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070364; 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=u9Prq8kgJpJ0NKrLRWu3yCtxuP6EelGH1fKA6o8mwac=; b=CzpF3/5/MKX5zvdGneO/256hVMzyLFGv2OIPpLgOHsMR2RvFzISIFO0TdXiEGD7SQr+aRS 67s+tOCh19E3i6YcT/mcXf+13AI7r73PaE/j78xe2f4jsfQbiy1szqXqTwm5Mc+iEBwUtH 0zqIpkDJkId9UOwC4sYOWuL2adpxLLXVtuSI7zrqQSh2aiuwWQL39nZhLMZ2MyWK+OIZ1G 8mdLSDs/rEI/Hshgn0RfgMNKMS6SwwL96hvFInKKNp+QVxeBgK2cN5ARiTIuQ2FLpBDMsJ PZS7A80GK3ZKFIAWS9e2C4YBESYWxDAvTm87ZhJ27P4/MjSN/sMVmd1qmvCTdw== 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 D7E3210B3A; Mon, 4 Apr 2022 11:06:03 +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 234B63BC086572; Mon, 4 Apr 2022 11:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B634t086571; Mon, 4 Apr 2022 11:06:03 GMT (envelope-from git) Date: Mon, 4 Apr 2022 11:06:03 GMT Message-Id: <202204041106.234B634t086571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: df24ac386cb2 - stable/13 - Remove l1ptfrom pmap_early_vtophys on arm64 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: df24ac386cb237d94d9b2635dbca45a6653ee54e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070364; 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=u9Prq8kgJpJ0NKrLRWu3yCtxuP6EelGH1fKA6o8mwac=; b=Hwm8xczf1wIvvwXlRffyCgHMcT/TbaBtrkwkFHKCC7HFRb7pIHuN1nI3bC1+fE1sh5q5uR DeI5BEm3WpOqOACVKx9pTwkMmq1//72pZhLcAs/C/q8UgXD6wha9xUVB/1LxtuBgv9lq+B 4CPzQGNLeDFAui6fuTCzEjA66d/13pOq3W0BZ6vcX8/i4JFSPa7TuStV/NGCGwiKvjq8M5 1vPpnezQBzfFaz6GA27VWUyDivzmre0wcy0cPzo/Id1FrKMCYABNQ0Gyp1RkUYHv0Cfavg CZ8wWJNiyPaYPQzscRPBdayugZ3+5FSZMzcwQgAOfjouz4u3LUEB5tK23RvVlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070364; a=rsa-sha256; cv=none; b=XaEhYuXex9lO2/yfe1uLdIZdpwaavBJIAp0W7MseoYjnr9rc1Mlhpfsb0qo31QgaJtrRjF 1cR0J//rPzChxoEMZOqF8kPF/DT67TNISep6fkePgTzJ+w18dy3zl9XPWHhp1gUn7UydOV VbYQeTjPFR5nLifUDWULZoU6Kpa3cEz3+b+bpnoqas3Q1Lq5iDHt/uQSoG9z9SbTBoeTZG nloxnv5T6dAqu317h2GpI0oRE9058MvkxSe2mmPMsjZK6bVoCKBhBlMlHP0GFkV9rRvgdO QafpGw7LU0Ps/r/Bry8t8iOIjgvj+lh1v0rD8vxyq+R8GleG0+qACwnF4bTO2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=df24ac386cb237d94d9b2635dbca45a6653ee54e commit df24ac386cb237d94d9b2635dbca45a6653ee54e Author: Andrew Turner AuthorDate: 2022-03-10 18:10:40 +0000 Commit: Andrew Turner CommitDate: 2022-04-04 09:37:06 +0000 Remove l1ptfrom pmap_early_vtophys on arm64 The first argument was unused as we use an address translation instruction to get the physical address. Sponsored by: The FreeBSD Foundation (cherry picked from commit 854d5a4f7277fcd32b8c92d552cd93d208f5fc64) --- sys/arm64/arm64/pmap.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 0183dde11847..a7e5cb9186ca 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -753,7 +753,7 @@ pmap_resident_count_dec(pmap_t pmap, int count) } static vm_paddr_t -pmap_early_vtophys(vm_offset_t l1pt, vm_offset_t va) +pmap_early_vtophys(vm_offset_t va) { vm_paddr_t pa_page; @@ -790,8 +790,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, if (l1_slot != prev_l1_slot) { prev_l1_slot = l1_slot; l2 = (pt_entry_t *)freemempos; - l2_pa = pmap_early_vtophys(kern_l1, - (vm_offset_t)l2); + l2_pa = pmap_early_vtophys((vm_offset_t)l2); freemempos += PAGE_SIZE; pmap_store(&pagetable_dmap[l1_slot], @@ -838,8 +837,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, if (l1_slot != prev_l1_slot) { prev_l1_slot = l1_slot; l2 = (pt_entry_t *)freemempos; - l2_pa = pmap_early_vtophys(kern_l1, - (vm_offset_t)l2); + l2_pa = pmap_early_vtophys((vm_offset_t)l2); freemempos += PAGE_SIZE; pmap_store(&pagetable_dmap[l1_slot], @@ -888,7 +886,7 @@ pmap_bootstrap_l2(vm_offset_t l1pt, vm_offset_t va, vm_offset_t l2_start) for (; va < VM_MAX_KERNEL_ADDRESS; l1_slot++, va += L1_SIZE) { KASSERT(l1_slot < Ln_ENTRIES, ("Invalid L1 index")); - pa = pmap_early_vtophys(l1pt, l2pt); + pa = pmap_early_vtophys(l2pt); pmap_store(&l1[l1_slot], (pa & ~Ln_TABLE_MASK) | L1_TABLE); l2pt += PAGE_SIZE; @@ -918,7 +916,7 @@ pmap_bootstrap_l3(vm_offset_t l1pt, vm_offset_t va, vm_offset_t l3_start) for (; va < VM_MAX_KERNEL_ADDRESS; l2_slot++, va += L2_SIZE) { KASSERT(l2_slot < Ln_ENTRIES, ("Invalid L2 index")); - pa = pmap_early_vtophys(l1pt, l3pt); + pa = pmap_early_vtophys(l3pt); pmap_store(&l2[l2_slot], (pa & ~Ln_TABLE_MASK) | ATTR_S1_UXN | L2_TABLE); l3pt += PAGE_SIZE; @@ -1021,7 +1019,7 @@ pmap_bootstrap(vm_offset_t l0pt, vm_offset_t l1pt, vm_paddr_t kernstart, virtual_end = VM_MAX_KERNEL_ADDRESS - (PMAP_MAPDEV_EARLY_SIZE); kernel_vm_end = virtual_avail; - pa = pmap_early_vtophys(l1pt, freemempos); + pa = pmap_early_vtophys(freemempos); physmem_exclude_region(start_pa, pa - start_pa, EXFLAG_NOALLOC);