perf/arm-cmn: Rename filter variables for clarity

CMN has already grown many more event-specific filters than the original
Occupancy ID, but since they are all independent of each other we've
just overloaded them onto the same name. Before we add yet more, and
they begin to overlap, rename all our "occupid" variables to "filter" so
that things can be a bit clearer and more consistent (but leaving the
format attribute itself, to avoid UAPI concerns).

Reviewed-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 50402bc..2a8a67d 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -163,13 +163,13 @@
 /* Event attributes */
 #define CMN_CONFIG_TYPE                        GENMASK_ULL(15, 0)
 #define CMN_CONFIG_EVENTID             GENMASK_ULL(26, 16)
-#define CMN_CONFIG_OCCUPID             GENMASK_ULL(30, 27)
+#define CMN_CONFIG_FILTER              GENMASK_ULL(30, 27)
 #define CMN_CONFIG_BYNODEID            BIT_ULL(31)
 #define CMN_CONFIG_NODEID              GENMASK_ULL(47, 32)
 
 #define CMN_EVENT_TYPE(event)          FIELD_GET(CMN_CONFIG_TYPE, (event)->attr.config)
 #define CMN_EVENT_EVENTID(event)       FIELD_GET(CMN_CONFIG_EVENTID, (event)->attr.config)
-#define CMN_EVENT_OCCUPID(event)       FIELD_GET(CMN_CONFIG_OCCUPID, (event)->attr.config)
+#define CMN_EVENT_FILTER(event)                FIELD_GET(CMN_CONFIG_FILTER, (event)->attr.config)
 #define CMN_EVENT_BYNODEID(event)      FIELD_GET(CMN_CONFIG_BYNODEID, (event)->attr.config)
 #define CMN_EVENT_NODEID(event)                FIELD_GET(CMN_CONFIG_NODEID, (event)->attr.config)
 
@@ -301,7 +301,7 @@ struct arm_cmn_node {
        struct {
                u8 val : 4;
                u8 count : 4;
-       } occupid[SEL_MAX];
+       } filter[SEL_MAX];
        union {
                u8 event[4];
                __le32 event_sel;
@@ -672,7 +672,7 @@ struct arm_cmn_event_attr {
        enum cmn_node_type type;
        enum cmn_filter_select fsel;
        u16 eventid;
-       u8 occupid;
+       u8 filter;
 };
 
 struct arm_cmn_format_attr {
@@ -681,13 +681,13 @@ struct arm_cmn_format_attr {
        int config;
 };
 
-#define _CMN_EVENT_ATTR(_model, _name, _type, _eventid, _occupid, _fsel)\
+#define _CMN_EVENT_ATTR(_model, _name, _type, _eventid, _filter, _fsel)\
        (&((struct arm_cmn_event_attr[]) {{                             \
                .attr = __ATTR(_name, 0444, arm_cmn_event_show, NULL),  \
                .model = _model,                                        \
                .type = _type,                                          \
                .eventid = _eventid,                                    \
-               .occupid = _occupid,                                    \
+               .filter = _filter,                                      \
                .fsel = _fsel,                                          \
        }})[0].attr.attr)
 #define CMN_EVENT_ATTR(_model, _name, _type, _eventid)                 \
@@ -709,8 +709,8 @@ static ssize_t arm_cmn_event_show(struct device *dev,
                                  eattr->type, eattr->eventid);
 
        if (eattr->fsel > SEL_NONE)
-               return sysfs_emit(buf, "type=0x%x,eventid=0x%x,occupid=0x%x\n",
-                                 eattr->type, eattr->eventid, eattr->occupid);
+               return sysfs_emit(buf, "type=0x%x,eventid=0x%x,filter=0x%x\n",
+                                 eattr->type, eattr->eventid, eattr->filter);
 
        return sysfs_emit(buf, "type=0x%x,eventid=0x%x\n", eattr->type,
                          eattr->eventid);
@@ -1320,7 +1320,7 @@ static ssize_t arm_cmn_format_show(struct device *dev,
 static struct attribute *arm_cmn_format_attrs[] = {
        CMN_FORMAT_ATTR(type, CMN_CONFIG_TYPE),
        CMN_FORMAT_ATTR(eventid, CMN_CONFIG_EVENTID),
-       CMN_FORMAT_ATTR(occupid, CMN_CONFIG_OCCUPID),
+       CMN_FORMAT_ATTR(filter, CMN_CONFIG_FILTER),
        CMN_FORMAT_ATTR(bynodeid, CMN_CONFIG_BYNODEID),
        CMN_FORMAT_ATTR(nodeid, CMN_CONFIG_NODEID),
 
@@ -1333,6 +1333,9 @@ static struct attribute *arm_cmn_format_attrs[] = {
        _CMN_FORMAT_ATTR(wp_val, 1, CMN_CONFIG1_WP_VAL),
        _CMN_FORMAT_ATTR(wp_mask, 2, CMN_CONFIG2_WP_MASK),
 
+       /* Old name for UAPI compatibility */
+       CMN_FORMAT_ATTR(occupid, CMN_CONFIG_FILTER),
+
        NULL
 };
 
@@ -1544,30 +1547,30 @@ static void arm_cmn_event_read(struct perf_event *event)
 }
 
 static int arm_cmn_set_event_sel_hi(struct arm_cmn_node *dn,
-                                   enum cmn_filter_select fsel, u8 occupid)
+                                   enum cmn_filter_select fsel, u8 filter)
 {
        u64 reg;
 
        if (fsel == SEL_NONE)
                return 0;
 
-       if (!dn->occupid[fsel].count) {
-               dn->occupid[fsel].val = occupid;
+       if (!dn->filter[fsel].count) {
+               dn->filter[fsel].val = filter;
                reg = FIELD_PREP(CMN__PMU_CBUSY_SNTHROTTLE_SEL,
-                                dn->occupid[SEL_CBUSY_SNTHROTTLE_SEL].val) |
+                                dn->filter[SEL_CBUSY_SNTHROTTLE_SEL].val) |
                      FIELD_PREP(CMN__PMU_SN_HOME_SEL,
-                                dn->occupid[SEL_SN_HOME_SEL].val) |
+                                dn->filter[SEL_SN_HOME_SEL].val) |
                      FIELD_PREP(CMN__PMU_HBT_LBT_SEL,
-                                dn->occupid[SEL_HBT_LBT_SEL].val) |
+                                dn->filter[SEL_HBT_LBT_SEL].val) |
                      FIELD_PREP(CMN__PMU_CLASS_OCCUP_ID,
-                                dn->occupid[SEL_CLASS_OCCUP_ID].val) |
+                                dn->filter[SEL_CLASS_OCCUP_ID].val) |
                      FIELD_PREP(CMN__PMU_OCCUP1_ID,
-                                dn->occupid[SEL_OCCUP1ID].val);
+                                dn->filter[SEL_OCCUP1ID].val);
                writel_relaxed(reg >> 32, dn->pmu_base + CMN_PMU_EVENT_SEL + 4);
