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

Pull arm64 updates from Catalin Marinas:

 - "genirq: Introduce generic irq migration for cpu hotunplugged" patch
   merged from tip/irq/for-arm to allow the arm64-specific part to be
   upstreamed via the arm64 tree

 - CPU feature detection reworked to cope with heterogeneous systems
   where CPUs may not have exactly the same features.  The features
   reported by the kernel via internal data structures or ELF_HWCAP are
   delayed until all the CPUs are up (and before user space starts)

 - Support for 16KB pages, with the additional bonus of a 36-bit VA
   space, though the latter only depending on EXPERT

 - Implement native {relaxed, acquire, release} atomics for arm64

 - New ASID allocation algorithm which avoids IPI on roll-over, together
   with TLB invalidation optimisations (using local vs global where
   feasible)

 - KASan support for arm64

 - EFI_STUB clean-up and isolation for the kernel proper (required by
   KASan)

 - copy_{to,from,in}_user optimisations (sharing the memcpy template)

 - perf: moving arm64 to the arm32/64 shared PMU framework

 - L1_CACHE_BYTES increased to 128 to accommodate Cavium hardware

 - Support for the contiguous PTE hint on kernel mapping (16 consecutive
   entries may be able to use a single TLB entry)

 - Generic CONFIG_HZ now used on arm64

 - defconfig updates

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (91 commits)
  arm64/efi: fix libstub build under CONFIG_MODVERSIONS
  ARM64: Enable multi-core scheduler support by default
  arm64/efi: move arm64 specific stub C code to libstub
  arm64: page-align sections for DEBUG_RODATA
  arm64: Fix build with CONFIG_ZONE_DMA=n
  arm64: Fix compat register mappings
  arm64: Increase the max granular size
  arm64: remove bogus TASK_SIZE_64 check
  arm64: make Timer Interrupt Frequency selectable
  arm64/mm: use PAGE_ALIGNED instead of IS_ALIGNED
  arm64: cachetype: fix definitions of ICACHEF_* flags
  arm64: cpufeature: declare enable_cpu_capabilities as static
  genirq: Make the cpuhotplug migration code less noisy
  arm64: Constify hwcap name string arrays
  arm64/kvm: Make use of the system wide safe values
  arm64/debug: Make use of the system wide safe value
  arm64: Move FP/ASIMD hwcap handling to common code
  arm64/HWCAP: Use system wide safe values
  arm64/capabilities: Make use of system wide safe value
  arm64: Delay cpu feature capability checks
  ...

1 files changed, 6 insertions, 239 deletions

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 232247945b1c..8119479147db 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -28,7 +28,6 @@
 #include <linux/console.h>
 #include <linux/cache.h>
 #include <linux/bootmem.h>
-#include <linux/seq_file.h>
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
@@ -44,7 +43,6 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/efi.h>
-#include <linux/personality.h>
 #include <linux/psci.h>
 
 #include <asm/acpi.h>
@@ -54,6 +52,7 @@
 #include <asm/elf.h>
 #include <asm/cpufeature.h>
 #include <asm/cpu_ops.h>
+#include <asm/kasan.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/smp_plat.h>
@@ -64,23 +63,6 @@
 #include <asm/efi.h>
 #include <asm/xen/hypervisor.h>
 
