Merge tag 'kvm-riscv-6.4-1' of https://github.com/kvm-riscv/linux into HEAD

[linux-2.6-microblaze.git] / arch / riscv / include / asm / csr.h

diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index 7c2b8cd..b6acb7e 100644 (file)
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -7,7 +7,7 @@
 #define _ASM_RISCV_CSR_H
 
 #include <asm/asm.h>
-#include <linux/const.h>
+#include <linux/bits.h>
 
 /* Status register flags */
 #define SR_SIE         _AC(0x00000002, UL) /* Supervisor Interrupt Enable */
@@ -72,7 +72,10 @@
 #define IRQ_S_EXT              9
 #define IRQ_VS_EXT             10
 #define IRQ_M_EXT              11
+#define IRQ_S_GEXT             12
 #define IRQ_PMU_OVF            13
+#define IRQ_LOCAL_MAX          (IRQ_PMU_OVF + 1)
+#define IRQ_LOCAL_MASK         GENMASK((IRQ_LOCAL_MAX - 1), 0)
 
 /* Exception causes */
 #define EXC_INST_MISALIGNED    0
@@ -127,25 +130,25 @@
 
 #define HGATP32_MODE_SHIFT     31
 #define HGATP32_VMID_SHIFT     22
-#define HGATP32_VMID_MASK      _AC(0x1FC00000, UL)
-#define HGATP32_PPN            _AC(0x003FFFFF, UL)
+#define HGATP32_VMID           GENMASK(28, 22)
+#define HGATP32_PPN            GENMASK(21, 0)
 
 #define HGATP64_MODE_SHIFT     60
 #define HGATP64_VMID_SHIFT     44
-#define HGATP64_VMID_MASK      _AC(0x03FFF00000000000, UL)
-#define HGATP64_PPN            _AC(0x00000FFFFFFFFFFF, UL)
+#define HGATP64_VMID           GENMASK(57, 44)
+#define HGATP64_PPN            GENMASK(43, 0)
 
 #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_VMID             HGATP64_VMID
 #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_VMID             HGATP32_VMID
 #define HGATP_MODE_SHIFT       HGATP32_MODE_SHIFT
 #endif
 
@@ -155,6 +158,27 @@
                                 (_AC(1, UL) << IRQ_S_TIMER) | \
                                 (_AC(1, UL) << IRQ_S_EXT))
 
+/* AIA CSR bits */
+#define TOPI_IID_SHIFT         16
+#define TOPI_IID_MASK          GENMASK(11, 0)
+#define TOPI_IPRIO_MASK                GENMASK(7, 0)
+#define TOPI_IPRIO_BITS                8
+
+#define TOPEI_ID_SHIFT         16
+#define TOPEI_ID_MASK          GENMASK(10, 0)
+#define TOPEI_PRIO_MASK                GENMASK(10, 0)
+
+#define ISELECT_IPRIO0         0x30
+#define ISELECT_IPRIO15                0x3f
+#define ISELECT_MASK           GENMASK(8, 0)
+
+#define HVICTL_VTI             BIT(30)
+#define HVICTL_IID             GENMASK(27, 16)
+#define HVICTL_IID_SHIFT       16
+#define HVICTL_DPR             BIT(9)
+#define HVICTL_IPRIOM          BIT(8)
+#define HVICTL_IPRIO           GENMASK(7, 0)
+
 /* xENVCFG flags */
 #define ENVCFG_STCE                    (_AC(1, ULL) << 63)
 #define ENVCFG_PBMTE                   (_AC(1, ULL) << 62)
@@ -249,6 +273,18 @@
 #define CSR_STIMECMP           0x14D
 #define CSR_STIMECMPH          0x15D
 
