drivers: thermal: step_wise: add support for hysteresis

[platform/kernel/linux-rpi.git] / drivers / perf / arm-cmn.c

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 6b50bc5..6404b17 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -112,7 +112,9 @@
 
 #define CMN_DTM_PMEVCNTSR              0x240
 
-#define CMN_DTM_UNIT_INFO              0x0910
+#define CMN650_DTM_UNIT_INFO           0x0910
+#define CMN_DTM_UNIT_INFO              0x0960
+#define CMN_DTM_UNIT_INFO_DTC_DOMAIN   GENMASK_ULL(1, 0)
 
 #define CMN_DTM_NUM_COUNTERS           4
 /* Want more local counters? Why not replicate the whole DTM! Ugh... */
@@ -809,7 +811,7 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
 #define CMN_EVENT_HNF_OCC(_model, _name, _event)                       \
        CMN_EVENT_HN_OCC(_model, hnf_##_name, CMN_TYPE_HNF, _event)
 #define CMN_EVENT_HNF_CLS(_model, _name, _event)                       \
-       CMN_EVENT_HN_CLS(_model, hnf_##_name, CMN_TYPE_HNS, _event)
+       CMN_EVENT_HN_CLS(_model, hnf_##_name, CMN_TYPE_HNF, _event)
 #define CMN_EVENT_HNF_SNT(_model, _name, _event)                       \
        CMN_EVENT_HN_SNT(_model, hnf_##_name, CMN_TYPE_HNF, _event)
 
@@ -2117,6 +2119,16 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
        return 0;
 }
 
+static unsigned int arm_cmn_dtc_domain(struct arm_cmn *cmn, void __iomem *xp_region)
+{
+       int offset = CMN_DTM_UNIT_INFO;
+
+       if (cmn->part == PART_CMN650 || cmn->part == PART_CI700)
+               offset = CMN650_DTM_UNIT_INFO;
+
+       return FIELD_GET(CMN_DTM_UNIT_INFO_DTC_DOMAIN, readl_relaxed(xp_region + offset));
+}
+
 static void arm_cmn_init_node_info(struct arm_cmn *cmn, u32 offset, struct arm_cmn_node *node)
 {
        int level;
@@ -2248,7 +2260,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
                if (cmn->part == PART_CMN600)
                        xp->dtc = 0xf;
                else
-                       xp->dtc = 1 << readl_relaxed(xp_region + CMN_DTM_UNIT_INFO);
+                       xp->dtc = 1 << arm_cmn_dtc_domain(cmn, xp_region);
 
                xp->dtm = dtm - cmn->dtms;
                arm_cmn_init_dtm(dtm++, xp, 0);