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

powerpc/perf: Clean up the EBB hash defines a little 



Rather than using PERF_EVENT_CONFIG_EBB_SHIFT everywhere, add an
EVENT_EBB_SHIFT like every other event and use that.

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

arch/powerpc/perf/power8-pmu.c

+4 −3
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
 */



#define EVENT_EBB_MASK		1ull

#define EVENT_EBB_SHIFT		PERF_EVENT_CONFIG_EBB_SHIFT

#define EVENT_THR_CMP_SHIFT	40	/* Threshold CMP value */

#define EVENT_THR_CMP_MASK	0x3ff

#define EVENT_THR_CTL_SHIFT	32	/* Threshold control value (start/stop) */
@@ -151,7 +152,7 @@ 
	 (EVENT_UNIT_MASK      << EVENT_UNIT_SHIFT)		|	\

	 (EVENT_COMBINE_MASK   << EVENT_COMBINE_SHIFT)		|	\

	 (EVENT_MARKED_MASK    << EVENT_MARKED_SHIFT)		|	\

	 (EVENT_EBB_MASK       << PERF_EVENT_CONFIG_EBB_SHIFT)	|	\

	 (EVENT_EBB_MASK       << EVENT_EBB_SHIFT)		|	\

	  EVENT_PSEL_MASK)



/* MMCRA IFM bits - POWER8 */
@@ -267,10 +268,10 @@ static int power8_get_constraint(u64 event, unsigned long *maskp, unsigned long 
	pmc   = (event >> EVENT_PMC_SHIFT)        & EVENT_PMC_MASK;

	unit  = (event >> EVENT_UNIT_SHIFT)       & EVENT_UNIT_MASK;

	cache = (event >> EVENT_CACHE_SEL_SHIFT)  & EVENT_CACHE_SEL_MASK;

	ebb   = (event >> PERF_EVENT_CONFIG_EBB_SHIFT) & EVENT_EBB_MASK;

	ebb   = (event >> EVENT_EBB_SHIFT)        & EVENT_EBB_MASK;



	/* Clear the EBB bit in the event, so event checks work below */

	event &= ~(EVENT_EBB_MASK << PERF_EVENT_CONFIG_EBB_SHIFT);

	event &= ~(EVENT_EBB_MASK << EVENT_EBB_SHIFT);



	if (pmc) {

		if (pmc > 6)