Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Anup Patel <anup.patel@wdc.com>
To:     Palmer Dabbelt <palmer@dabbelt.com>,
        Palmer Dabbelt <palmerdabbelt@google.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc:     Alexander Graf <graf@amazon.com>,
        Atish Patra <atish.patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Anup Patel <anup@brainfault.org>, kvm@vger.kernel.org,
        kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,
        linux-kernel@vger.kernel.org, Anup Patel <anup.patel@wdc.com>
Subject: [PATCH v20 01/17] RISC-V: Add hypervisor extension related CSR defines
Date:   Mon, 27 Sep 2021 17:10:00 +0530
Message-Id: <20210927114016.1089328-2-anup.patel@wdc.com>
In-Reply-To: <20210927114016.1089328-1-anup.patel@wdc.com>
References: <20210927114016.1089328-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?dcbFbPODsVBZNr6iMmCsOdjphxtU+acxJ83O0Ug06Myt/vYhoyBSnlwOr7Cc?=
 =?us-ascii?Q?6bIRToBA5NhL2Szgzx+mNJfmex7JxFyHn9zU/WXKp692urDD7WQSVIkb2LwS?=
 =?us-ascii?Q?EO2spa7bSG4NvfVanRGhKokOkfeI4ybVt4RhJyK6hEYo+kEUW85r8nIwF+2d?=
 =?us-ascii?Q?RkMTTPkLyzMK++2OZwvsQDlMZ4ZGHVF36E7ma6yGWtn06Bb2yLk3thmCJpNU?=
 =?us-ascii?Q?t3tuQXyWjh4lzQmU58Ru1XO5K7WIKOWrwiekoOeOeWnvQGAhN16XSVyKHJIK?=
 =?us-ascii?Q?HaNHFZ2rWJnBW6lW+CUBhYCd+bd1xWwHBfaoswH2SLn/acUO0Ok1b43Xs+dV?=
 =?us-ascii?Q?hZ26BsGLmLrUZ6VsMns1dvVgUAS7DkslcVt2eY9d0TlwiDhEhPufo9TTBI0X?=
 =?us-ascii?Q?IXJW3TNgdFxvWvAezr2wOdy2VdhGQIauYz4oOiST40xipmZaihPzxw8YC40i?=
 =?us-ascii?Q?7LU3C+TU/UZ9F152qiDJ1X3BdxMNDHhmr8bCcywm4/1bEZwyeWfsWCTKhvy/?=
 =?us-ascii?Q?WmP7Xs9jMFn6aHKNbzh4GpcoH3qO9WD7XGf0sWHyXZrAkMltT7ccImG98h7W?=
 =?us-ascii?Q?pP1NGT2dVy/UKFC1m6FUM8AhX7idmeS97Hk/tqGQC/N8fTr75cVFKfHRTkD3?=
 =?us-ascii?Q?Ponwbw0OAJRRAnaT1mJfgh0wH78umYc1z+w8pz/wZtbg1PeugS+qE1RwP2vb?=
 =?us-ascii?Q?NPqD5F30Rt/Q+7toJeyCmCGuipqAxuegbdrKZSwJwOIvWJecbIKAazSIoyJZ?=
 =?us-ascii?Q?PC769miV1jO4ZADqPU8tUfcP1UEG9p7lsjes8Ob/BgDIDn+iSINTt//GmVX5?=
 =?us-ascii?Q?+VebNp4AlC5IxOgrrFxF5fCQHJBcnjTGKY/IFkIUgX5YvyfV6PTa4nkNrBeA?=
 =?us-ascii?Q?kiCgV0DCP2p4Iq2vt1nBZ60tHQHHilQwpmVWs/7vH0G0tBAvM1PUoDlMKIcJ?=
 =?us-ascii?Q?Llw9pGUV8w2XjNJHzMSSeM8smffFHwiwhfOYHNthUfkM34fKjS3UjDvPajLs?=
 =?us-ascii?Q?SugQ0wdfx/JTj1xMvHtCBGDxV+cFeeVI88K5AeKrXL5dlsn1csvoG7gNb1uw?=
 =?us-ascii?Q?PppzmvsnhhSteRJWWlo7IWvfzRLLJUaeh8+7bA6dVtEd53YfEwP7Su2vs31A?=
 =?us-ascii?Q?KH/O8gCo2b+u46X4m+FqF/MZ6H5/HH5Bb+HR3Lv/++mDoPhIfiUIhIbRVwbl?=
 =?us-ascii?Q?nk7IPIil1FtbZ7SSda91BItqDvTBl0C9WA/Ta30ptQaMVENu9ksr5VTVvKQM?=
 =?us-ascii?Q?TVTnawAVO2ve6ec75ddU0D6AbSgQi77fldbcyfW8c+9aeFDg0vm8erobMii9?=
 =?us-ascii?Q?PeaWsGMjgYT/9X7YMr49Btkw?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 826cd3d2-c356-40ae-66ff-08d981aba769
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:40:49.8983
 (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: 0kj/J2TUgBc9FMFmZHnmtZNgXEj4MqHipl3ZwxpV9ax7x1Q8rXRMgvUCA5AvAzZDYjF5lsogXwp8VO1leCEDrg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB8345
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patch adds asm/kvm_csr.h for RISC-V hypervisor extension
related defines.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alexander Graf <graf@amazon.com>
---
 arch/riscv/include/asm/csr.h | 87 ++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index 87ac65696871..5046f431645c 100644
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -58,22 +58,32 @@
 
 /* Interrupt causes (minus the high bit) */
 #define IRQ_S_SOFT		1
+#define IRQ_VS_SOFT		2
 #define IRQ_M_SOFT		3
 #define IRQ_S_TIMER		5
+#define IRQ_VS_TIMER		6
 #define IRQ_M_TIMER		7
 #define IRQ_S_EXT		9
+#define IRQ_VS_EXT		10
 #define IRQ_M_EXT		11
 
 /* Exception causes */
 #define EXC_INST_MISALIGNED	0
 #define EXC_INST_ACCESS		1
+#define EXC_INST_ILLEGAL	2
 #define EXC_BREAKPOINT		3
 #define EXC_LOAD_ACCESS		5
 #define EXC_STORE_ACCESS	7
 #define EXC_SYSCALL		8
+#define EXC_HYPERVISOR_SYSCALL	9
+#define EXC_SUPERVISOR_SYSCALL	10
 #define EXC_INST_PAGE_FAULT	12
 #define EXC_LOAD_PAGE_FAULT	13
 #define EXC_STORE_PAGE_FAULT	15
+#define EXC_INST_GUEST_PAGE_FAULT	20
+#define EXC_LOAD_GUEST_PAGE_FAULT	21
+#define EXC_VIRTUAL_INST_FAULT		22
+#define EXC_STORE_GUEST_PAGE_FAULT	23
 
 /* PMP configuration */
 #define PMP_R			0x01
@@ -85,6 +95,58 @@
 #define PMP_A_NAPOT		0x18
 #define PMP_L			0x80
 
+/* HSTATUS flags */
+#ifdef CONFIG_64BIT
+#define HSTATUS_VSXL		_AC(0x300000000, UL)
+#define HSTATUS_VSXL_SHIFT	32
+#endif
+#define HSTATUS_VTSR		_AC(0x00400000, UL)
+#define HSTATUS_VTW		_AC(0x00200000, UL)
+#define HSTATUS_VTVM		_AC(0x00100000, UL)
+#define HSTATUS_VGEIN		_AC(0x0003f000, UL)
+#define HSTATUS_VGEIN_SHIFT	12
+#define HSTATUS_HU		_AC(0x00000200, UL)
+#define HSTATUS_SPVP		_AC(0x00000100, UL)
+#define HSTATUS_SPV		_AC(0x00000080, UL)
+#define HSTATUS_GVA		_AC(0x00000040, UL)
+#define HSTATUS_VSBE		_AC(0x00000020, UL)
+
+/* HGATP flags */
+#define HGATP_MODE_OFF		_AC(0, UL)
+#define HGATP_MODE_SV32X4	_AC(1, UL)
+#define HGATP_MODE_SV39X4	_AC(8, UL)
+#define HGATP_MODE_SV48X4	_AC(9, UL)
+
+#define HGATP32_MODE_SHIFT	31
+#define HGATP32_VMID_SHIFT	22
+#define HGATP32_VMID_MASK	_AC(0x1FC00000, UL)
+#define HGATP32_PPN		_AC(0x003FFFFF, UL)
+
+#define HGATP64_MODE_SHIFT	60
+#define HGATP64_VMID_SHIFT	44
+#define HGATP64_VMID_MASK	_AC(0x03FFF00000000000, UL)
+#define HGATP64_PPN		_AC(0x00000FFFFFFFFFFF, UL)
+
+#define HGATP_PAGE_SHIFT	12
+
+#ifdef CONFIG_64BIT
+#define HGATP_PPN		HGATP64_PPN
+#define HGATP_VMID_SHIFT	HGATP64_VMID_SHIFT
+#define HGATP_VMID_MASK		HGATP64_VMID_MASK
+#define HGATP_MODE_SHIFT	HGATP64_MODE_SHIFT
+#else
+#define HGATP_PPN		HGATP32_PPN
+#define HGATP_VMID_SHIFT	HGATP32_VMID_SHIFT
+#define HGATP_VMID_MASK		HGATP32_VMID_MASK
+#define HGATP_MODE_SHIFT	HGATP32_MODE_SHIFT
+#endif
+
+/* VSIP & HVIP relation */
+#define VSIP_TO_HVIP_SHIFT	(IRQ_VS_SOFT - IRQ_S_SOFT)
+#define VSIP_VALID_MASK		((_AC(1, UL) << IRQ_S_SOFT) | \
+				 (_AC(1, UL) << IRQ_S_TIMER) | \
+				 (_AC(1, UL) << IRQ_S_EXT))
+
 /* symbolic CSR names: */
 #define CSR_CYCLE		0xc00
 #define CSR_TIME		0xc01
