Commit 90d67de5dc for qemu.org

commit 90d67de5dc3629554c003afdddd0c4caaa0feeab
Author: Bibo Mao <maobibo@loongson.cn>
Date:   Mon Sep 7 10:43:46 2026 +0800

    target/loongarch: Remove CSR registers relative MERR

    Registers relative with MERR are used for HW error handling, such as CPU
    cache etc now both KVM and TCG do not support MERR. Remove these CSR
    registers, vmstate keeps unchanged for compatibility.

    Signed-off-by: Bibo Mao <maobibo@loongson.cn>
    Reviewed-by:   Xianglai Li <lixianglai@loongson.cn>

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index cd39572b5c..614d6a9542 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -153,12 +153,6 @@ static void loongarch_la464_init_csr(DeviceState *dev)
         }
         set_csr_flag(LOONGARCH_CSR_IMPCTL1, CSRFL_UNUSED);
         set_csr_flag(LOONGARCH_CSR_IMPCTL2, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRCTL, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRINFO1, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRINFO2, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRENTRY, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRERA, CSRFL_UNUSED);
-        set_csr_flag(LOONGARCH_CSR_MERRSAVE, CSRFL_UNUSED);
         set_csr_flag(LOONGARCH_CSR_CTAG, CSRFL_UNUSED);

         for (i = env->perf_event_num; i < MAX_PERF_EVENTS; i++) {
diff --git a/target/loongarch/csr.c b/target/loongarch/csr.c
index 309b826ca9..d2ac39dee9 100644
--- a/target/loongarch/csr.c
+++ b/target/loongarch/csr.c
@@ -82,12 +82,6 @@ static CSRInfo csr_info[] = {
     CSR_OFF(TLBRELO1),
     CSR_OFF(TLBREHI),
     CSR_OFF(TLBRPRMD),
-    CSR_OFF(MERRCTL),
-    CSR_OFF(MERRINFO1),
-    CSR_OFF(MERRINFO2),
-    CSR_OFF(MERRENTRY),
-    CSR_OFF(MERRERA),
-    CSR_OFF(MERRSAVE),
     CSR_OFF(CTAG),
     CSR_OFF_ARRAY(DMW, 0),
     CSR_OFF_ARRAY(DMW, 1),
diff --git a/target/loongarch/disas.c b/target/loongarch/disas.c
index 3249ab7ac6..928b8b94c2 100644
--- a/target/loongarch/disas.c
+++ b/target/loongarch/disas.c
@@ -98,12 +98,6 @@ static const char * const csr_names[] = {
     CSR_NAME(TLBRELO1),
     CSR_NAME(TLBREHI),
     CSR_NAME(TLBRPRMD),
-    CSR_NAME(MERRCTL),
-    CSR_NAME(MERRINFO1),
-    CSR_NAME(MERRINFO2),
-    CSR_NAME(MERRENTRY),
-    CSR_NAME(MERRERA),
-    CSR_NAME(MERRSAVE),
     CSR_NAME(CTAG),
     CSR_NAME(DMW(0)),
     CSR_NAME(DMW(1)),