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

Pull arm64 updates from Will Deacon:
 "The big highlight is support for the Scalable Vector Extension (SVE)
  which required extensive ABI work to ensure we don't break existing
  applications by blowing away their signal stack with the rather large
  new vector context (<= 2 kbit per vector register). There's further
  work to be done optimising things like exception return, but the ABI
  is solid now.

  Much of the line count comes from some new PMU drivers we have, but
  they're pretty self-contained and I suspect we'll have more of them in
  future.

  Plenty of acronym soup here:

   - initial support for the Scalable Vector Extension (SVE)

   - improved handling for SError interrupts (required to handle RAS
     events)

   - enable GCC support for 128-bit integer types

   - remove kernel text addresses from backtraces and register dumps

   - use of WFE to implement long delay()s

   - ACPI IORT updates from Lorenzo Pieralisi

   - perf PMU driver for the Statistical Profiling Extension (SPE)

   - perf PMU driver for Hisilicon's system PMUs

   - misc cleanups and non-critical fixes"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (97 commits)
  arm64: Make ARMV8_DEPRECATED depend on SYSCTL
  arm64: Implement __lshrti3 library function
  arm64: support __int128 on gcc 5+
  arm64/sve: Add documentation
  arm64/sve: Detect SVE and activate runtime support
  arm64/sve: KVM: Hide SVE from CPU features exposed to guests
  arm64/sve: KVM: Treat guest SVE use as undefined instruction execution
  arm64/sve: KVM: Prevent guests from using SVE
  arm64/sve: Add sysctl to set the default vector length for new processes
  arm64/sve: Add prctl controls for userspace vector length management
  arm64/sve: ptrace and ELF coredump support
  arm64/sve: Preserve SVE registers around EFI runtime service calls
  arm64/sve: Preserve SVE registers around kernel-mode NEON use
  arm64/sve: Probe SVE capabilities and usable vector lengths
  arm64: cpufeature: Move sys_caps_initialised declarations
  arm64/sve: Backend logic for setting the vector length
  arm64/sve: Signal handling support
  arm64/sve: Support vector length resetting for new processes
  arm64/sve: Core task context handling
  arm64/sve: Low-level CPU setup
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/arch_timer.h
Simple merge

diff --cc arch/arm64/Kconfig
index b907bf4403b5f4bf4fe90a57fc0297268e4fbe9c,df296b79ea15339b366d9713795e913a86481e60..ba6aab55d46446cc15399ba43bf7a51c73af8ccd
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -21,25 -21,8 +21,25 @@@ config ARM6
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG
 +      select ARCH_INLINE_READ_LOCK if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_BH if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPT
        select ARCH_USE_CMPXCHG_LOCKREF
 +      select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_SUPPORTS_MEMORY_FAILURE
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_NUMA_BALANCING

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

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

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

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

diff --cc arch/arm64/kernel/Makefile
Simple merge

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

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

diff --cc arch/arm64/kernel/fpsimd.c
index 5d547deb6996c0091c64f14de18b5b8a75c88ae4,931fd8dca91a9c8f47e2625f16d3cb65158e28b7..143b3e72c25e6c1b51c75582148c74ffe95a1a97
--- 1/arch/arm64/kernel/fpsimd.c
--- 2/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@@ -442,6 -1296,6 +1296,6 @@@ static int __init fpsimd_init(void
        if (!(elf_hwcap & HWCAP_ASIMD))
                pr_notice("Advanced SIMD is not implemented\n");
  
-       return 0;
+       return sve_sysctl_init();
  }
 -late_initcall(fpsimd_init);
 +core_initcall(fpsimd_init);

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

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

diff --cc arch/arm64/lib/Makefile
Simple merge

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

diff --cc drivers/acpi/arm64/iort.c
index de56394dd161f7813b7f5bce64321d3196bc4904,7dc964f4d8f1ce035a20623c34294bdacfa902a0..95255ecfae7c7c0725ee8ebbde612d93a71966a9
--- 1/drivers/acpi/arm64/iort.c
--- 2/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@@ -1215,7 -1326,7 +1357,8 @@@ static void __init iort_init_platform_d
        struct acpi_table_iort *iort;
        struct fwnode_handle *fwnode;
        int i, ret;
 +      bool acs_enabled = false;
+       const struct iort_dev_config *ops;
  
        /*
         * iort_table and iort both point to the start of IORT table, but
@@@ -1235,12 -1346,8 +1378,11 @@@
                        return;
                }
  
-               if ((iort_node->type == ACPI_IORT_NODE_SMMU) ||
-                       (iort_node->type == ACPI_IORT_NODE_SMMU_V3)) {
- 
 +              if (!acs_enabled)
 +                      acs_enabled = iort_enable_acs(iort_node);
 +
+               ops = iort_get_dev_cfg(iort_node);
+               if (ops) {
                        fwnode = acpi_alloc_fwnode_static();
                        if (!fwnode)
                                return;

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge

diff --cc drivers/perf/Makefile
index 9402dc8ff22c6704be251beb7665513d6916ffdd,4f5815d3126c2b9b2095ab05d85d8d4ed447337e..710a0135bd619203b587cfe60f9614f80cadbd11
--- 1/drivers/perf/Makefile
--- 2/drivers/perf/Makefile
+++ b/drivers/perf/Makefile
@@@ -1,6 -1,6 +1,7 @@@
 +# SPDX-License-Identifier: GPL-2.0
  obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
  obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
+ obj-$(CONFIG_HISI_PMU) += hisilicon/
  obj-$(CONFIG_QCOM_L2_PMU)     += qcom_l2_pmu.o
  obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o
  obj-$(CONFIG_XGENE_PMU) += xgene_pmu.o

diff --cc drivers/perf/arm_pmu_platform.c
Simple merge

diff --cc include/linux/cpuhotplug.h
Simple merge

diff --cc include/linux/irqdesc.h
Simple merge

diff --cc include/uapi/linux/elf.h
Simple merge

diff --cc include/uapi/linux/perf_event.h
Simple merge

diff --cc include/uapi/linux/prctl.h
Simple merge

diff --cc kernel/events/ring_buffer.c
Simple merge

diff --cc kernel/irq/irqdesc.c
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc virt/kvm/arm/arm.c
Simple merge