Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a507f25d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Update the compat layer to allow single-byte watchpoints on all
   addresses (similar to the native support)

 - arm_pmu: fix the restoration of the counters on the
   CPU_PM_ENTER_FAILED path

 - Fix build regression with vDSO and Makefile not stripping
   CROSS_COMPILE_COMPAT

 - Fix the CTR_EL0 (cache type register) sanitisation on heterogeneous
   machines (e.g. big.LITTLE)

 - Fix the interrupt controller priority mask value when pseudo-NMIs are
   enabled

 - arm64 kprobes fixes: recovering of the PSTATE.D flag in the
   single-step exception handler, NOKPROBE annotations for
   unwind_frame() and walk_stackframe(), remove unneeded
   rcu_read_lock/unlock from debug handlers

 - Several gcc fall-through warnings

 - Unused variable warnings

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Make debug exception handlers visible from RCU
  arm64: kprobes: Recover pstate.D in single-step exception handler
  arm64/mm: fix variable 'tag' set but not used
  arm64/mm: fix variable 'pud' set but not used
  arm64: Remove unneeded rcu_read_lock from debug handlers
  arm64: unwind: Prohibit probing on return_address()
  arm64: Lower priority mask for GIC_PRIO_IRQON
  arm64/efi: fix variable 'si' set but not used
  arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
  arm64: vdso: Fix Makefile regression
  arm64: module: Mark expected switch fall-through
  arm64: smp: Mark expected switch fall-through
  arm64: hw_breakpoint: Fix warnings about implicit fallthrough
  drivers/perf: arm_pmu: Fix failure path in PM notifier
  arm64: compat: Allow single-byte watchpoints on all addresses
parents 9100fc5a d8bb6718

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y) 


  ifeq ($(CONFIG_CC_IS_CLANG), y)

    $(warning CROSS_COMPILE_COMPAT is clang, the compat vDSO will not be built)

  else ifeq ($(CROSS_COMPILE_COMPAT),)

  else ifeq ($(strip $(CROSS_COMPILE_COMPAT)),)

    $(warning CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built)

  else ifeq ($(shell which $(CROSS_COMPILE_COMPAT)gcc 2> /dev/null),)

    $(error $(CROSS_COMPILE_COMPAT)gcc not found, check CROSS_COMPILE_COMPAT)

arch/arm64/include/asm/arch_gicv3.h

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,12 @@ static inline void gic_pmr_mask_irqs(void) 
	BUILD_BUG_ON(GICD_INT_DEF_PRI < (GIC_PRIO_IRQOFF |

					 GIC_PRIO_PSR_I_SET));

	BUILD_BUG_ON(GICD_INT_DEF_PRI >= GIC_PRIO_IRQON);

	/*

	 * Need to make sure IRQON allows IRQs when SCR_EL3.FIQ is cleared

	 * and non-secure PMR accesses are not subject to the shifts that

	 * are applied to IRQ priorities

	 */

	BUILD_BUG_ON((0x80 | (GICD_INT_DEF_PRI >> 1)) >= GIC_PRIO_IRQON);

	gic_write_pmr(GIC_PRIO_IRQOFF);

}

arch/arm64/include/asm/cpufeature.h

+4 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum ftr_type { 
	FTR_EXACT,			/* Use a predefined safe value */

	FTR_LOWER_SAFE,			/* Smaller value is safe */

	FTR_HIGHER_SAFE,		/* Bigger value is safe */

	FTR_HIGHER_OR_ZERO_SAFE,	/* Bigger value is safe, but 0 is biggest */

};



#define FTR_STRICT	true	/* SANITY check strict matching required */

arch/arm64/include/asm/daifflags.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#define DAIF_PROCCTX		0

#define DAIF_PROCCTX_NOIRQ	PSR_I_BIT

#define DAIF_ERRCTX		(PSR_I_BIT | PSR_A_BIT)

#define DAIF_MASK		(PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)





/* mask/save/unmask/restore all exceptions, including interrupts. */

static inline void local_daif_mask(void)

arch/arm64/include/asm/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -105,7 +105,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, 
	((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)



#define alloc_screen_info(x...)		&screen_info

#define free_screen_info(x...)



static inline void free_screen_info(efi_system_table_t *sys_table_arg,

				    struct screen_info *si)

{

}



/* redeclare as 'hidden' so the compiler will generate relative references */

extern struct screen_info screen_info __attribute__((__visibility__("hidden")));