Commit 8da52b8401 for qemu.org

commit 8da52b8401afa34ea8caa58e1bfb321ae142899b
Author: Peter Maydell <peter.maydell@linaro.org>
Date:   Wed Dec 31 17:08:55 2025 +0000

    target/arm: Don't specify ID_PFR1 accessfn twice

    In the definition of ID_PFR1 we have an ifdef block; we specify the
    accessfn once in the common part of the ifdef and once in the
    not-user-only part, which is redundant but harmless.

    The accessfn will always return success in user-only mode (because
    we won't trap to EL2), so specify it only in the not-user-only
    half of the ifdef, as was probably the intention.

    This is only cc'd to stable to avoid a textual conflict with
    the following patch, which is a bug fix.

    Cc: qemu-stable@nongnu.org
    Fixes: 0f150c8499e970bd ("target/arm: Constify ID_PFR1 on user emulation")
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
    Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
    Message-id: 20251231170858.254594-2-peter.maydell@linaro.org

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 1ee721ac7b..958e8edd34 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6312,7 +6312,6 @@ void register_cp_regs_for_features(ARMCPU *cpu)
             { .name = "ID_PFR1", .state = ARM_CP_STATE_BOTH,
               .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 1,
               .access = PL1_R, .type = ARM_CP_NO_RAW,
-              .accessfn = access_aa32_tid3,
 #ifdef CONFIG_USER_ONLY
               .type = ARM_CP_CONST,
               .resetvalue = GET_IDREG(isar, ID_PFR1),