Commit 00d95979 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

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: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarPuranjay 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: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 2716d59b

arch/arm64/include/asm/daifflags.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/arm64/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -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)			\

arch/arm64/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/arm64/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -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 */