Merge remote-tracking branch 'arm64/for-next/fixes' into for-next/core

* arm64/for-next/fixes: (26 commits)
  arm64: mte: fix prctl(PR_GET_TAGGED_ADDR_CTRL) if TCF0=NONE
  arm64: mte: Fix typo in macro definition
  arm64: entry: fix EL1 debug transitions
  arm64: entry: fix NMI {user, kernel}->kernel transitions
  arm64: entry: fix non-NMI kernel<->kernel transitions
  arm64: ptrace: prepare for EL1 irq/rcu tracking
  arm64: entry: fix non-NMI user<->kernel transitions
  arm64: entry: move el1 irq/nmi logic to C
  arm64: entry: prepare ret_to_user for function call
  arm64: entry: move enter_from_user_mode to entry-common.c
  arm64: entry: mark entry code as noinstr
  arm64: mark idle code as noinstr
  arm64: syscall: exit userspace before unmasking exceptions
  arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect()
  arm64: pgtable: Fix pte_accessible()
  ACPI/IORT: Fix doc warnings in iort.c
  arm64/fpsimd: add <asm/insn.h> to <asm/kprobes.h> to fix fpsimd build
  arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver
  arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
  arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
  ...

# Conflicts:
#	arch/arm64/include/asm/exception.h
#	arch/arm64/kernel/sdei.c

diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge

diff --cc arch/arm64/include/asm/exception.h
index 2a8aa1884d8abc6a0ca19b844845526582abc55c,0756191f44f644b9a3153dd584cda74ecc75dd4e..78537393b6506be7ff4d6fdc112843a6aa9b1733
--- 1/arch/arm64/include/asm/exception.h
--- 2/arch/arm64/include/asm/exception.h
+++ b/arch/arm64/include/asm/exception.h
@@@ -31,8 -31,13 +31,13 @@@ static inline u32 disr_to_esr(u64 disr
        return esr;
  }
  
+ asmlinkage void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs);
+ asmlinkage void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs);
  asmlinkage void enter_from_user_mode(void);
 -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
+ asmlinkage void exit_to_user_mode(void);
+ void arm64_enter_nmi(struct pt_regs *regs);
+ void arm64_exit_nmi(struct pt_regs *regs);
 +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs);
  void do_undefinstr(struct pt_regs *regs);
  void do_bti(struct pt_regs *regs);
  asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc arch/arm64/include/asm/ptrace.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/entry-common.c
index dbbddfbf4a720faf03f39ec681fb0cb0553a96d8,70e0a7591245d6a1cc1ec07c3e13a3d8e10f95e7..5346953e4382e9424079ad52cffe69f4e83bc6bc
--- 1/arch/arm64/kernel/entry-common.c
--- 2/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@@ -21,12 -113,15 +113,14 @@@ static void noinstr el1_abort(struct pt
  {
        unsigned long far = read_sysreg(far_el1);
  
+       enter_from_kernel_mode(regs);
        local_daif_inherit(regs);
 -      far = untagged_addr(far);
        do_mem_abort(far, esr, regs);
+       local_daif_mask();
+       exit_to_kernel_mode(regs);
  }
- NOKPROBE_SYMBOL(el1_abort);
  
- static void notrace el1_pc(struct pt_regs *regs, unsigned long esr)
+ static void noinstr el1_pc(struct pt_regs *regs, unsigned long esr)
  {
        unsigned long far = read_sysreg(far_el1);
  
@@@ -111,13 -254,13 +253,12 @@@ static void noinstr el0_da(struct pt_re
  {
        unsigned long far = read_sysreg(far_el1);
  
-       user_exit_irqoff();
+       enter_from_user_mode();
        local_daif_restore(DAIF_PROCCTX);
 -      far = untagged_addr(far);
        do_mem_abort(far, esr, regs);
  }
- NOKPROBE_SYMBOL(el0_da);
  
- static void notrace el0_ia(struct pt_regs *regs, unsigned long esr)
+ static void noinstr el0_ia(struct pt_regs *regs, unsigned long esr)
  {
        unsigned long far = read_sysreg(far_el1);
  

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/irq.c
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/proton-pack.c
Simple merge

diff --cc arch/arm64/kernel/sdei.c
index 35298f4e3fafc351573b5d633be0e7e503c30ec4,793c46d6a44791c11eee1600956ec3f35c54050f..2c7ca449dd5111206fa8559065fd95ce2858dcf9
--- 1/arch/arm64/kernel/sdei.c
--- 2/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@@ -292,40 -223,13 +293,40 @@@ static __kprobes unsigned long _sdei_ha
        return vbar + 0x480;
  }
  
 +static void __kprobes notrace __sdei_pstate_entry(void)
 +{
 +      /*
 +       * The original SDEI spec (ARM DEN 0054A) can be read ambiguously as to
 +       * whether PSTATE bits are inherited unchanged or generated from
 +       * scratch, and the TF-A implementation always clears PAN and always
 +       * clears UAO. There are no other known implementations.
 +       *
 +       * Subsequent revisions (ARM DEN 0054B) follow the usual rules for how
 +       * PSTATE is modified upon architectural exceptions, and so PAN is
 +       * either inherited or set per SCTLR_ELx.SPAN, and UAO is always
 +       * cleared.
 +       *
 +       * We must explicitly reset PAN to the expected state, including
 +       * clearing it when the host isn't using it, in case a VM had it set.
 +       */
 +      if (system_uses_hw_pan())
 +              set_pstate_pan(1);
 +      else if (cpu_has_pan())
 +              set_pstate_pan(0);
 +}
  
- asmlinkage __kprobes notrace unsigned long
+ asmlinkage noinstr unsigned long
  __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
  {
        unsigned long ret;
  
-       nmi_enter();
 +      /*
 +       * We didn't take an exception to get here, so the HW hasn't
 +       * set/cleared bits in PSTATE that we may rely on. Initialize PAN.
 +       */
 +      __sdei_pstate_entry();
 +
+       arm64_enter_nmi(regs);
  
        ret = _sdei_handler(regs, arg);
  

diff --cc arch/arm64/kernel/smp.c
Simple merge

diff --cc arch/arm64/kernel/syscall.c
index fe3fa8fd13c8383eeab1f9a879c99d45f43ecb68,f8f758e4a3064e961a8b3d74cb6535574ecaa561..f61e9d8cc55a1efe2cda0bb94f67177bb79acef6
--- 1/arch/arm64/kernel/syscall.c
--- 2/arch/arm64/kernel/syscall.c
+++ b/arch/arm64/kernel/syscall.c
@@@ -121,9 -121,8 +121,8 @@@ static void el0_svc_common(struct pt_re
  
        cortex_a76_erratum_1463225_svc_handler();
        local_daif_restore(DAIF_PROCCTX);
-       user_exit();
  
 -      if (system_supports_mte() && (flags & _TIF_MTE_ASYNC_FAULT)) {
 +      if (flags & _TIF_MTE_ASYNC_FAULT) {
                /*
                 * Process the asynchronous tag check fault before the actual
                 * syscall. do_notify_resume() will send a signal to userspace

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc arch/arm64/mm/mmu.c
Simple merge

diff --cc drivers/acpi/arm64/iort.c
Simple merge

diff --cc kernel/rcu/tree.c
Simple merge