From nobody Mon Aug 10 16:01:43 2026 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 4hJfdT1Dvnz6p02N for ; Mon, 10 Aug 2026 16:01:49 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJfdT0Q8Mz3ngT for ; Mon, 10 Aug 2026 16:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786377709; 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=/p26+ZzkDVH9y8trmafgxfQYN7WVzq0lfxZNvX32k8M=; b=vCJzs4qE/eBmH9WE5jaFLv9LFwwUNLB/vLo4B4hOrjlsd35a+a2DU3vMtUs3kdSX7o554J ypfisBWFvKJQWWlXM5OMcBzjXo42N1uij01Hr2ehx4RICnCtwEFZmQXUYXuu+wQDDfzifW kf2ZgakeIiHc6K4kpgt6DSrF/1TOTzkzfuzH95ds2ijfPkq2LCJU2/4jmHU0giC1qWMWIw oOuZm3nGUD1H4LntQ64G2wCfFsOsnJbaxeDB2DmIzOuYGRDL7u6eZ+alkOL+bWcAurRBwd MocFK4cLGlShWXiPXdj/hhl2qERkKbeJ/KD9lUfv+jZk5AO+XrajZMOlIFOqWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786377709; a=rsa-sha256; cv=none; b=AlNkhOa6Tg5H2kimEYVVPSr7Hx9sDG4w9fXNVd6926MRgaADpGQ4CDpJn92fCQXFBZEkxe D45fM+PQmD37kEi8EMHc0ZfTEJz+aQaJQx1fwW+7nQaJfdI5QKRAPzR9oLXyA1yANR8jWY HW9pmX3shfcjRRjGFSOmG26bYGtQ/Du5ocvlq15aNI/PGl/zG8w+DrSoXZ0h0J/7JR9HxM brt4DBTpLiCthBfqhBUSN+YfgCwhlVqLFwnHkXHTTo1IQL0BrGFI4D27yAfwpLVkfcHNoh LTSW4r1a8Fwr68oeUcqMTsY7qugi4gMGn7uLrSei9zBcB2bsBFZybHAHo92leg== 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=1786377709; 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=/p26+ZzkDVH9y8trmafgxfQYN7WVzq0lfxZNvX32k8M=; b=EgJHDPEgNXwIb8pDHdeROyYpO2FJpoCzmaYbPkHi3KZji5LVzNe4XeDzoczAkC94+gBmuM DxGLTbrujehYE8d3NPQ5V51t8IKFoQwHTfGmauxdzWzGvYY3DxnsV5khoScQTNLe+3HiDD CRGzViYOqx/AXHkLqA5XE3r+ny0lzAVR4Ad9iH5stlV2EkY8V0UuST1jMlBK/4FFnZHfWq 7XXcaCTUwu1k1ksBF7c6kxAv5YbAdBo45uvVQwL1pKJTD6x3k2BS2jh7LUGVqIVKveUqn+ pYVmGqZkltAh69iaZxRe84NRBjOv0E9g82Fu6WDGZ2dkaR1xNMXw1QvzrhVuRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJfdS5y7Xz1Tx for ; Mon, 10 Aug 2026 16:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 16:01:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: 4d2f90f5a694 - main - riscv: Add support for the Svinval extension 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d2f90f5a694b89240c494c01a5c07e24131f6f0 Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 16:01:43 +0000 Message-Id: <6a79f5e7.36e59.55d495c4@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=4d2f90f5a694b89240c494c01a5c07e24131f6f0 commit 4d2f90f5a694b89240c494c01a5c07e24131f6f0 Author: Bojan Novković AuthorDate: 2026-06-16 14:55:04 +0000 Commit: Bojan Novković CommitDate: 2026-08-10 16:00:00 +0000 riscv: Add support for the Svinval extension This change adds wrappers for the new fine-grained TLB invalidation instructions and extends the capability detection logic to include the Svinval extension, which is mandatory in the RVA23S64 profile. Event: BSDCan 2026 Differential Revision: https://reviews.freebsd.org/D57623 Reviewed by: mhorne, markj --- sys/conf/kern.mk | 2 +- sys/riscv/include/cpufunc.h | 28 ++++++++++++++++++++++++++++ sys/riscv/include/md_var.h | 1 + sys/riscv/riscv/identcpu.c | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index b87583db21c5..3c3442e63d31 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -166,7 +166,7 @@ INLINE_LIMIT?= 8000 # code model as "medium" and "medany" respectively. # .if ${MACHINE_CPUARCH} == "riscv" -CFLAGS+= -march=rv64imafdch_zifencei +CFLAGS+= -march=rv64imafdch_zifencei_svinval CFLAGS+= -mabi=lp64 CFLAGS.clang+= -mcmodel=medium CFLAGS.gcc+= -mcmodel=medany diff --git a/sys/riscv/include/cpufunc.h b/sys/riscv/include/cpufunc.h index e7bfeeb0cf59..40b1d0b95451 100644 --- a/sys/riscv/include/cpufunc.h +++ b/sys/riscv/include/cpufunc.h @@ -126,6 +126,34 @@ hfence_gvma(void) __asm __volatile("hfence.gvma" ::: "memory"); } +static __inline void +sfence_inval_ir(void) +{ + + __asm __volatile("sfence.inval.ir" ::: "memory"); +} + +static __inline void +sfence_w_inval(void) +{ + + __asm __volatile("sfence.w.inval" ::: "memory"); +} + +static __inline void +sinval_vma_page(uintptr_t addr) +{ + + __asm __volatile("sinval.vma %0, zero" :: "r" (addr) : "memory"); +} + +static __inline void +sinval_vma_page_asid(uintptr_t addr, uint64_t asid) +{ + + __asm __volatile("sinval.vma %0, %1" :: "r" (addr), "r" (asid) : "memory"); +} + #define rdcycle() csr_read64(cycle) #define rdtime() csr_read64(time) #define rdinstret() csr_read64(instret) diff --git a/sys/riscv/include/md_var.h b/sys/riscv/include/md_var.h index 5f921ed500bf..b47ef2f49fd4 100644 --- a/sys/riscv/include/md_var.h +++ b/sys/riscv/include/md_var.h @@ -47,6 +47,7 @@ extern bool has_sstc; extern bool has_sscofpmf; extern bool has_svpbmt; extern bool has_vector; +extern bool has_svinval; struct dumperinfo; struct minidumpstate; diff --git a/sys/riscv/riscv/identcpu.c b/sys/riscv/riscv/identcpu.c index 3b747576db48..ca1b2b9ae1af 100644 --- a/sys/riscv/riscv/identcpu.c +++ b/sys/riscv/riscv/identcpu.c @@ -79,6 +79,7 @@ bool has_vector; bool __read_frequently has_sstc; bool __read_frequently has_sscofpmf; bool has_svpbmt; +bool has_svinval; /* Z-extensions support. */ bool has_zicbom; @@ -478,6 +479,7 @@ update_global_capabilities(u_int cpu, struct cpu_desc *desc) UPDATE_CAP(has_sstc, (desc->smode_extensions & SV_SSTC) != 0); UPDATE_CAP(has_sscofpmf, (desc->smode_extensions & SV_SSCOFPMF) != 0); UPDATE_CAP(has_svpbmt, (desc->smode_extensions & SV_SVPBMT) != 0); + UPDATE_CAP(has_svinval, (desc->smode_extensions & SV_SVINVAL) != 0); /* Z extension support. */ UPDATE_CAP(has_zicbom, (desc->z_extensions & Z_ZICBOM) != 0);