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

Pull arm64 updates from Will Deacon:
 "It's a bit all over the place this time with no "killer feature" to
  speak of.  Support for mismatched cache line sizes should help people
  seeing whacky JIT failures on some SoCs, and the big.LITTLE perf
  updates have been a long time coming, but a lot of the changes here
  are cleanups.

  We stray outside arch/arm64 in a few areas: the arch/arm/ arch_timer
  workaround is acked by Russell, the DT/OF bits are acked by Rob, the
  arch_timer clocksource changes acked by Marc, CPU hotplug by tglx and
  jump_label by Peter (all CC'd).

  Summary:

   - Support for execute-only page permissions
   - Support for hibernate and DEBUG_PAGEALLOC
   - Support for heterogeneous systems with mismatches cache line sizes
   - Errata workarounds (A53 843419 update and QorIQ A-008585 timer bug)
   - arm64 PMU perf updates, including cpumasks for heterogeneous systems
   - Set UTS_MACHINE for building rpm packages
   - Yet another head.S tidy-up
   - Some cleanups and refactoring, particularly in the NUMA code
   - Lots of random, non-critical fixes across the board"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (100 commits)
  arm64: tlbflush.h: add __tlbi() macro
  arm64: Kconfig: remove SMP dependence for NUMA
  arm64: Kconfig: select OF/ACPI_NUMA under NUMA config
  arm64: fix dump_backtrace/unwind_frame with NULL tsk
  arm/arm64: arch_timer: Use archdata to indicate vdso suitability
  arm64: arch_timer: Work around QorIQ Erratum A-008585
  arm64: arch_timer: Add device tree binding for A-008585 erratum
  arm64: Correctly bounds check virt_addr_valid
  arm64: migrate exception table users off module.h and onto extable.h
  arm64: pmu: Hoist pmu platform device name
  arm64: pmu: Probe default hw/cache counters
  arm64: pmu: add fallback probe table
  MAINTAINERS: Update ARM PMU PROFILING AND DEBUGGING entry
  arm64: Improve kprobes test for atomic sequence
  arm64/kvm: use alternative auto-nop
  arm64: use alternative auto-nop
  arm64: alternative: add auto-nop infrastructure
  arm64: lse: convert lse alternatives NOP padding to use __nops
  arm64: barriers: introduce nops and __nops macros for NOP sequences
  arm64: sysreg: replace open-coded mrs_s/msr_s with {read,write}_sysreg_s
  ...

2 files changed, 29 insertions, 20 deletions

diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 15063851cd10..b9423491b9d7 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -596,12 +596,6 @@ static struct attribute_group armv7_pmuv1_events_attr_group = {
         .attrs = armv7_pmuv1_event_attrs,
 };
 
-static const struct attribute_group *armv7_pmuv1_attr_groups[] = {
-        &armv7_pmuv1_events_attr_group,
-        &armv7_pmu_format_attr_group,
-        NULL,
-};
-
 ARMV7_EVENT_ATTR(mem_access, ARMV7_PERFCTR_MEM_ACCESS);
 ARMV7_EVENT_ATTR(l1i_cache, ARMV7_PERFCTR_L1_ICACHE_ACCESS);
 ARMV7_EVENT_ATTR(l1d_cache_wb, ARMV7_PERFCTR_L1_DCACHE_WB);
@@ -653,12 +647,6 @@ static struct attribute_group armv7_pmuv2_events_attr_group = {
         .attrs = armv7_pmuv2_event_attrs,
 };
 
-static const struct attribute_group *armv7_pmuv2_attr_groups[] = {
-        &armv7_pmuv2_events_attr_group,
-        &armv7_pmu_format_attr_group,
-        NULL,
-};
-
 /*
  * Perf Events' indices
  */
@@ -1208,7 +1196,10 @@ static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)
         armv7pmu_init(cpu_pmu);
         cpu_pmu->name           = "armv7_cortex_a8";
         cpu_pmu->map_event      = armv7_a8_map_event;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv1_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv1_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1217,7 +1208,10 @@ static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)
         armv7pmu_init(cpu_pmu);
         cpu_pmu->name           = "armv7_cortex_a9";
         cpu_pmu->map_event      = armv7_a9_map_event;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv1_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv1_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1226,7 +1220,10 @@ static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)
         armv7pmu_init(cpu_pmu);
         cpu_pmu->name           = "armv7_cortex_a5";
         cpu_pmu->map_event      = armv7_a5_map_event;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv1_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv1_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1236,7 +1233,10 @@ static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)
         cpu_pmu->name           = "armv7_cortex_a15";
         cpu_pmu->map_event      = armv7_a15_map_event;
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv2_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv2_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1246,7 +1246,10 @@ static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu)
         cpu_pmu->name           = "armv7_cortex_a7";
         cpu_pmu->map_event      = armv7_a7_map_event;
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv2_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv2_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1256,7 +1259,10 @@ static int armv7_a12_pmu_init(struct arm_pmu *cpu_pmu)
         cpu_pmu->name           = "armv7_cortex_a12";
         cpu_pmu->map_event      = armv7_a12_map_event;
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-        cpu_pmu->pmu.attr_groups = armv7_pmuv2_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv2_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return armv7_probe_num_events(cpu_pmu);
 }
 
@@ -1264,7 +1270,10 @@ static int armv7_a17_pmu_init(struct arm_pmu *cpu_pmu)
 {
         int ret = armv7_a12_pmu_init(cpu_pmu);
         cpu_pmu->name = "armv7_cortex_a17";
-        cpu_pmu->pmu.attr_groups = armv7_pmuv2_attr_groups;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =
+                &armv7_pmuv2_events_attr_group;
+        cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =
+                &armv7_pmu_format_attr_group;
         return ret;
 }
 
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c
index 994e971a8538..a0affd14086a 100644
--- a/arch/arm/kernel/vdso.c
+++ b/arch/arm/kernel/vdso.c
@@ -270,7 +270,7 @@ static bool tk_is_cntvct(const struct timekeeper *tk)
         if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
                 return false;
 
-        if (strcmp(tk->tkr_mono.clock->name, "arch_sys_counter") != 0)
+        if (!tk->tkr_mono.clock->archdata.vdso_direct)
                 return false;
 
         return true;