Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.15

This cycle has been real quiet for me. There's only the one trivial
patch that somewhat simplifies DT parsing in the i2c-mux-reg driver.

5 files changed, 54 insertions, 22 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 3d4c3b5e1868..0c977b6e0f8b 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -586,7 +586,7 @@ static void print_sample_brstack(struct perf_sample *sample,
                         thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, to, &alt);
                 }
 
-                printf("0x%"PRIx64, from);
+                printf(" 0x%"PRIx64, from);
                 if (PRINT_FIELD(DSO)) {
                         printf("(");
                         map__fprintf_dsoname(alf.map, stdout);
@@ -681,7 +681,7 @@ static void print_sample_brstackoff(struct perf_sample *sample,
                 if (alt.map && !alt.map->dso->adjust_symbols)
                         to = map__map_ip(alt.map, to);
 
-                printf("0x%"PRIx64, from);
+                printf(" 0x%"PRIx64, from);
                 if (PRINT_FIELD(DSO)) {
                         printf("(");
                         map__fprintf_dsoname(alf.map, stdout);
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index be09d77cade0..a971caf3759d 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -685,6 +685,8 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
 {
         struct symbol *sym = node->sym;
         u64 left, right;
+        struct dso *left_dso = NULL;
+        struct dso *right_dso = NULL;
 
         if (callchain_param.key == CCKEY_SRCLINE) {
                 enum match_result match = match_chain_srcline(node, cnode);
@@ -696,12 +698,14 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
         if (cnode->ms.sym && sym && callchain_param.key == CCKEY_FUNCTION) {
                 left = cnode->ms.sym->start;
                 right = sym->start;
+                left_dso = cnode->ms.map->dso;
+                right_dso = node->map->dso;
         } else {
                 left = cnode->ip;
                 right = node->ip;
         }
 
-        if (left == right) {
+        if (left == right && left_dso == right_dso) {
                 if (node->branch) {
                         cnode->branch_count++;
 
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f6257fb4f08c..39b15968eab1 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -309,10 +309,11 @@ static char *get_config_name(struct list_head *head_terms)
 static struct perf_evsel *
 __add_event(struct list_head *list, int *idx,
             struct perf_event_attr *attr,
-            char *name, struct cpu_map *cpus,
+            char *name, struct perf_pmu *pmu,
             struct list_head *config_terms, bool auto_merge_stats)
 {
         struct perf_evsel *evsel;
+        struct cpu_map *cpus = pmu ? pmu->cpus : NULL;
 
         event_attr_init(attr);
 
@@ -323,7 +324,7 @@ __add_event(struct list_head *list, int *idx,
         (*idx)++;
         evsel->cpus        = cpu_map__get(cpus);
         evsel->own_cpus    = cpu_map__get(cpus);
-        evsel->system_wide = !!cpus;
+        evsel->system_wide = pmu ? pmu->is_uncore : false;
         evsel->auto_merge_stats = auto_merge_stats;
 
         if (name)
@@ -1233,7 +1234,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,
 
         if (!head_config) {
                 attr.type = pmu->type;
-                evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu->cpus, NULL, auto_merge_stats);
+                evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu, NULL, auto_merge_stats);
                 return evsel ? 0 : -ENOMEM;
         }
 
@@ -1254,7 +1255,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,
                 return -EINVAL;
 
         evsel = __add_event(list, &parse_state->idx, &attr,
-                            get_config_name(head_config), pmu->cpus,
+                            get_config_name(head_config), pmu,
                             &config_terms, auto_merge_stats);
         if (evsel) {
                 evsel->unit = info.unit;
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index ac16a9db1fb5..1c4d7b4e4fb5 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -470,17 +470,36 @@ static void pmu_read_sysfs(void)
         closedir(dir);
 }
 
+static struct cpu_map *__pmu_cpumask(const char *path)
+{
+        FILE *file;
+        struct cpu_map *cpus;
+
+        file = fopen(path, "r");
+        if (!file)
+                return NULL;
+
+        cpus = cpu_map__read(file);
+        fclose(file);
+        return cpus;
+}
+
+/*
+ * Uncore PMUs have a "cpumask" file under sysfs. CPU PMUs (e.g. on arm/arm64)
+ * may have a "cpus" file.
+ */
+#define CPUS_TEMPLATE_UNCORE    "%s/bus/event_source/devices/%s/cpumask"
+#define CPUS_TEMPLATE_CPU       "%s/bus/event_source/devices/%s/cpus"
+
 static struct cpu_map *pmu_cpumask(const char *name)
 {
-        struct stat st;
         char path[PATH_MAX];
-        FILE *file;
         struct cpu_map *cpus;
         const char *sysfs = sysfs__mountpoint();
         const char *templates[] = {
-                 "%s/bus/event_source/devices/%s/cpumask",
-                 "%s/bus/event_source/devices/%s/cpus",
-                 NULL
+                CPUS_TEMPLATE_UNCORE,
+                CPUS_TEMPLATE_CPU,
+                NULL
         };
         const char **template;
 
@@ -489,20 +508,25 @@ static struct cpu_map *pmu_cpumask(const char *name)
 
         for (template = templates; *template; template++) {
                 snprintf(path, PATH_MAX, *template, sysfs, name);
-                if (stat(path, &st) == 0)
-                        break;
+                cpus = __pmu_cpumask(path);
+                if (cpus)
+                        return cpus;
         }
 
-        if (!*template)
-                return NULL;
+        return NULL;
+}
 
-        file = fopen(path, "r");
-        if (!file)
-                return NULL;
+static bool pmu_is_uncore(const char *name)
+{
+        char path[PATH_MAX];
+        struct cpu_map *cpus;
+        const char *sysfs = sysfs__mountpoint();
 
-        cpus = cpu_map__read(file);
-        fclose(file);
-        return cpus;
+        snprintf(path, PATH_MAX, CPUS_TEMPLATE_UNCORE, sysfs, name);
+        cpus = __pmu_cpumask(path);
+        cpu_map__put(cpus);
+
+        return !!cpus;
 }
 
 /*
@@ -617,6 +641,8 @@ static struct perf_pmu *pmu_lookup(const char *name)
 
         pmu->cpus = pmu_cpumask(name);
 
+        pmu->is_uncore = pmu_is_uncore(name);
+
         INIT_LIST_HEAD(&pmu->format);
         INIT_LIST_HEAD(&pmu->aliases);
         list_splice(&format, &pmu->format);
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 389e9729331f..fe0de0502ce2 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -22,6 +22,7 @@ struct perf_pmu {
         char *name;
         __u32 type;
         bool selectable;
+        bool is_uncore;
         struct perf_event_attr *default_config;
         struct cpu_map *cpus;
         struct list_head format;  /* HEAD struct perf_pmu_format -> list */