From nobody Thu Jan 15 14:51:07 2026 X-Original-To: dev-commits-src-branches@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 4dsQsR3mtCz6P4Th for ; Thu, 15 Jan 2026 14:51:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsQsR229pz3JhD for ; Thu, 15 Jan 2026 14:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768488667; 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=n1lIu4f5S936os7yXqRjGr5JGUemOVwyHgm1xzQ3TCc=; b=tHJtT1v7sxJ7YVLmoGKYJJZwxl7tRrRCOQrvSnqB7w3ONY7W1UUVR2DGpKx1lbNkpbMbP5 wfc0RooxZBTATeMiZROcyUFg8VLXXrv8YZd1B8TXopEKjy94XN5ecz51Yda40s4ZoVi10o 6/kcP0tMsAKV+virvB7hu9cDd9gxXzPwGvCCFupOuaAl0/esoovx31BkfkBFKs34XLQtRm 2Ob7YmtSBGLH0MEYwMe2ytFc6ZQeE1d7SzHxOsixYyWWOw2uKkd5f43x9rz1f5s9rjUP8S It/ukuZlLpT/0emuhDDUxjxHCYe+MH2j4BFEBNb4Hupc34gY0viY/MNYjyZkrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768488667; 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=n1lIu4f5S936os7yXqRjGr5JGUemOVwyHgm1xzQ3TCc=; b=cpjlCjB4Ll3+UEGYy1YI9SRuQGOHunVNi1GB70K6qIfw4gO+ABTivDE9VW27hUU63Oh8tW +NXE/5uxcWwjgq7zpUVW91MD7Ee+Lqgf6yVT6STngkUGAytoYq55v2APoBxpPAqB3vGx3Z JBYJWdfQ97DMxCz0E6huyxJsLegJZRII0lg5bV22KLQ8dl2gDTXGGmTP8ae9mBMUJcxxeq ymauBnibyiqMfGduR0ZwZpeWejoaAnr1zzVHT6hL2E12rvt4dXtYlkRAQPYYbz2ILICCrO 2TXeelX6bzHxizL6bGd+OquCNQtQbFB2+MJa9C8Elvl0O5jme0cgzlvxpIhmLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768488667; a=rsa-sha256; cv=none; b=ko+cY8mc4ZMyWJERKd0pMSh2PncHaFBpxgubyq5h2HWHxfvNAMgec7OgQXdt0hj6cR0aut jg5o4tvLBVqstJiZcjNVGn/IcEzgLCFd6YrKb3/bCVUnZIRXdtT9Gr/n/DKW/iMxW2l56j 1GOaSstSHjYbU6bYWrKlClh5cQZtCEzKvxCbQqWOOhg3pTn66Vm0mUP71tA1pPi5MFIAZJ p0j1HynZbH1YWO2+aZtKzjNHpqDxPcmdQ1jBJPUXajjeR2SYxYmDK4orcsthGax/eUCp1w Z5PsLNNDEaKMDijOh+USH8cMK92xM5GNOSQg43lmURmMVozrLEemyIT6dBtJxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsQsR1R0QzYkt for ; Thu, 15 Jan 2026 14:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23801 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 14:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 972c4dc33bd7 - stable/14 - arm64: Replace cpu_tlb_flushID in initarm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 972c4dc33bd76495581f4067234ca73865d65e09 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 14:51:07 +0000 Message-Id: <6968fedb.23801.6af63e5@gitrepo.freebsd.org> The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=972c4dc33bd76495581f4067234ca73865d65e09 commit 972c4dc33bd76495581f4067234ca73865d65e09 Author: Andrew Turner AuthorDate: 2025-09-04 17:24:30 +0000 Commit: Andrew Turner CommitDate: 2026-01-14 21:14:15 +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 (cherry picked from commit fa23bfb425d53a87064d86ec9ae0ae5e31aa5d5b) --- 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 bf7b9ea810e4..7599e5301223 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -985,7 +985,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 b25c862b8ea3..f4b2e0d4e895 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -194,8 +194,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) { @@ -1730,7 +1728,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 a250b5a20420..5b5b4eb9f59b 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -166,6 +166,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_invalidate_vpipt_icache)(void); extern void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t,