From nobody Tue Dec 17 11:20:13 2024 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 4YCDqx4w8Sz5h5JQ; Tue, 17 Dec 2024 11:20:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YCDqx445Bz4TxQ; Tue, 17 Dec 2024 11:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734434413; 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=NZ5VzI6vx6cXxLvDO7fWMms5UOx4u7NapzDV28H3TYs=; b=hSVqBaXLpCfM3etz5Oi44z8VWbMxTvTJSkKElB96rJRbAYggx4awI9iTucTTpcLpirETqy f2sWZZj9+OE7oXHnJ9QohRPnR0TFHjd7jcMKX+Uovagxu0xGUu7+nnlBf3oFv7U4St4590 Eqh9nobl5oq3hBkH8vFMogtlAzz86LOWT9d+1cyab4tETgG2SjR6VSB2UKqDsnJfaTtakH eZ+kN/S4GFSom2tTsXAnOOXQ9HI/ZWTkpit0YFcwyWOkQST2AWbsVzFwvQlk3Dghl+PPXI /ZbGv485qwcYvGSTNHzZnSzTGoDfYA5bcs2KmM1yih7EvRuo9lptf9kDxLdpfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734434413; 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=NZ5VzI6vx6cXxLvDO7fWMms5UOx4u7NapzDV28H3TYs=; b=s212kJuSctyH0Pz7BcED8yGvwqQE7wU3YMYV/znzv/SGJtLnlYSAK97hNiQ5A5yVka4Hyl OLV13e4Vq/GrD/stk/eRP+zSNpkedOxOmAcBXKKL9Lw08oQIpChTv8u1l6J7uyf/j0vGv8 DMi+sEcyhFKFzPvgqj+36YFY8WO3Q2ESboMAcfIb87KEmeXMEDD1lbZ+gZxhS92YtL+cnq x5Y3ZHve9Mgi6LgCODwf1SNefjA10xhVg9JbklN6bSJ89HJB8vDWvUxGWXq+uQ1SerCSG0 +uanZrP6PfXL9gZI8eVshZI8PoTWYWWy1xrA5NRp4h69jd2BvlLjf0+yxTpI1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734434413; a=rsa-sha256; cv=none; b=Be+gi5KUrgMU4/BuhkYTIQFGgl9fKDkQET4vFz3mrrG90Ac5Fzm7F7/O+0p5Z/3MaWmxnj GgxwrSZwUavUIECjmiazVRp2nuKRpQG47JpHCVsq6Ne8473TMdbAHkl/M8AExCYziAuEOH 1D4JUvMChGZfM3Oe8nG3yTK9GLWs46IuF1wrtIBcBQq9t58XPbVnkHbYQt4HtTtyPuonC5 0UQk3eUPZsNPkFXSA6iytJTi+8fsfNLD6xGAgJoabzQKGapjww6Gipu2ZY8GMn0sXJqqXw U55H52d6tiabc804Fr6t3pQfIjXq8RU6bFz54zF75/RXxXpCHkygf2YzPWOALg== 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 4YCDqx35NXzL0S; Tue, 17 Dec 2024 11:20:13 +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 4BHBKDj6062025; Tue, 17 Dec 2024 11:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BHBKDeO062020; Tue, 17 Dec 2024 11:20:13 GMT (envelope-from git) Date: Tue, 17 Dec 2024 11:20:13 GMT Message-Id: <202412171120.4BHBKDeO062020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: a7bf553d175a - main - riscv vmm: add SSTC extension check. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7bf553d175a27b03cbad7d0f94e40991df2958b Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=a7bf553d175a27b03cbad7d0f94e40991df2958b commit a7bf553d175a27b03cbad7d0f94e40991df2958b Author: Ruslan Bukin AuthorDate: 2024-12-17 10:35:24 +0000 Commit: Ruslan Bukin CommitDate: 2024-12-17 10:35:44 +0000 riscv vmm: add SSTC extension check. Check if RISC-V SSTC is available and advertise to the guest. This is needed for Eswin EIC7700 that does not include SSTC. As we don't have a mechanism for reporting extension presence from the kernel to userspace, then use vm_cap_type for now. Reviewed by: mhorne, markj Differential Revision: https://reviews.freebsd.org/D48058 --- lib/libvmmapi/riscv/vmmapi_machdep.c | 1 + sys/riscv/include/vmm.h | 1 + sys/riscv/vmm/vmm_riscv.c | 4 ++++ usr.sbin/bhyve/riscv/bhyverun_machdep.c | 9 ++++++++- usr.sbin/bhyve/riscv/fdt.c | 17 +++++++++-------- usr.sbin/bhyve/riscv/fdt.h | 2 +- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/libvmmapi/riscv/vmmapi_machdep.c b/lib/libvmmapi/riscv/vmmapi_machdep.c index 9c70185942c9..4da2fb909f61 100644 --- a/lib/libvmmapi/riscv/vmmapi_machdep.c +++ b/lib/libvmmapi/riscv/vmmapi_machdep.c @@ -40,6 +40,7 @@ #include "internal.h" const char *vm_capstrmap[] = { + [VM_CAP_SSTC] = "sstc", [VM_CAP_MAX] = NULL, }; diff --git a/sys/riscv/include/vmm.h b/sys/riscv/include/vmm.h index 1093e1cd0096..6c027f50e97a 100644 --- a/sys/riscv/include/vmm.h +++ b/sys/riscv/include/vmm.h @@ -275,6 +275,7 @@ struct vre { */ enum vm_cap_type { VM_CAP_UNRESTRICTED_GUEST, + VM_CAP_SSTC, VM_CAP_MAX }; diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c index 6a76f8cf4f26..e276f8583e37 100644 --- a/sys/riscv/vmm/vmm_riscv.c +++ b/sys/riscv/vmm/vmm_riscv.c @@ -903,6 +903,10 @@ vmmops_getcap(void *vcpui, int num, int *retval) ret = ENOENT; switch (num) { + case VM_CAP_SSTC: + *retval = has_sstc; + ret = 0; + break; case VM_CAP_UNRESTRICTED_GUEST: *retval = 1; ret = 0; diff --git a/usr.sbin/bhyve/riscv/bhyverun_machdep.c b/usr.sbin/bhyve/riscv/bhyverun_machdep.c index 39d6a7cdf231..d06b517a6624 100644 --- a/usr.sbin/bhyve/riscv/bhyverun_machdep.c +++ b/usr.sbin/bhyve/riscv/bhyverun_machdep.c @@ -308,6 +308,8 @@ bhyve_init_platform(struct vmctx *ctx, struct vcpu *bsp) int error; int pcie_intrs[4] = {PCIE_INTA, PCIE_INTB, PCIE_INTC, PCIE_INTD}; vm_paddr_t fdt_gpa; + char isa[32]; + int retval; bootrom = get_config_value("bootrom"); if (bootrom == NULL) { @@ -321,8 +323,13 @@ bhyve_init_platform(struct vmctx *ctx, struct vcpu *bsp) return (error); } + error = vm_get_capability(bsp, VM_CAP_SSTC, &retval); + assert(error == 0); + snprintf(isa, sizeof(isa), "%s%s", "rv64imafdc", + retval == 1 ? "_sstc" : ""); + fdt_gpa = vm_get_highmem_base(ctx) + roundup2(len, FDT_DTB_ALIGN); - error = fdt_init(ctx, guest_ncpus, fdt_gpa, FDT_SIZE); + error = fdt_init(ctx, guest_ncpus, fdt_gpa, FDT_SIZE, isa); if (error != 0) return (error); diff --git a/usr.sbin/bhyve/riscv/fdt.c b/usr.sbin/bhyve/riscv/fdt.c index 54b75c68ea76..bef3f64b0c64 100644 --- a/usr.sbin/bhyve/riscv/fdt.c +++ b/usr.sbin/bhyve/riscv/fdt.c @@ -84,7 +84,7 @@ set_single_reg(void *fdt, uint64_t start, uint64_t len) } static void -add_cpu(void *fdt, int cpuid) +add_cpu(void *fdt, int cpuid, const char *isa) { char node_name[16]; @@ -94,7 +94,7 @@ add_cpu(void *fdt, int cpuid) fdt_property_string(fdt, "device_type", "cpu"); fdt_property_string(fdt, "compatible", "riscv"); fdt_property_u32(fdt, "reg", cpuid); - fdt_property_string(fdt, "riscv,isa", "rv64imafdc_sstc"); + fdt_property_string(fdt, "riscv,isa", isa); fdt_property_string(fdt, "mmu-type", "riscv,sv39"); fdt_property_string(fdt, "clock-frequency", "1000000000"); @@ -110,7 +110,7 @@ add_cpu(void *fdt, int cpuid) } static void -add_cpus(void *fdt, int ncpu) +add_cpus(void *fdt, int ncpu, const char *isa) { int cpuid; @@ -120,14 +120,15 @@ add_cpus(void *fdt, int ncpu) fdt_property_u32(fdt, "#size-cells", 0); fdt_property_u32(fdt, "timebase-frequency", 10000000); - for (cpuid = 0; cpuid < ncpu; cpuid++) { - add_cpu(fdt, cpuid); - } + for (cpuid = 0; cpuid < ncpu; cpuid++) + add_cpu(fdt, cpuid, isa); + fdt_end_node(fdt); } int -fdt_init(struct vmctx *ctx, int ncpu, vm_paddr_t fdtaddr, vm_size_t fdtsize) +fdt_init(struct vmctx *ctx, int ncpu, vm_paddr_t fdtaddr, vm_size_t fdtsize, + const char *isa) { void *fdt; const char *bootargs; @@ -162,7 +163,7 @@ fdt_init(struct vmctx *ctx, int ncpu, vm_paddr_t fdtaddr, vm_size_t fdtsize) set_single_reg(fdt, vm_get_highmem_base(ctx), vm_get_highmem_size(ctx)); fdt_end_node(fdt); - add_cpus(fdt, ncpu); + add_cpus(fdt, ncpu, isa); /* Finalized by fdt_finalized(). */ fdtroot = fdt; diff --git a/usr.sbin/bhyve/riscv/fdt.h b/usr.sbin/bhyve/riscv/fdt.h index 9bebe6ffa29d..60140a82a211 100644 --- a/usr.sbin/bhyve/riscv/fdt.h +++ b/usr.sbin/bhyve/riscv/fdt.h @@ -36,7 +36,7 @@ struct vmctx; int fdt_init(struct vmctx *ctx, int ncpu, vm_paddr_t addrp, - vm_size_t size); + vm_size_t size, const char *isa); void fdt_add_aplic(uint64_t dist_base, uint64_t dist_size); void fdt_add_pcie(int intrs[static 4]); void fdt_add_uart(uint64_t uart_base, uint64_t uart_size, int intr);