-       } else if (dn->occupid[fsel].val != occupid) {
+       } else if (dn->filter[fsel].val != filter) {
                return -EBUSY;
        }
-       dn->occupid[fsel].count++;
+       dn->filter[fsel].count++;
        return 0;
 }
 
@@ -1649,7 +1652,7 @@ static void arm_cmn_event_stop(struct perf_event *event, int flags)
 
 struct arm_cmn_val {
        u8 dtm_count[CMN_MAX_DTMS];
-       u8 occupid[CMN_MAX_DTMS][SEL_MAX];
+       u8 filter[CMN_MAX_DTMS][SEL_MAX];
        u8 wp[CMN_MAX_DTMS][4];
        u8 wp_combine[CMN_MAX_DTMS][2];
        int dtc_count[CMN_MAX_DTCS];
@@ -1694,7 +1697,7 @@ static void arm_cmn_val_add_event(struct arm_cmn *cmn, struct arm_cmn_val *val,
                val->dtm_count[dtm]++;
 
                if (sel > SEL_NONE)
-                       val->occupid[dtm][sel] = CMN_EVENT_OCCUPID(event) + 1;
+                       val->filter[dtm][sel] = CMN_EVENT_FILTER(event) + 1;
 
                if (type != CMN_TYPE_WP)
                        continue;
@@ -1745,8 +1748,8 @@ static int arm_cmn_validate_group(struct arm_cmn *cmn, struct perf_event *event)
                if (val->dtm_count[dtm] == CMN_DTM_NUM_COUNTERS)
                        goto done;
 
-               if (sel > SEL_NONE && val->occupid[dtm][sel] &&
-                   val->occupid[dtm][sel] != CMN_EVENT_OCCUPID(event) + 1)
+               if (sel > SEL_NONE && val->filter[dtm][sel] &&
+                   val->filter[dtm][sel] != CMN_EVENT_FILTER(event) + 1)
                        goto done;
 
                if (type != CMN_TYPE_WP)
@@ -1892,7 +1895,7 @@ static void arm_cmn_event_clear(struct arm_cmn *cmn, struct perf_event *event,
                }
 
                if (hw->filter_sel > SEL_NONE)
-                       hw->dn[i].occupid[hw->filter_sel].count--;
+                       hw->dn[i].filter[hw->filter_sel].count--;
 
                dtm->pmu_config_low &= ~CMN__PMEVCNT_PAIRED(dtm_idx);
                writel_relaxed(dtm->pmu_config_low, dtm->base + CMN_DTM_PMU_CONFIG);
@@ -1978,7 +1981,7 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
                        input_sel = CMN__PMEVCNT0_INPUT_SEL_DEV + dtm_idx +
                                    (nid.port << 4) + (nid.dev << 2);
 
-                       if (arm_cmn_set_event_sel_hi(dn, hw->filter_sel, CMN_EVENT_OCCUPID(event)))
+                       if (arm_cmn_set_event_sel_hi(dn, hw->filter_sel, CMN_EVENT_FILTER(event)))
                                goto free_dtms;
                }