PM / devfreq: events: extend events by type of counted data

This patch adds posibility to choose what type of data should be counted
by the PPMU counter. Now the type comes from DT where the event has been
defined. When there is no 'event-data-type' the default value is used,
which is 'read+write data in bytes'.
It is needed when you want to know not only read+write data bytes but
i.e. only write data in byte, or number of read requests, etc.

Signed-off-by: Lukasz Luba <l.luba@partner.samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
[Updated property by MyungJoo. data_type --> event_type]
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
This commit is contained in:
Lukasz Luba 2019-06-05 11:12:34 +02:00 committed by MyungJoo Ham
parent 0ae9c3213c
commit 1dd62c66d3
2 changed files with 47 additions and 19 deletions

View File

@ -164,9 +164,9 @@ static int exynos_ppmu_set_event(struct devfreq_event_dev *edev)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Set the event of Read/Write data count */ /* Set the event of proper data type monitoring */
ret = regmap_write(info->regmap, PPMU_BEVTxSEL(id), ret = regmap_write(info->regmap, PPMU_BEVTxSEL(id),
PPMU_RO_DATA_CNT | PPMU_WO_DATA_CNT); edev->desc->event_type);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -378,23 +378,11 @@ static int exynos_ppmu_v2_set_event(struct devfreq_event_dev *edev)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Set the event of Read/Write data count */ /* Set the event of proper data type monitoring */
switch (id) { ret = regmap_write(info->regmap, PPMU_V2_CH_EVx_TYPE(id),
case PPMU_PMNCNT0: edev->desc->event_type);
case PPMU_PMNCNT1: if (ret < 0)
case PPMU_PMNCNT2: return ret;
ret = regmap_write(info->regmap, PPMU_V2_CH_EVx_TYPE(id),
PPMU_V2_RO_DATA_CNT | PPMU_V2_WO_DATA_CNT);
if (ret < 0)
return ret;
break;
case PPMU_PMNCNT3:
ret = regmap_write(info->regmap, PPMU_V2_CH_EVx_TYPE(id),
PPMU_V2_EVT3_RW_DATA_CNT);
if (ret < 0)
return ret;
break;
}
/* Reset cycle counter/performance counter and enable PPMU */ /* Reset cycle counter/performance counter and enable PPMU */
ret = regmap_read(info->regmap, PPMU_V2_PMNC, &pmnc); ret = regmap_read(info->regmap, PPMU_V2_PMNC, &pmnc);
@ -510,6 +498,7 @@ static int of_get_devfreq_events(struct device_node *np,
struct device_node *events_np, *node; struct device_node *events_np, *node;
int i, j, count; int i, j, count;
const struct of_device_id *of_id; const struct of_device_id *of_id;
int ret;
events_np = of_get_child_by_name(np, "events"); events_np = of_get_child_by_name(np, "events");
if (!events_np) { if (!events_np) {
@ -559,6 +548,39 @@ static int of_get_devfreq_events(struct device_node *np,
desc[j].driver_data = info; desc[j].driver_data = info;
of_property_read_string(node, "event-name", &desc[j].name); of_property_read_string(node, "event-name", &desc[j].name);
ret = of_property_read_u32(node, "event-data-type",
&desc[j].event_type);
if (ret) {
/* Set the event of proper data type counting.
* Check if the data type has been defined in DT,
* use default if not.
*/
if (info->ppmu_type == EXYNOS_TYPE_PPMU_V2) {
struct devfreq_event_dev edev;
int id;
/* Not all registers take the same value for
* read+write data count.
*/
edev.desc = &desc[j];
id = exynos_ppmu_find_ppmu_id(&edev);
switch (id) {
case PPMU_PMNCNT0:
case PPMU_PMNCNT1:
case PPMU_PMNCNT2:
desc[j].event_type = PPMU_V2_RO_DATA_CNT
| PPMU_V2_WO_DATA_CNT;
break;
case PPMU_PMNCNT3:
desc[j].event_type =
PPMU_V2_EVT3_RW_DATA_CNT;
break;
}
} else {
desc[j].event_type = PPMU_RO_DATA_CNT |
PPMU_WO_DATA_CNT;
}
}
j++; j++;
} }

View File

@ -78,14 +78,20 @@ struct devfreq_event_ops {
* struct devfreq_event_desc - the descriptor of devfreq-event device * struct devfreq_event_desc - the descriptor of devfreq-event device
* *
* @name : the name of devfreq-event device. * @name : the name of devfreq-event device.
* @event_type : the type of the event determined and used by driver
* @driver_data : the private data for devfreq-event driver. * @driver_data : the private data for devfreq-event driver.
* @ops : the operation to control devfreq-event device. * @ops : the operation to control devfreq-event device.
* *
* Each devfreq-event device is described with a this structure. * Each devfreq-event device is described with a this structure.
* This structure contains the various data for devfreq-event device. * This structure contains the various data for devfreq-event device.
* The event_type describes what is going to be counted in the register.
* It might choose to count e.g. read requests, write data in bytes, etc.
* The full supported list of types is present in specyfic header in:
* include/dt-bindings/pmu/.
*/ */
struct devfreq_event_desc { struct devfreq_event_desc {
const char *name; const char *name;
u32 event_type;
void *driver_data; void *driver_data;
const struct devfreq_event_ops *ops; const struct devfreq_event_ops *ops;