From:   Anup Patel <anup.patel@wdc.com>
To:     Atish Patra <atishp@atishpatra.org>
Cc:     Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Anup Patel <anup@brainfault.org>,
        kvm-riscv@lists.infradead.org, kvm@vger.kernel.org,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
        Anup Patel <anup.patel@wdc.com>
Subject: [PATCH] RISC-V: KVM: Fix incorrect KVM_MAX_VCPUS value
Date:   Wed, 17 Nov 2021 11:32:41 +0530
Message-Id: <20211117060241.611391-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
WDCIPOUTBOUND: EOP-TRUE
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?A+690d9xDkrzcYC8OQhpkkdy94wJ4lxD12NRNnUvtWftUKTLkCZ7q8crf+xi?=
 =?us-ascii?Q?QF4998uFQ96Sgn7WsHXYoAM3Ok/JaYa4RkAJLIbY85MFp2P1S9C/2dZHuHgY?=
 =?us-ascii?Q?ZZPlLUbf67JhE2ODOBEyVG9saNeDwlEWwhhywDjRpG7iyNYOugh1g989afxw?=
 =?us-ascii?Q?jd8v+SUot4YH2l0Xnl9yqnl+Pl8pQ8PdKqvTiZsSBxgaTgxg3zUZzwbnFSqr?=
 =?us-ascii?Q?rEUY6JE4MB2+uCkOMBQjbIgqJJuWTFIJRiR2r9usCREXJA7fGJUtlpyQtLmo?=
 =?us-ascii?Q?52myXNk01lKLXfUyrvBc0eWMJGdVB1RwI3vKeZMpjX6Q8ntUQUOhoonpYDdP?=
 =?us-ascii?Q?fpGY7MtnLXOvbHhUUMeTUggK6aTXPSH8UV24F1YJu1WOnf5rpQhoQO8o1uO5?=
 =?us-ascii?Q?g4JDC+/JjiItvajKwZnBdwosebh1K73YywXrMcExtYQDxtMsxME56QN6mayF?=
 =?us-ascii?Q?9wMGUSgY2RRwZfphRm6M4uKFljOdnqwbqPrzGFzz2gpB6f68SzaubkP42gZf?=
 =?us-ascii?Q?60sHwDH49MkeBxD59Ji1GkL9Hy6zD68ApLHRnTpXBH9M7QJ8/huMYTH13taY?=
 =?us-ascii?Q?p8YpVkjXnNloC/IDThCLO5Or1SqzCPIl3885dcIG64iq+JKO69QiaiSHPLrH?=
 =?us-ascii?Q?eVbK/YTcG3BR4IT8ItVuppHmgSkdsBG/BHJKqt9mcBY1yvYIuws+c9vmtcDs?=
 =?us-ascii?Q?lwD822fWjQt/YDb5gJ1GrlPPh6SH09q8ykQvwP2gdjwlGgEY/2Kh3tmpHLQV?=
 =?us-ascii?Q?ik+7wGrNkdCw+q0fByeU/1jJBoe125epgc4W9XHRRa2rdoDuGBjT+GsqAvac?=
 =?us-ascii?Q?STIWuSd/fUfvDENLCumOTbVDdE7nJg8CDXko7UJ1CHaL3ws4jVgDeUDWYF7h?=
 =?us-ascii?Q?zIQ0TSzfIeJoXFQM78Kk+BymAsBOA/BJaj5D0ndV+fAIfoodfiZ2T9Tx3C62?=
 =?us-ascii?Q?Y25tVIkbkxScSL/Wl87sRWUzURvtLeEZz4nimdTmEF7E/MLExRGKowPeoHf0?=
 =?us-ascii?Q?bGvQHDlBLeH9YiMWaNrjR0Od5gDATJNuOPsXKddtxxIo+VF4eVWGSGYsufCU?=
 =?us-ascii?Q?Jx2ULuZzcSjhAgXI7361/nvvNWLkACYFXkIhOPlC4DY9d7ETbiFwMB6yE4Wt?=
 =?us-ascii?Q?xM/D3enSCzm0W8clqcryzZfyLZVG7KSL0DMkPWHuz+VMhiomaB8QpEGN/wlp?=
 =?us-ascii?Q?XlnVTqnXuj14c/AcsYMX5Pu0bt1ph0VJT7IgS7NpeRzMyFjz33CeIj8Ggth5?=
 =?us-ascii?Q?nu3ohny9BtyMqczdT7H6u+qMkexBzzq0TKd1HnLOegNaNK7qOCTcME/MHrAd?=
 =?us-ascii?Q?8GmEEwmNK0V7mMPUuA3OmjoFn/TbXd3/eHQRtzqSPIknF4UV3u2gojm/A3+O?=
 =?us-ascii?Q?ORcVtHJOkYE60L+rXaeAdYpeqhMOmUSfGOTiT9aHRHNmfcq7IkMjZJrdX/pN?=
 =?us-ascii?Q?rjqWmV4zvCNWT7IJ1BDFRK1d1AJB/7AjDMtfhjM3pFu8auInGPMYE9owlqVH?=
 =?us-ascii?Q?DPLN7DMJIUExAWt2hBGvXTNtZjAO7SvvQf9uzHvzv777Bb93c/iZkJIzLKr6?=
 =?us-ascii?Q?iIN1fMKy3GYHCRHO/M2XCnnfrOuQLAlkj+w6y2HPbDk+hw5Wl5oPEYvcM0M3?=
 =?us-ascii?Q?OwNybD1S6alUUZehW/iirYw=3D?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a8d49c0-1a41-4df5-7466-08d9a98fec32
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2021 06:03:06.5718
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: EFucTe3jeqEq3fb/nNXzqXpwCHVOvWu9c76lXT7e5k9jSDsXoHnb+7fAetdfQCAegMEv3wTKa/7y6TsTC6bcAw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7891
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The KVM_MAX_VCPUS value is supposed to be aligned with number of
VMID bits in the hgatp CSR but the current KVM_MAX_VCPUS value
is aligned with number of ASID bits in the satp CSR.

Fixes: 99cdc6c18c2d ("RISC-V: Add initial skeletal KVM support")
Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 arch/riscv/include/asm/kvm_host.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h
index 25ba21f98504..2639b9ee48f9 100644
--- a/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@ -12,14 +12,12 @@
 #include <linux/types.h>
 #include <linux/kvm.h>
 #include <linux/kvm_types.h>
+#include <asm/csr.h>
 #include <asm/kvm_vcpu_fp.h>
 #include <asm/kvm_vcpu_timer.h>
 
-#ifdef CONFIG_64BIT
-#define KVM_MAX_VCPUS			(1U << 16)
-#else
-#define KVM_MAX_VCPUS			(1U << 9)
-#endif
+#define KVM_MAX_VCPUS			\
+	((HGATP_VMID_MASK >> HGATP_VMID_SHIFT) + 1)
 
 #define KVM_HALT_POLL_NS_DEFAULT	500000
 
-- 
2.25.1