Commit 2271f163 authored by Yicong Yang's avatar Yicong Yang Committed by Will Deacon
Browse files

drivers/perf: hisi: Extract the event filter check of L3C PMU 



L3C PMU has 4 filter options which are sharing perf_event_attr::config1.
Driver will check config1 to see whether a certain event has a filter
setting. It'll be incorrect if we make use of other bits in config1
for non-filter options. So check whether each filter options are set
directly in a separate function instead.

Acked-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Signed-off-by: default avatarYushan Wang <wangyushan12@huawei.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 0960e535

drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c

+8 −2
Original line number Diff line number Diff line
@@ -204,9 +204,15 @@ static void hisi_l3c_pmu_clear_core_tracetag(struct perf_event *event) 
	}

}



static bool hisi_l3c_pmu_have_filter(struct perf_event *event)

{

	return hisi_get_tt_req(event) || hisi_get_tt_core(event) ||

	       hisi_get_datasrc_cfg(event) || hisi_get_datasrc_skt(event);

}



static void hisi_l3c_pmu_enable_filter(struct perf_event *event)

{

	if (event->attr.config1 != 0x0) {

	if (hisi_l3c_pmu_have_filter(event)) {

		hisi_l3c_pmu_config_req_tracetag(event);

		hisi_l3c_pmu_config_core_tracetag(event);

		hisi_l3c_pmu_config_ds(event);
@@ -215,7 +221,7 @@ static void hisi_l3c_pmu_enable_filter(struct perf_event *event) 


static void hisi_l3c_pmu_disable_filter(struct perf_event *event)

{

	if (event->attr.config1 != 0x0) {

	if (hisi_l3c_pmu_have_filter(event)) {

		hisi_l3c_pmu_clear_ds(event);

		hisi_l3c_pmu_clear_core_tracetag(event);

		hisi_l3c_pmu_clear_req_tracetag(event);