-unsigned long elf_hwcap __read_mostly;
-EXPORT_SYMBOL_GPL(elf_hwcap);
-
-#ifdef CONFIG_COMPAT
-#define COMPAT_ELF_HWCAP_DEFAULT        \
-                                (COMPAT_HWCAP_HALF|COMPAT_HWCAP_THUMB|\
-                                 COMPAT_HWCAP_FAST_MULT|COMPAT_HWCAP_EDSP|\
-                                 COMPAT_HWCAP_TLS|COMPAT_HWCAP_VFP|\
-                                 COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\
-                                 COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV|\
-                                 COMPAT_HWCAP_LPAE)
-unsigned int compat_elf_hwcap __read_mostly = COMPAT_ELF_HWCAP_DEFAULT;
-unsigned int compat_elf_hwcap2 __read_mostly;
-#endif
-
-DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS);
-
 phys_addr_t __fdt_pointer __initdata;
 
 /*
@@ -195,104 +177,6 @@ static void __init smp_build_mpidr_hash(void)
         __flush_dcache_area(&mpidr_hash, sizeof(struct mpidr_hash));
 }
 
-static void __init setup_processor(void)
-{
-        u64 features;
-        s64 block;
-        u32 cwg;
-        int cls;
-
-        printk("CPU: AArch64 Processor [%08x] revision %d\n",
-               read_cpuid_id(), read_cpuid_id() & 15);
-
-        sprintf(init_utsname()->machine, ELF_PLATFORM);
-        elf_hwcap = 0;
-
-        cpuinfo_store_boot_cpu();
-
-        /*
-         * Check for sane CTR_EL0.CWG value.
-         */
-        cwg = cache_type_cwg();
-        cls = cache_line_size();
-        if (!cwg)
-                pr_warn("No Cache Writeback Granule information, assuming cache line size %d\n",
-                        cls);
-        if (L1_CACHE_BYTES < cls)
-                pr_warn("L1_CACHE_BYTES smaller than the Cache Writeback Granule (%d < %d)\n",
-                        L1_CACHE_BYTES, cls);
-
-        /*
-         * ID_AA64ISAR0_EL1 contains 4-bit wide signed feature blocks.
-         * The blocks we test below represent incremental functionality
-         * for non-negative values. Negative values are reserved.
-         */
-        features = read_cpuid(ID_AA64ISAR0_EL1);
-        block = cpuid_feature_extract_field(features, 4);
-        if (block > 0) {
-                switch (block) {
-                default:
-                case 2:
-                        elf_hwcap |= HWCAP_PMULL;
-                case 1:
-                        elf_hwcap |= HWCAP_AES;
-                case 0:
-                        break;
-                }
-        }
-
-        if (cpuid_feature_extract_field(features, 8) > 0)
-                elf_hwcap |= HWCAP_SHA1;
-
-        if (cpuid_feature_extract_field(features, 12) > 0)
-                elf_hwcap |= HWCAP_SHA2;
-
-        if (cpuid_feature_extract_field(features, 16) > 0)
-                elf_hwcap |= HWCAP_CRC32;
-
-        block = cpuid_feature_extract_field(features, 20);
-        if (block > 0) {
-                switch (block) {
-                default:
-                case 2:
-                        elf_hwcap |= HWCAP_ATOMICS;
-                case 1:
-                        /* RESERVED */
-                case 0:
-                        break;
-                }
-        }
-
-#ifdef CONFIG_COMPAT
-        /*
-         * ID_ISAR5_EL1 carries similar information as above, but pertaining to
-         * the AArch32 32-bit execution state.
-         */
-        features = read_cpuid(ID_ISAR5_EL1);
-        block = cpuid_feature_extract_field(features, 4);
-        if (block > 0) {
-                switch (block) {
-                default:
-                case 2:
-                        compat_elf_hwcap2 |= COMPAT_HWCAP2_PMULL;
-                case 1:
-                        compat_elf_hwcap2 |= COMPAT_HWCAP2_AES;
-                case 0:
-                        break;
-                }
-        }
-
-        if (cpuid_feature_extract_field(features, 8) > 0)
-                compat_elf_hwcap2 |= COMPAT_HWCAP2_SHA1;
-
-        if (cpuid_feature_extract_field(features, 12) > 0)
-                compat_elf_hwcap2 |= COMPAT_HWCAP2_SHA2;
-
-        if (cpuid_feature_extract_field(features, 16) > 0)
-                compat_elf_hwcap2 |= COMPAT_HWCAP2_CRC32;
-#endif
-}
-
 static void __init setup_machine_fdt(phys_addr_t dt_phys)
 {
         void *dt_virt = fixmap_remap_fdt(dt_phys);
@@ -406,8 +290,9 @@ u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
 
 void __init setup_arch(char **cmdline_p)
 {
-        setup_processor();
+        pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id());
 
+        sprintf(init_utsname()->machine, ELF_PLATFORM);
         init_mm.start_code = (unsigned long) _text;
         init_mm.end_code   = (unsigned long) _etext;
         init_mm.end_data   = (unsigned long) _edata;
@@ -436,6 +321,9 @@ void __init setup_arch(char **cmdline_p)
 
         paging_init();
         relocate_initrd();
+
+        kasan_init();
+
         request_standard_resources();
 
         early_ioremap_reset();
@@ -493,124 +381,3 @@ static int __init topology_init(void)
         return 0;
 }
 subsys_initcall(topology_init);
