diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h
index 316d7431..6dd0d300 100644
--- a/include/sbi/riscv_encoding.h
+++ b/include/sbi/riscv_encoding.h
@@ -78,6 +78,7 @@
 #define IRQ_S_EXT			9
 #define IRQ_VS_EXT			10
 #define IRQ_M_EXT			11
+#define IRQ_S_GEXT			12
 
 #define MIP_SSIP			(_UL(1) << IRQ_S_SOFT)
 #define MIP_VSSIP			(_UL(1) << IRQ_VS_SOFT)
@@ -88,6 +89,7 @@
 #define MIP_SEIP			(_UL(1) << IRQ_S_EXT)
 #define MIP_VSEIP			(_UL(1) << IRQ_VS_EXT)
 #define MIP_MEIP			(_UL(1) << IRQ_M_EXT)
+#define MIP_SGEIP			(_UL(1) << IRQ_S_GEXT)
 
 #define SIP_SSIP			MIP_SSIP
 #define SIP_STIP			MIP_STIP
@@ -213,10 +215,12 @@
 #define CSR_HTIMEDELTA			0x605
 #define CSR_HTIMEDELTAH			0x615
 #define CSR_HCOUNTERNEN			0x606
+#define CSR_HGEIE			0x607
 #define CSR_HTVAL			0x643
 #define CSR_HIP				0x644
 #define CSR_HTINST			0x64a
 #define CSR_HGATP			0x680
+#define CSR_HGEIP			0xe07
 
 #define CSR_VSSTATUS			0x200
 #define CSR_VSIE			0x204