From nobody Thu Sep 4 17:41:43 2025 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 4cHmxg3m8Hz66TH0; Thu, 04 Sep 2025 17:41:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHmxg20Z6z3CYs; Thu, 04 Sep 2025 17:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757007703; 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=arveBWZQGN1op22xKyCJE882mzdr2ddsRzsAX/CCMGU=; b=trZGNP66z2DRWMr/QLQW6a92Oy8Zbhv0eJk5Xx881nYjrLMZZAy6vKVkNREbqHCgRvxfpx hF0INiKBYBVA2wkcPVqbYvSwfDgbhjNzcWYb1kHCHaAgb58xnLZ+LPHrTJ11mCnEQKlwA3 XXn45o7lYFJ4UTqAKyS49Iplar68oCKOH4fBU3HPPWLg3ljQ4L0X0MpEmkj0obMyYDPys+ EEeH0j6Nx9mYDdATmHkzIHySo+CZUHcRp071+msF6gC+xY4NDIJzCxedzXsT7epVCxGXqp MM1/qWJVC45aR1yePY4sz7lABhdQO8SUTaMGKdNf7RJqc71Aaq/EY1KQzLeLSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757007703; 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=arveBWZQGN1op22xKyCJE882mzdr2ddsRzsAX/CCMGU=; b=LmqrVsLYHWMF+ge3T9fcuZYRNH4lenpySB1a8lKDZqzCczxIWgHnLYxazF1b1OVRSkQ4My EdCBHIRCJPPP90IBxotb0or+eFXa7YruAodlRtn/uZDaEEAP3NLUCGVETJQO+wnOqWpB4e LaKwmi7sj9Ezgu0udJwiZn9CDvbaKIM7yrV0B2S9Bu3jrm9YZb9s57EIy0nUSH+Ri4iSWs P9toobvT8JMCA9smc5ZcH+7jmcluIGTpnYZ5xNssiXm8GLZfAx7zfEdCMlLmKTV0e+aN9h p61kMOBBqk57VczhfhQ4RhG1cpfBbCIdmZ5RAgUdBvaHo08ofU5d4Si4177flA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757007703; a=rsa-sha256; cv=none; b=efgFi0o+8MPhFJZcu3MwAA0AzQPYsbGfTrM1mOIOKtJm/rB21ZFjJkjqfgX+DJzkGDrCpF dmZxUUT69fiHiBbALdEPeE6wT3TMLjXBc1tocZIzX+u8OMz/QvfRc0r0hg5sNEgJ2bNGOh v/XKkfDSC5ADkZhz6I6/FbRjfwgnAT7N7cvJ0g299FOafLsRV7hAmhjFPDhs5JSnj9a+iF RPAUAH0WW6kwKWrt+E+qwbxyQ6kg6bAeFw3ID89OZlbFQPCsVNcUEdJai243uc7WedIBis Q8ILOlMwj0JQZ6DKiZgALFQMC2Cz3sSi5y3svmFymjGV2VsGBwB5Pv4qd0pQSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cHmxg1KQlz1BXT; Thu, 04 Sep 2025 17:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584HfhwC074122; Thu, 4 Sep 2025 17:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584Hfh3h074119; Thu, 4 Sep 2025 17:41:43 GMT (envelope-from git) Date: Thu, 4 Sep 2025 17:41:43 GMT Message-Id: <202509041741.584Hfh3h074119@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: fa23bfb425d5 - main - arm64: Replace cpu_tlb_flushID in initarm 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa23bfb425d53a87064d86ec9ae0ae5e31aa5d5b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fa23bfb425d53a87064d86ec9ae0ae5e31aa5d5b commit fa23bfb425d53a87064d86ec9ae0ae5e31aa5d5b Author: Andrew Turner AuthorDate: 2025-09-04 17:24:30 +0000 Commit: Andrew Turner CommitDate: 2025-09-04 17:24:30 +0000 arm64: Replace cpu_tlb_flushID in initarm Replace cpu_tlb_flushID with pmap_s1_invalidate_all_kernel in initarm. They are identical in the SMP case. Reviewed by: alc Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52184 --- sys/arm64/arm64/machdep.c | 2 +- sys/arm64/arm64/pmap.c | 4 +--- sys/arm64/include/pmap.h | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 627b02e82d34..47c701e8588c 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -858,7 +858,7 @@ initarm(struct arm64_bootparams *abp) cninit(); set_ttbr0(abp->kern_ttbr0); - cpu_tlb_flushID(); + pmap_s1_invalidate_all_kernel(); if (!valid) panic("Invalid bus configuration: %s", diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index af156727d9d2..0c359c6eea01 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -201,8 +201,6 @@ __exclusive_cache_line static struct pmap_large_md_page pv_dummy_large; #define pv_dummy pv_dummy_large.pv_page __read_mostly static struct pmap_large_md_page *pv_table; -static __inline void pmap_s1_invalidate_all_kernel(void); - static struct pmap_large_md_page * _pa_to_pmdp(vm_paddr_t pa) { @@ -1963,7 +1961,7 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pmap_s2_invalidate_range(pmap, sva, eva, final_only); } -static __inline void +void pmap_s1_invalidate_all_kernel(void) { dsb(ishst); diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 357c1a0d8232..406b6e2c5e0a 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -175,6 +175,8 @@ int pmap_fault(pmap_t, uint64_t, uint64_t); struct pcb *pmap_switch(struct thread *); +void pmap_s1_invalidate_all_kernel(void); + extern void (*pmap_clean_stage2_tlbi)(void); extern void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t, bool);