arm64: pt_regs: rename "pmr_save" -> "pmr"

The pt_regs::pmr_save field is weirdly named relative to all other
pt_regs fields, with a '_save' suffix that doesn't make anything clearer
and only leads to more typing to access the field.

Remove the '_save' suffix.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Puranjay Mohan <puranjay12@gmail.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Madhavan T. Venkataraman <madvenka@linux.microsoft.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241017092538.1859841-4-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
index 55f57dfa8e2fe07fd62619d2a29efa387b52e559..fbb5c99eb2f9d6edd49d2829cb0adf00dfd50459 100644 (file)
--- a/arch/arm64/include/asm/daifflags.h
+++ b/arch/arm64/include/asm/daifflags.h
@@ -132,7 +132,7 @@ static inline void local_daif_inherit(struct pt_regs *regs)
                trace_hardirqs_on();
 
        if (system_uses_irq_prio_masking())
-               gic_write_pmr(regs->pmr_save);
+               gic_write_pmr(regs->pmr);
 
        /*
         * We can't use local_daif_restore(regs->pstate) here as

diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 1438424f00643708c26b0439fd697b6d97fc3ff9..03b99164f7f46e4c8e3e5f046fdb2932d3b07cde 100644 (file)
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -293,7 +293,7 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc)
        regs->pc = pc;
 
        if (system_uses_irq_prio_masking())
-               regs->pmr_save = GIC_PRIO_IRQON;
+               regs->pmr = GIC_PRIO_IRQON;
 }
 
 static inline void start_thread(struct pt_regs *regs, unsigned long pc,

diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index 1ae671fe64d86fe179c3b371054dbe2ea4647655..e82e6e47ac9a486451a5b2ede394efaabc2b5c51 100644 (file)
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -167,7 +167,7 @@ struct pt_regs {
 
        u64 sdei_ttbr1;
        /* Only valid when ARM64_HAS_GIC_PRIO_MASKING is enabled. */
-       u64 pmr_save;
+       u64 pmr;
        u64 stackframe[2];
 
        /* Only valid for some EL1 exceptions. */
@@ -211,7 +211,7 @@ static inline void forget_syscall(struct pt_regs *regs)
 
 #define irqs_priority_unmasked(regs)                                   \
        (system_uses_irq_prio_masking() ?                               \
-               (regs)->pmr_save == GIC_PRIO_IRQON :                    \
+               (regs)->pmr == GIC_PRIO_IRQON :                         \
                true)
 
 #define interrupts_enabled(regs)                       \

diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 27de1dddb0abee1f6e9d760676a0ffdd0c9a2603..eb7fb2f9b92743065ac6a87d6c9414964f158277 100644 (file)
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -79,7 +79,7 @@ int main(void)
   DEFINE(S_PSTATE,             offsetof(struct pt_regs, pstate));
   DEFINE(S_SYSCALLNO,          offsetof(struct pt_regs, syscallno));
   DEFINE(S_SDEI_TTBR1,         offsetof(struct pt_regs, sdei_ttbr1));
-  DEFINE(S_PMR_SAVE,           offsetof(struct pt_regs, pmr_save));
+  DEFINE(S_PMR,                        offsetof(struct pt_regs, pmr));
   DEFINE(S_STACKFRAME,         offsetof(struct pt_regs, stackframe));
   DEFINE(PT_REGS_SIZE,         sizeof(struct pt_regs));
   BLANK();

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 7ef0e127b149fcb68ce4aaf83e1403c0648f289f..a84ce95ad96ce912899fc25f1ccd1149c329133a 100644 (file)
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -315,7 +315,7 @@ alternative_if_not ARM64_HAS_GIC_PRIO_MASKING
 alternative_else_nop_endif
 
        mrs_s   x20, SYS_ICC_PMR_EL1
-       str     x20, [sp, #S_PMR_SAVE]
+       str     x20, [sp, #S_PMR]
        mov     x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET
        msr_s   SYS_ICC_PMR_EL1, x20
 
@@ -342,7 +342,7 @@ alternative_if_not ARM64_HAS_GIC_PRIO_MASKING
        b       .Lskip_pmr_restore\@
 alternative_else_nop_endif
 
-       ldr     x20, [sp, #S_PMR_SAVE]
+       ldr     x20, [sp, #S_PMR]
        msr_s   SYS_ICC_PMR_EL1, x20
 
        /* Ensure priority change is seen by redistributor */

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 0540653fbf382bf8a0984a7e9f97cafbedc3251b..2951b5ba193784a03d59a9fdb60fb09a9a3cf154 100644 (file)
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -227,7 +227,7 @@ void __show_regs(struct pt_regs *regs)
        printk("sp : %016llx\n", sp);
 
        if (system_uses_irq_prio_masking())
-               printk("pmr_save: %08llx\n", regs->pmr_save);
+               printk("pmr: %08llx\n", regs->pmr);
 
        i = top_reg;