From nobody Thu Mar 10 18:17:20 2022 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 2608F1A0092F; Thu, 10 Mar 2022 18:17:21 +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 4KDy2n0V9gz4gtK; Thu, 10 Mar 2022 18:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646936241; 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=YLMUQct62Lje9cC46qwcS09RxAR1AJjd3xK0NxyW+B0=; b=WQLd5wC3aZw9UEz3RMcLbLFZyVh6WIHDV3jlRKLeASoYFitsMt3aUk9wd5dTleHQ57MZdE 9ZbiN8FW4la7pFul7M6RYb7umMF8ybf6ZzClbcA7HbdQJCfR+vLJv/QSw8PbV1A3Iz+cK9 OiPmaYApUWLe79HjXTkgoWmdNW0CCEDx5iAmtZGyW1KvCtdrAMStNnoyIWT6Am6MUPbH7H j5m9Nvb+C09Ep2FyPPXcVWUkKu1Rz0OojQDYrujXaWnAzwdU79xPoljxhLl59pCQxctETh GGbNNJdZDTqnMPAPBiiF5XDY8ovAw2jvBokuScsf5hXku9u5ueidCMRSNKfOMQ== 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 E52F11D37; Thu, 10 Mar 2022 18:17:20 +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 22AIHKqD084682; Thu, 10 Mar 2022 18:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AIHKJZ084681; Thu, 10 Mar 2022 18:17:20 GMT (envelope-from git) Date: Thu, 10 Mar 2022 18:17:20 GMT Message-Id: <202203101817.22AIHKJZ084681@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: 854d5a4f7277 - main - Remove l1ptfrom pmap_early_vtophys on arm64 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 854d5a4f7277fcd32b8c92d552cd93d208f5fc64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646936241; 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=YLMUQct62Lje9cC46qwcS09RxAR1AJjd3xK0NxyW+B0=; b=R46d7+iyfdfnExt9dvlRSLgWLggsjy24S3nFTrUpnUdfwMEmbyi8BquEDw8oRdbQTBNwfo 8dl8z1xcLDuXeJ+ycWns6n/3OVGtbNJT1zGc2KVrupyARyAHcHhWKlVW/shayPn7W+NPQH RXFJTI7Mmtvzdt3ZW+/8imgvMzGJX6WoCTXrrLGtfJ2xrtjmoQhfKzzssw0lGA/Q/YdJTg uwCWvQt5LRMYzc9bBAEsDkWxkMzSfEp+HFnR8qFOV8yEyAdi8edWA5F7glsmZ22WDIaDFE J0pr7+GdKtJXyNZKPW0MLz3eID9YI85WAAaaE9lv5RxA6+bhhlp48hW/GLMK1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646936241; a=rsa-sha256; cv=none; b=MteTdL9fZwcRqPSN0bkMbynIYNu3MqX/EwkxTvPlnRLA3zDRfCT6OrVaRf9AhFryTfPwiB JzARezaiJZzl/P4Qizdpx3k1KLTSTb8vcyVNJ/R5tcyuO0Dfx+3hWJiAXK1YxyxymvKZFn BWe0G9+hpOSfv5l22Ed86wOUb0jWR2kz1/cmqouMSGnHH/FRY5SAzzdKbB6wKLYjaRx4om d5e2QbkwCatM3R8k1H8CHLrOL+zZZgrjJnhOKtdPrtPxUSdITOJYriV3TA/pLyQd2XtGV0 IoACOfqDsG7YR+nzvGaGlBYN95t+SDrAuArrFOXz1S9qz1qyXzFQcfhg/a7zHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=854d5a4f7277fcd32b8c92d552cd93d208f5fc64 commit 854d5a4f7277fcd32b8c92d552cd93d208f5fc64 Author: Andrew Turner AuthorDate: 2022-03-10 18:10:40 +0000 Commit: Andrew Turner CommitDate: 2022-03-10 18:17: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 --- 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 680c3682d3fc..e3e6f9036dc2 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -795,7 +795,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; @@ -832,8 +832,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], @@ -880,8 +879,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], @@ -930,7 +928,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; @@ -960,7 +958,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; @@ -1063,7 +1061,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);