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

Commit 709bc871 authored by Takao Indoh's avatar Takao Indoh Committed by Ingo Molnar
Browse files

perf/x86/intel/pt: Clean up files of Intel Processor Trace 



This patch just cleans up some files of Intel Processor Trace, does not
change its behavior. This patch removes unused definitions and replaces a
constant value with a macro.

Signed-off-by: default avatarTakao Indoh <indou.takao@jp.fujitsu.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin<alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: H.Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1438681015-5124-1-git-send-email-indou.takao@jp.fujitsu.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c2ad6b51

arch/x86/kernel/cpu/intel_pt.h

+6 −27
Original line number Diff line number Diff line
@@ -25,32 +25,11 @@ 
 */

#define TOPA_PMI_MARGIN 512



/*

 * Table of Physical Addresses bits

 */

enum topa_sz {

	TOPA_4K	= 0,

	TOPA_8K,

	TOPA_16K,

	TOPA_32K,

	TOPA_64K,

	TOPA_128K,

	TOPA_256K,

	TOPA_512K,

	TOPA_1MB,

	TOPA_2MB,

	TOPA_4MB,

	TOPA_8MB,

	TOPA_16MB,

	TOPA_32MB,

	TOPA_64MB,

	TOPA_128MB,

	TOPA_SZ_END,

};

#define TOPA_SHIFT 12



static inline unsigned int sizes(enum topa_sz tsz)

static inline unsigned int sizes(unsigned int tsz)

{

	return 1 << (tsz + 12);

	return 1 << (tsz + TOPA_SHIFT);

};



struct topa_entry {
@@ -66,8 +45,8 @@ struct topa_entry { 
	u64	rsvd4	: 16;

};



#define TOPA_SHIFT 12

#define PT_CPUID_LEAVES		2

#define PT_CPUID_REGS_NUM	4 /* number of regsters (eax, ebx, ecx, edx) */



enum pt_capabilities {

	PT_CAP_max_subleaf = 0,
@@ -85,7 +64,7 @@ enum pt_capabilities { 


struct pt_pmu {

	struct pmu		pmu;

	u32			caps[4 * PT_CPUID_LEAVES];

	u32			caps[PT_CPUID_REGS_NUM * PT_CPUID_LEAVES];

};



/**

arch/x86/kernel/cpu/perf_event_intel_pt.c

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct pt_cap_desc { 
static u32 pt_cap_get(enum pt_capabilities cap)

{

	struct pt_cap_desc *cd = &pt_caps[cap];

	u32 c = pt_pmu.caps[cd->leaf * 4 + cd->reg];

	u32 c = pt_pmu.caps[cd->leaf * PT_CPUID_REGS_NUM + cd->reg];

	unsigned int shift = __ffs(cd->mask);



	return (c & cd->mask) >> shift;
@@ -145,10 +145,10 @@ static int __init pt_pmu_hw_init(void) 


	for (i = 0; i < PT_CPUID_LEAVES; i++) {

		cpuid_count(20, i,

			    &pt_pmu.caps[CR_EAX + i*4],

			    &pt_pmu.caps[CR_EBX + i*4],

			    &pt_pmu.caps[CR_ECX + i*4],

			    &pt_pmu.caps[CR_EDX + i*4]);

			    &pt_pmu.caps[CR_EAX + i*PT_CPUID_REGS_NUM],

			    &pt_pmu.caps[CR_EBX + i*PT_CPUID_REGS_NUM],

			    &pt_pmu.caps[CR_ECX + i*PT_CPUID_REGS_NUM],

			    &pt_pmu.caps[CR_EDX + i*PT_CPUID_REGS_NUM]);

	}



	ret = -ENOMEM;