Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8abd818f authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/perf: Pass the struct perf_events down to compute_mmcr() 



To support per-event exclude settings on Power8 we need access to the
struct perf_events in compute_mmcr().

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 79a4cb28

arch/powerpc/include/asm/perf_event_server.h

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#define MAX_EVENT_ALTERNATIVES	8

#define MAX_LIMITED_HWCOUNTERS	2



struct perf_event;



/*

 * This struct provides the constants and functions needed to

 * describe the PMU on a particular POWER-family CPU.
@@ -30,7 +32,8 @@ struct power_pmu { 
	unsigned long	add_fields;

	unsigned long	test_adder;

	int		(*compute_mmcr)(u64 events[], int n_ev,

				unsigned int hwc[], unsigned long mmcr[]);

				unsigned int hwc[], unsigned long mmcr[],

				struct perf_event *pevents[]);

	int		(*get_constraint)(u64 event_id, unsigned long *mskp,

				unsigned long *valp);

	int		(*get_alternatives)(u64 event_id, unsigned int flags,

arch/powerpc/perf/core-book3s.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static void power_pmu_enable(struct pmu *pmu) 
	memset(cpuhw->mmcr, 0, sizeof(cpuhw->mmcr));



	if (ppmu->compute_mmcr(cpuhw->events, cpuhw->n_events, hwc_index,

			       cpuhw->mmcr)) {

			       cpuhw->mmcr, cpuhw->event)) {

		/* shouldn't ever get here */

		printk(KERN_ERR "oops compute_mmcr failed\n");

		goto out;

arch/powerpc/perf/mpc7450-pmu.c

+3 −2
Original line number Diff line number Diff line
@@ -260,8 +260,9 @@ static const u32 pmcsel_mask[N_COUNTER] = { 
/*

 * Compute MMCR0/1/2 values for a set of events.

 */

static int mpc7450_compute_mmcr(u64 event[], int n_ev,

				unsigned int hwc[], unsigned long mmcr[])

static int mpc7450_compute_mmcr(u64 event[], int n_ev, unsigned int hwc[],

				unsigned long mmcr[],

				struct perf_event *pevents[])

{

	u8 event_index[N_CLASSES][N_COUNTER];

	int n_classevent[N_CLASSES];

arch/powerpc/perf/power4-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int p4_get_alternatives(u64 event, unsigned int flags, u64 alt[]) 
}



static int p4_compute_mmcr(u64 event[], int n_ev,

			   unsigned int hwc[], unsigned long mmcr[])

			   unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])

{

	unsigned long mmcr0 = 0, mmcr1 = 0, mmcra = 0;

	unsigned int pmc, unit, byte, psel, lower;

arch/powerpc/perf/power5+-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int power5p_marked_instr_event(u64 event) 
}



static int power5p_compute_mmcr(u64 event[], int n_ev,

				unsigned int hwc[], unsigned long mmcr[])

				unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])

{

	unsigned long mmcr1 = 0;

	unsigned long mmcra = 0;