@@ -104,6 +166,31 @@
 #define CSR_SIP			0x144
 #define CSR_SATP		0x180
 
+#define CSR_VSSTATUS		0x200
+#define CSR_VSIE		0x204
+#define CSR_VSTVEC		0x205
+#define CSR_VSSCRATCH		0x240
+#define CSR_VSEPC		0x241
+#define CSR_VSCAUSE		0x242
+#define CSR_VSTVAL		0x243
+#define CSR_VSIP		0x244
+#define CSR_VSATP		0x280
+
+#define CSR_HSTATUS		0x600
+#define CSR_HEDELEG		0x602
+#define CSR_HIDELEG		0x603
+#define CSR_HIE			0x604
+#define CSR_HTIMEDELTA		0x605
+#define CSR_HCOUNTEREN		0x606
+#define CSR_HGEIE		0x607
+#define CSR_HTIMEDELTAH		0x615
+#define CSR_HTVAL		0x643
+#define CSR_HIP			0x644
+#define CSR_HVIP		0x645
+#define CSR_HTINST		0x64a
+#define CSR_HGATP		0x680
+#define CSR_HGEIP		0xe12
+
 #define CSR_MSTATUS		0x300
 #define CSR_MISA		0x301
 #define CSR_MIE			0x304
-- 
2.25.1