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

Commit 955837d8 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 more arm64 fixes from Will Deacon:
 "Another handful of arm64 fixes here.  They address some issues found
  by running smatch on the arch code (ignoring the false positives) and
  also stop 32-bit Android from losing track of its stack.

  There's one additional irq migration fix in the pipeline, but it came
  in after I'd tagged and tested this set.

   - a few fixes for real issues found by smatch (after Dan's talk at KS)

   - revert the /proc/cpuinfo changes merged during the merge window.
     We've opened a can of worms here, so we need to find out where we
     stand before we change this interface.

   - implement KSTK_ESP for compat tasks, otherwise 32-bit Android gets
     confused wondering where its [stack] has gone

   - misc fixes (fpsimd context handling, crypto, ...)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  Revert "arm64: cpuinfo: print info for all CPUs"
  arm64: fix bug for reloading FPSIMD state after cpu power off
  arm64: report correct stack pointer in KSTK_ESP for compat tasks
  arm64: Add brackets around user_stack_pointer()
  arm64: perf: don't rely on layout of pt_regs when grabbing sp or pc
  arm64: ptrace: fix compat reg getter/setter return values
  arm64: ptrace: fix compat hardware watchpoint reporting
  arm64: Remove unused variable in head.S
  arm64/crypto: remove redundant update of data
parents f16c15a0 5e39977e

arch/arm64/crypto/sha2-ce-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static void sha2_finup(struct shash_desc *desc, const u8 *data, 
	kernel_neon_begin_partial(28);

	sha2_ce_transform(blocks, data, sctx->state, NULL, len);

	kernel_neon_end();

	data += blocks * SHA256_BLOCK_SIZE;

}



static int sha224_finup(struct shash_desc *desc, const u8 *data,

arch/arm64/include/asm/hw_breakpoint.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static inline void decode_ctrl_reg(u32 reg, 
 */

#define ARM_MAX_BRP		16

#define ARM_MAX_WRP		16

#define ARM_MAX_HBP_SLOTS	(ARM_MAX_BRP + ARM_MAX_WRP)



/* Virtual debug register bases. */

#define AARCH64_DBG_REG_BVR	0

arch/arm64/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ extern struct task_struct *cpu_switch_to(struct task_struct *prev, 
	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)



#define KSTK_EIP(tsk)	((unsigned long)task_pt_regs(tsk)->pc)

#define KSTK_ESP(tsk)	((unsigned long)task_pt_regs(tsk)->sp)

#define KSTK_ESP(tsk)	user_stack_pointer(task_pt_regs(tsk))



/*

 * Prefetching support

arch/arm64/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct pt_regs { 
	(!((regs)->pstate & PSR_F_BIT))



#define user_stack_pointer(regs) \

	(!compat_user_mode(regs)) ? ((regs)->sp) : ((regs)->compat_sp)

	(!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp)



static inline unsigned long regs_return_value(struct pt_regs *regs)

{

arch/arm64/kernel/fpsimd.c

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static int fpsimd_cpu_pm_notifier(struct notifier_block *self, 
	case CPU_PM_ENTER:

		if (current->mm && !test_thread_flag(TIF_FOREIGN_FPSTATE))

			fpsimd_save_state(&current->thread.fpsimd_state);

		this_cpu_write(fpsimd_last_state, NULL);

		break;

	case CPU_PM_EXIT:

		if (current->mm)