diff --git a/litex/soc/cores/cpu/vexriscv/verilog b/litex/soc/cores/cpu/vexriscv/verilog
index 395c5ee28..d7bbc2c16 160000
--- a/litex/soc/cores/cpu/vexriscv/verilog
+++ b/litex/soc/cores/cpu/vexriscv/verilog
@@ -1 +1 @@
-Subproject commit 395c5ee2868ffbe36db290a4a4ec0eabc0f5c2b5
+Subproject commit d7bbc2c167f1a0886c446d3c305d0ed4388570be
diff --git a/litex/soc/software/include/base/csr-defs.h b/litex/soc/software/include/base/csr-defs.h
index 5f5ea8476..d98e8dfb7 100644
--- a/litex/soc/software/include/base/csr-defs.h
+++ b/litex/soc/software/include/base/csr-defs.h
@@ -3,8 +3,8 @@
 
 #define CSR_MSTATUS_MIE 0x8
 
-#define CSR_IRQ_MASK 0x330
-#define CSR_IRQ_PENDING 0x360
+#define CSR_IRQ_MASK 0xBC0
+#define CSR_IRQ_PENDING 0xFC0
 
 #define CSR_DCACHE_INFO 0xCC0