Commit 6f94285a authored by Yicong Yang's avatar Yicong Yang Committed by Slim6882
Browse files

drivers/perf: hisi_pcie: Rename hisi_pcie_pmu_{config,clear}_filter() 

mainline inclusion
from mainline-v6.9-rc1
commit 54a9e47eebb9064de9c65a6c22bb31e1a67f3903
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9HCSA
CVE: NA

Reference: https://lore.kernel.org/all/20240223103359.18669-1-yangyicong@huawei.com/



------------------------------------------------------------------------

hisi_pcie_pmu_{config,clear}_filter() are config/clear HISI_PCIE_EVENT_CTRL
register which contains not only the filter but also the event code. The
function names are bit misleading. Rename it to
hisi_pcie_pmu_{config,clear}_event_ctrl() to reflects their functions
more accurately.

Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240223103359.18669-2-yangyicong@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSlim6882 <yangjunshuo@huawei.com>
parent c22feee7

drivers/perf/hisilicon/hisi_pcie_pmu.c

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void hisi_pcie_pmu_writeq(struct hisi_pcie_pmu *pcie_pmu, u32 reg_offset, 
	writeq_relaxed(val, pcie_pmu->base + offset);

}



static void hisi_pcie_pmu_config_filter(struct perf_event *event)

static void hisi_pcie_pmu_config_event_ctrl(struct perf_event *event)

{

	struct hisi_pcie_pmu *pcie_pmu = to_pcie_pmu(event->pmu);

	struct hw_perf_event *hwc = &event->hw;
@@ -265,7 +265,7 @@ static void hisi_pcie_pmu_config_filter(struct perf_event *event) 
	hisi_pcie_pmu_writeq(pcie_pmu, HISI_PCIE_EVENT_CTRL, hwc->idx, reg);

}



static void hisi_pcie_pmu_clear_filter(struct perf_event *event)

static void hisi_pcie_pmu_clear_event_ctrl(struct perf_event *event)

{

	struct hisi_pcie_pmu *pcie_pmu = to_pcie_pmu(event->pmu);

	struct hw_perf_event *hwc = &event->hw;
@@ -511,7 +511,7 @@ static void hisi_pcie_pmu_start(struct perf_event *event, int flags) 
	WARN_ON_ONCE(!(hwc->state & PERF_HES_UPTODATE));

	hwc->state = 0;



	hisi_pcie_pmu_config_filter(event);

	hisi_pcie_pmu_config_event_ctrl(event);

	hisi_pcie_pmu_enable_counter(pcie_pmu, hwc);

	hisi_pcie_pmu_enable_int(pcie_pmu, hwc);

	hisi_pcie_pmu_set_period(event);
@@ -532,7 +532,7 @@ static void hisi_pcie_pmu_stop(struct perf_event *event, int flags) 
	hisi_pcie_pmu_event_update(event);

	hisi_pcie_pmu_disable_int(pcie_pmu, hwc);

	hisi_pcie_pmu_disable_counter(pcie_pmu, hwc);

	hisi_pcie_pmu_clear_filter(event);

	hisi_pcie_pmu_clear_event_ctrl(event);

	WARN_ON_ONCE(hwc->state & PERF_HES_STOPPED);

	hwc->state |= PERF_HES_STOPPED;