+/* Supervisor-Level Window to Indirectly Accessed Registers (AIA) */
+#define CSR_SISELECT           0x150
+#define CSR_SIREG              0x151
+
+/* Supervisor-Level Interrupts (AIA) */
+#define CSR_STOPEI             0x15c
+#define CSR_STOPI              0xdb0
+
+/* Supervisor-Level High-Half CSRs (AIA) */
+#define CSR_SIEH               0x114
+#define CSR_SIPH               0x154
+
 #define CSR_VSSTATUS           0x200
 #define CSR_VSIE               0x204
 #define CSR_VSTVEC             0x205
@@ -278,8 +314,32 @@
 #define CSR_HGATP              0x680
 #define CSR_HGEIP              0xe12
 
+/* Virtual Interrupts and Interrupt Priorities (H-extension with AIA) */
+#define CSR_HVIEN              0x608
+#define CSR_HVICTL             0x609
+#define CSR_HVIPRIO1           0x646
+#define CSR_HVIPRIO2           0x647
+
+/* VS-Level Window to Indirectly Accessed Registers (H-extension with AIA) */
+#define CSR_VSISELECT          0x250
+#define CSR_VSIREG             0x251
+
+/* VS-Level Interrupts (H-extension with AIA) */
+#define CSR_VSTOPEI            0x25c
+#define CSR_VSTOPI             0xeb0
+
+/* Hypervisor and VS-Level High-Half CSRs (H-extension with AIA) */
+#define CSR_HIDELEGH           0x613
+#define CSR_HVIENH             0x618
+#define CSR_HVIPH              0x655
+#define CSR_HVIPRIO1H          0x656
+#define CSR_HVIPRIO2H          0x657
+#define CSR_VSIEH              0x214
+#define CSR_VSIPH              0x254
+
 #define CSR_MSTATUS            0x300
 #define CSR_MISA               0x301
+#define CSR_MIDELEG            0x303
 #define CSR_MIE                        0x304
 #define CSR_MTVEC              0x305
 #define CSR_MENVCFG            0x30a
@@ -296,6 +356,25 @@
 #define CSR_MIMPID             0xf13
 #define CSR_MHARTID            0xf14
 
+/* Machine-Level Window to Indirectly Accessed Registers (AIA) */
+#define CSR_MISELECT           0x350
+#define CSR_MIREG              0x351
+
+/* Machine-Level Interrupts (AIA) */
+#define CSR_MTOPEI             0x35c
+#define CSR_MTOPI              0xfb0
+
+/* Virtual Interrupts for Supervisor Level (AIA) */
+#define CSR_MVIEN              0x308
+#define CSR_MVIP               0x309
+
+/* Machine-Level High-Half CSRs (AIA) */
+#define CSR_MIDELEGH           0x313
+#define CSR_MIEH               0x314
+#define CSR_MVIENH             0x318
+#define CSR_MVIPH              0x319
+#define CSR_MIPH               0x354
+
 #ifdef CONFIG_RISCV_M_MODE
 # define CSR_STATUS    CSR_MSTATUS
 # define CSR_IE                CSR_MIE
@@ -306,6 +385,13 @@
 # define CSR_TVAL      CSR_MTVAL
 # define CSR_IP                CSR_MIP
 
+# define CSR_IEH               CSR_MIEH
+# define CSR_ISELECT   CSR_MISELECT
+# define CSR_IREG      CSR_MIREG
+# define CSR_IPH               CSR_MIPH
+# define CSR_TOPEI     CSR_MTOPEI
+# define CSR_TOPI      CSR_MTOPI
+
 # define SR_IE         SR_MIE
 # define SR_PIE                SR_MPIE
 # define SR_PP         SR_MPP
@@ -323,6 +409,13 @@
 # define CSR_TVAL      CSR_STVAL
 # define CSR_IP                CSR_SIP
 
+# define CSR_IEH               CSR_SIEH
+# define CSR_ISELECT   CSR_SISELECT
+# define CSR_IREG      CSR_SIREG
+# define CSR_IPH               CSR_SIPH
+# define CSR_TOPEI     CSR_STOPEI
+# define CSR_TOPI      CSR_STOPI
+
 # define SR_IE         SR_SIE
 # define SR_PIE                SR_SPIE
 # define SR_PP         SR_SPP