From nobody Thu Apr 30 14:19:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751627819; cv=none; d=zohomail.com; s=zohoarc; b=JdPVF+AnNEZNC6pyz6QLCxLshzwKUlGdlynNVDWCDn7DSLczoJ49q5jIsIKx4S3PJh5EfZsVQESBW0yoa3U45qOLDApkDPHCdtenqXtir7ZzD3SsYbP32ojjm6w1H8YmCqWVbkyrTcY88llGb7vRB8xFiB5kQ15m1s7ZHiJ7xOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751627819; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=J/vCSMayWpkoFy9ut76DThDk/F2uNDNmhi4+LEdhx9c=; b=PIzmoRBATR3+MjRL3y1I818KGf6KxyCRV1rdnHaUDL8RfoXV7M5/N5lHyuCHfizZ5Mq01mrY+JAPF8ZC3qbnD+SowreE9q/bJ948RvAPbe7h7i+r0toCDi8dlLfAPbeGF1CWv/oWR8+G/ZeICIEk/44RKcSpVzsKJjBMHOb8Rp4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751627819109365.08881525388756; Fri, 4 Jul 2025 04:16:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXeMs-0004Go-Ri; Fri, 04 Jul 2025 07:14:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXeM6-0002fv-1E for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:13:24 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXeM1-0003JZ-DN for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:13:21 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b3508961d43so616662a12.3 for ; Fri, 04 Jul 2025 04:13:17 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c8431a206sm18002655ad.28.2025.07.04.04.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 04:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751627596; x=1752232396; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J/vCSMayWpkoFy9ut76DThDk/F2uNDNmhi4+LEdhx9c=; b=S8Qq93RzlDHXwIorvUvXlpNGhVNneKcoj/lte1aY5kz1Hu/igFYx85DDIICENRZaCG Kaq+sutj4QLaPCM/JhuF4EjhRD9t+14kNzcNFqFKao2Z7txjA/WasFgpYy1vB4fVjsP2 VLnYean+TMBBaOVrPvIoJiKskWIq/wkxHaJiCZE+LngPe4Hyh8rlFV5/Cuv3jScstrsR 9TKrPiztV3+bcY0oj0npzOnW6/jJ6HnPray2if5YjW3IgRpueBne7VlnIIceUEKrlBLS YLun2I6nSQv85oStN28o14W8GWw2Cf2Lq1IFyFMQ10KY598OzKTMAmXYsAUG8DbXlPmR m5lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751627596; x=1752232396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J/vCSMayWpkoFy9ut76DThDk/F2uNDNmhi4+LEdhx9c=; b=fa7x9xmS4k/1lG7q3E2J9RRw3jxCYYhIU0K+vOvpr2eSHpn7u1ukCxDVmTF+xDnzZv e4b4fxmdEaXq/8lUor5eA2xFauMTclef2TMlOM25NhvUQr/gl2I62Fak7bC4e5m+jGw2 rb8eltgf37z0SboHSGJyuvbjP/Y8Lesk2prC8AsZ6Kxuy0tHCCcHHB/6pWEsxH+S9kov oNeb6rXhEI5+bx1j6/HRQSSEfkitG3c3Tcrw/+Sg5gIuus+vCzA2gTLUYKI4kDwJJV6h GDXZNWcpzrnCPSi9ZJlFVrmwV+rLZnG3VKGszOXsqUJyKRWpNpE+lbXzs41VYvnV+H3b ZXRw== X-Gm-Message-State: AOJu0YzDu1wjcahA2nE5ptJ+HV4YSB3LSYgtvcvhWGVX5T/eh0c4xfrR O9xsB54pYImWUphmNsiraett2iTERQXb8xkN3Ffj/D3lBobiyfJ4CgfwM8jOwQ== X-Gm-Gg: ASbGnctwj7WQHvlRWk3FadL6Q7/WDukHcUMgCGVMcf412Q81VZ1/VMVAxLY3MSokofe xtjIIohzPZDMsDe7QIjld2jlz83kB7EX37BZ026r20FMbLVwinT6GgRykqrh7bbPBFxV+7407Wa f0V00lheN7d6GlvHzJ8Aat9/8hkyhAuJMvoJ7wQ7Yjg5WlkkkDBL3DlaGWjnSKpe7wK7m1nSwek UJw49BW4JhFFOolQ/kYbMZex9wKHmrdtpjkPgRE9/0N1I2H+nuvnHOEaIqijSsea9TxXy7ticCC jYIEpfuQ0Pz8PUXpGlkzRxPGoZlUjsRPeG7AES6jAUPEMOvCtJrLoeFiNLq3u7XVbZFqlD9FUaZ Hhb94pDJ/+a6qvY9spK9iABPP8LQi/J+TFtyIIArcc2AI2l4hoUpp70/WJhnObjTfQW7ae2MxDu YL5g== X-Google-Smtp-Source: AGHT+IHgK7606OSktMcXJpFV2/VAxRbMpvTAL/Tn8c965cMn3PW0NFj+y1xuWwsvoVcv0omwqwvbew== X-Received: by 2002:a17:90b:2707:b0:312:e9bd:5d37 with SMTP id 98e67ed59e1d1-31aac43d215mr3144670a91.6.1751627595697; Fri, 04 Jul 2025 04:13:15 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Meng Zhuo , Andrew Jones , Alistair Francis Subject: [PULL 15/40] target/riscv/kvm: add max_satp_mode from host cpu Date: Fri, 4 Jul 2025 21:11:42 +1000 Message-ID: <20250704111207.591994-16-alistair.francis@wdc.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704111207.591994-1-alistair.francis@wdc.com> References: <20250704111207.591994-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=alistair23@gmail.com; helo=mail-pg1-x534.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751627820903116600 Content-Type: text/plain; charset="utf-8" From: Meng Zhuo This patch adds max_satp_mode from host kvm cpu setting. Tested on: Milkv Megrez (Eswin 7700x) Reviewed-by: Andrew Jones Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2931 Signed-off-by: Meng Zhuo Message-ID: <20250606034250.181707-1-mengzhuo@iscas.ac.cn> Signed-off-by: Alistair Francis --- target/riscv/kvm/kvm-cpu.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index e1a04be20f..502d33f404 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -999,6 +999,19 @@ static void kvm_riscv_destroy_scratch_vcpu(KVMScratchC= PU *scratch) close(scratch->kvmfd); } =20 +static void kvm_riscv_init_max_satp_mode(RISCVCPU *cpu, KVMScratchCPU *kvm= cpu) +{ + struct kvm_one_reg reg; + int ret; + + reg.id =3D RISCV_CONFIG_REG(satp_mode); + reg.addr =3D (uint64_t)&cpu->cfg.max_satp_mode; + ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); + if (ret !=3D 0) { + error_report("Unable to retrieve satp mode from host, error %d", r= et); + } +} + static void kvm_riscv_init_machine_ids(RISCVCPU *cpu, KVMScratchCPU *kvmcp= u) { struct kvm_one_reg reg; @@ -1302,6 +1315,7 @@ static void riscv_init_kvm_registers(Object *cpu_obj) kvm_riscv_init_machine_ids(cpu, &kvmcpu); kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu); kvm_riscv_init_cfg(cpu, &kvmcpu); + kvm_riscv_init_max_satp_mode(cpu, &kvmcpu); =20 kvm_riscv_destroy_scratch_vcpu(&kvmcpu); } @@ -1985,7 +1999,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **err= p) } } =20 - return true; + return true; } =20 void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, Error **errp) --=20 2.50.0