3 files changed, 40 insertions, 23 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 40ecd5f514a2..f676febbb270 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -88,6 +88,8 @@ void __init arm_dt_init_cpu_maps(void)
                 return;
 
         for_each_child_of_node(cpus, cpu) {
+                const __be32 *cell;
+                int prop_bytes;
                 u32 hwid;
 
                 if (of_node_cmp(cpu->type, "cpu"))
@@ -99,7 +101,8 @@ void __init arm_dt_init_cpu_maps(void)
                  * properties is considered invalid to build the
                  * cpu_logical_map.
                  */
-                if (of_property_read_u32(cpu, "reg", &hwid)) {
+                cell = of_get_property(cpu, "reg", &prop_bytes);
+                if (!cell || prop_bytes < sizeof(*cell)) {
                         pr_debug(" * %s missing reg property\n",
                                      cpu->full_name);
                         of_node_put(cpu);
@@ -107,10 +110,15 @@ void __init arm_dt_init_cpu_maps(void)
                 }
 
                 /*
-                 * 8 MSBs must be set to 0 in the DT since the reg property
+                 * Bits n:24 must be set to 0 in the DT since the reg property
                  * defines the MPIDR[23:0].
                  */
-                if (hwid & ~MPIDR_HWID_BITMASK) {
+                do {
+                        hwid = be32_to_cpu(*cell++);
+                        prop_bytes -= sizeof(*cell);
+                } while (!hwid && prop_bytes > 0);
+
+                if (prop_bytes || (hwid & ~MPIDR_HWID_BITMASK)) {
                         of_node_put(cpu);
                         return;
                 }
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;