diff --git a/llvm/lib/Target/AArch64/AArch64SystemOperands.td b/llvm/lib/Target/AArch64/AArch64SystemOperands.td
--- a/llvm/lib/Target/AArch64/AArch64SystemOperands.td
+++ b/llvm/lib/Target/AArch64/AArch64SystemOperands.td
@@ -1331,7 +1331,6 @@
 let Requires = [{ {AArch64::FeatureRASv8_4} }] in {
 def : RWSysReg<"ERXPFGCTL_EL1", 0b11, 0b000, 0b0101, 0b0100, 0b101>;
 def : RWSysReg<"ERXPFGCDN_EL1", 0b11, 0b000, 0b0101, 0b0100, 0b110>;
-def : RWSysReg<"ERXTS_EL1",     0b11, 0b000, 0b0101, 0b0101, 0b111>;
 def : RWSysReg<"ERXMISC2_EL1",  0b11, 0b000, 0b0101, 0b0101, 0b010>;
 def : RWSysReg<"ERXMISC3_EL1",  0b11, 0b000, 0b0101, 0b0101, 0b011>;
 def : ROSysReg<"ERXPFGF_EL1",   0b11, 0b000, 0b0101, 0b0100, 0b100>;
diff --git a/llvm/test/MC/AArch64/armv8.4a-ras.s b/llvm/test/MC/AArch64/armv8.4a-ras.s
--- a/llvm/test/MC/AArch64/armv8.4a-ras.s
+++ b/llvm/test/MC/AArch64/armv8.4a-ras.s
@@ -25,14 +25,6 @@
 //CHECK-ERROR: error: expected writable system register or pstate
 //CHECK-ERROR: error: expected readable system register
 
-  msr ERXTS_EL1, x0
-  mrs x0,ERXTS_EL1
-
-//CHECK:  msr ERXTS_EL1, x0           // encoding: [0xe0,0x55,0x18,0xd5]
-//CHECK:  mrs x0, ERXTS_EL1           // encoding: [0xe0,0x55,0x38,0xd5]
-//CHECK-ERROR: error: expected writable system register or pstate
-//CHECK-ERROR: error: expected readable system register
-
   msr ERXMISC2_EL1, x0
   mrs x0, ERXMISC2_EL1
 
diff --git a/llvm/test/MC/Disassembler/AArch64/armv8.4a-ras.txt b/llvm/test/MC/Disassembler/AArch64/armv8.4a-ras.txt
--- a/llvm/test/MC/Disassembler/AArch64/armv8.4a-ras.txt
+++ b/llvm/test/MC/Disassembler/AArch64/armv8.4a-ras.txt
@@ -4,8 +4,6 @@
 0xa0,0x54,0x38,0xd5
 0xc0,0x54,0x18,0xd5
 0xc0,0x54,0x38,0xd5
-0xe0,0x55,0x18,0xd5
-0xe0,0x55,0x38,0xd5
 0x80,0x54,0x38,0xd5
 
 0x40,0x55,0x18,0xd5
@@ -17,8 +15,6 @@
 #CHECK:  mrs x0, ERXPFGCTL_EL1
 #CHECK:  msr ERXPFGCDN_EL1, x0
 #CHECK:  mrs x0, ERXPFGCDN_EL1
-#CHECK:  msr ERXTS_EL1, x0
-#CHECK:  mrs x0, ERXTS_EL1
 #CHECK:  mrs x0, ERXPFGF_EL1
 
 #CHECK:  msr ERXMISC2_EL1, x0