-
-static const char *hwcap_str[] = {
-        "fp",
-        "asimd",
-        "evtstrm",
-        "aes",
-        "pmull",
-        "sha1",
-        "sha2",
-        "crc32",
-        "atomics",
-        NULL
-};
-
-#ifdef CONFIG_COMPAT
-static const char *compat_hwcap_str[] = {
-        "swp",
-        "half",
-        "thumb",
-        "26bit",
-        "fastmult",
-        "fpa",
-        "vfp",
-        "edsp",
-        "java",
-        "iwmmxt",
-        "crunch",
-        "thumbee",
-        "neon",
-        "vfpv3",
-        "vfpv3d16",
-        "tls",
-        "vfpv4",
-        "idiva",
-        "idivt",
-        "vfpd32",
-        "lpae",
-        "evtstrm"
-};
-
-static const char *compat_hwcap2_str[] = {
-        "aes",
-        "pmull",
-        "sha1",
-        "sha2",
-        "crc32",
-        NULL
-};
-#endif /* CONFIG_COMPAT */
-
-static int c_show(struct seq_file *m, void *v)
-{
-        int i, j;
-
-        for_each_online_cpu(i) {
-                struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-                u32 midr = cpuinfo->reg_midr;
-
-                /*
-                 * glibc reads /proc/cpuinfo to determine the number of
-                 * online processors, looking for lines beginning with
-                 * "processor".  Give glibc what it expects.
-                 */
-                seq_printf(m, "processor\t: %d\n", i);
-
-                /*
-                 * Dump out the common processor features in a single line.
-                 * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-                 * rather than attempting to parse this, but there's a body of
-                 * software which does already (at least for 32-bit).
-                 */
-                seq_puts(m, "Features\t:");
-                if (personality(current->personality) == PER_LINUX32) {
-#ifdef CONFIG_COMPAT
-                        for (j = 0; compat_hwcap_str[j]; j++)
-                                if (compat_elf_hwcap & (1 << j))
-                                        seq_printf(m, " %s", compat_hwcap_str[j]);
-
-                        for (j = 0; compat_hwcap2_str[j]; j++)
-                                if (compat_elf_hwcap2 & (1 << j))
-                                        seq_printf(m, " %s", compat_hwcap2_str[j]);
-#endif /* CONFIG_COMPAT */
-                } else {
-                        for (j = 0; hwcap_str[j]; j++)
-                                if (elf_hwcap & (1 << j))
-                                        seq_printf(m, " %s", hwcap_str[j]);
-                }
-                seq_puts(m, "\n");
-
-                seq_printf(m, "CPU implementer\t: 0x%02x\n",
-                           MIDR_IMPLEMENTOR(midr));
-                seq_printf(m, "CPU architecture: 8\n");
-                seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-                seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-                seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-        }
-
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        return *pos < 1 ? (void *)1 : NULL;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        ++*pos;
-        return NULL;
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-
-const struct seq_operations cpuinfo_op = {
-        .start  = c_start,
-        .next   = c_next,
-        .stop   = c_stop,
-        .show   = c_show
-};