From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0FAF0CA0EE4 for ; Wed, 20 Aug 2025 13:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zc4N7B6pPv/JpK4uFeJdJ2FKj3UOMyz0ZlPVzK829gY=; b=qKwIBX82ZqX6Cy xI3rBAyuALaysVsva3WTEygbiLzLl576bEhrB6KS5plahR0qx+mmc+zmnydBncFPgii78Gru1jKPw smGSKtx5rIvLQQ35z8ifQW1eqKL1NPWWq/aj/OQCtTiERkwl9Ds2dhZvunjAW0uI2GwvA3raczUMn EEGxiGm6yHGpj8FxONKLGPEJP3YCtOQki/G7K4oZNfXlI+vreZTUls5uaucrRRPA7u5wzhXmJLuyb 761nTx4tgKdkw0FyhI4dLs348nk1zDricfn85lbH/YIA54KdtyoIe0W6GVLe7Lfje9SMF7PKkJuIn ytPYVm6YO3Tidm5Lc4fQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uoiym-0000000DpMs-35qp; Wed, 20 Aug 2025 13:35:52 +0000 Received: from out30-118.freemail.mail.aliyun.com ([115.124.30.118]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uoiQ9-0000000DhCW-053v; Wed, 20 Aug 2025 13:00:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1755694801; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=3BJVOCM13LqwDm1dqz/wRNujuXc9x9YGPSojNZlkeNY=; b=qjuQEEYHWggO+V5sE0mYYBr6BU4nDJQUiEBqbefDY9Tr6FAohPoRJUb7GIK6vilrbija4uZ3frnAE1j1bLyBZk4/s1mKub1Q1gtH41iSdqfcCNeowFUlHTHa6NjW+aUFOSywBRgfLaOcbunBRXypodPCM0vpK1KIT9d6xJx0tJw= Received: from localhost.localdomain(mailfrom:fangyu.yu@linux.alibaba.com fp:SMTPD_---0WmCQaZW_1755694796 cluster:ay36) by smtp.aliyun-inc.com; Wed, 20 Aug 2025 20:59:56 +0800 From: fangyu.yu@linux.alibaba.com To: anup@brainfault.org, atish.patra@linux.dev, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr Cc: guoren@kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Fangyu Yu , Nutty Liu , Troy Mitchell Subject: [PATCH v3 1/2] RISC-V: KVM: Write hgatp register with valid mode bits Date: Wed, 20 Aug 2025 20:59:51 +0800 Message-Id: <20250820125952.71689-2-fangyu.yu@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250820125952.71689-1-fangyu.yu@linux.alibaba.com> References: <20250820125952.71689-1-fangyu.yu@linux.alibaba.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250820_060005_589750_02A60D13 X-CRM114-Status: UNSURE ( 7.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Fangyu Yu According to the RISC-V Privileged Architecture Spec, when MODE=Bare is selected,software must write zero to the remaining fields of hgatp. We have detected the valid mode supported by the HW before, So using a valid mode to detect how many vmid bits are supported. Fixes: fd7bb4a251df ("RISC-V: KVM: Implement VMID allocator") Reviewed-by: Nutty Liu Reviewed-by: Troy Mitchell Reviewed-by: Guo Ren Signed-off-by: Fangyu Yu --- arch/riscv/kvm/vmid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kvm/vmid.c b/arch/riscv/kvm/vmid.c index 3b426c800480..5f33625f4070 100644 --- a/arch/riscv/kvm/vmid.c +++ b/arch/riscv/kvm/vmid.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -28,7 +29,7 @@ void __init kvm_riscv_gstage_vmid_detect(void) /* Figure-out number of VMID bits in HW */ old = csr_read(CSR_HGATP); - csr_write(CSR_HGATP, old | HGATP_VMID); + csr_write(CSR_HGATP, (kvm_riscv_gstage_mode << HGATP_MODE_SHIFT) | HGATP_VMID); vmid_bits = csr_read(CSR_HGATP); vmid_bits = (vmid_bits & HGATP_VMID) >> HGATP_VMID_SHIFT; vmid_bits = fls_long(vmid_bits); -- 2.49.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv