Commit 43de0ac3 authored by Yicong Yang's avatar Yicong Yang Committed by Will Deacon
Browse files

drivers/perf: hisi: Relax the event ID check in the framework 



Event ID is only using the attr::config bit [7, 0] but we check the
event range using the whole 64bit field. It blocks the usage of the
rest field of attr::config. Relax the check by only using the
bit [7, 0].

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>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent bad11557

drivers/perf/hisilicon/hisi_uncore_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int hisi_uncore_pmu_event_init(struct perf_event *event) 
		return -EINVAL;



	hisi_pmu = to_hisi_pmu(event->pmu);

	if (event->attr.config > hisi_pmu->check_event)

	if ((event->attr.config & HISI_EVENTID_MASK) > hisi_pmu->check_event)

		return -EINVAL;



	if (hisi_pmu->on_cpu == -1)

drivers/perf/hisilicon/hisi_uncore_pmu.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 
		return FIELD_GET(GENMASK_ULL(hi, lo), event->attr.config);  \

	}



#define HISI_GET_EVENTID(ev) (ev->hw.config_base & 0xff)

#define HISI_EVENTID_MASK		GENMASK(7, 0)

#define HISI_GET_EVENTID(ev)		((ev)->hw.config_base & HISI_EVENTID_MASK)



#define HISI_PMU_EVTYPE_BITS		8

#define HISI_PMU_EVTYPE_SHIFT(idx)	((idx) % 4 * HISI_PMU_EVTYPE_BITS)