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

Commit 887eda13 authored by Chao Peng's avatar Chao Peng Committed by Paolo Bonzini
Browse files

perf/x86/intel/pt: Move Intel PT MSRs bit defines to global header 



The Intel Processor Trace (PT) MSR bit defines are in a private
header. The upcoming support for PT virtualization requires these defines
to be accessible from KVM code.

Move them to the global MSR header file.

Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarChao Peng <chao.p.peng@linux.intel.com>
Signed-off-by: default avatarLuwei Kang <luwei.kang@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8cee5816

arch/x86/events/intel/pt.h

+0 −37
Original line number Diff line number Diff line
@@ -19,43 +19,6 @@ 
#ifndef __INTEL_PT_H__

#define __INTEL_PT_H__



/*

 * PT MSR bit definitions

 */

#define RTIT_CTL_TRACEEN		BIT(0)

#define RTIT_CTL_CYCLEACC		BIT(1)

#define RTIT_CTL_OS			BIT(2)

#define RTIT_CTL_USR			BIT(3)

#define RTIT_CTL_PWR_EVT_EN		BIT(4)

#define RTIT_CTL_FUP_ON_PTW		BIT(5)

#define RTIT_CTL_CR3EN			BIT(7)

#define RTIT_CTL_TOPA			BIT(8)

#define RTIT_CTL_MTC_EN			BIT(9)

#define RTIT_CTL_TSC_EN			BIT(10)

#define RTIT_CTL_DISRETC		BIT(11)

#define RTIT_CTL_PTW_EN			BIT(12)

#define RTIT_CTL_BRANCH_EN		BIT(13)

#define RTIT_CTL_MTC_RANGE_OFFSET	14

#define RTIT_CTL_MTC_RANGE		(0x0full << RTIT_CTL_MTC_RANGE_OFFSET)

#define RTIT_CTL_CYC_THRESH_OFFSET	19

#define RTIT_CTL_CYC_THRESH		(0x0full << RTIT_CTL_CYC_THRESH_OFFSET)

#define RTIT_CTL_PSB_FREQ_OFFSET	24

#define RTIT_CTL_PSB_FREQ      		(0x0full << RTIT_CTL_PSB_FREQ_OFFSET)

#define RTIT_CTL_ADDR0_OFFSET		32

#define RTIT_CTL_ADDR0      		(0x0full << RTIT_CTL_ADDR0_OFFSET)

#define RTIT_CTL_ADDR1_OFFSET		36

#define RTIT_CTL_ADDR1      		(0x0full << RTIT_CTL_ADDR1_OFFSET)

#define RTIT_CTL_ADDR2_OFFSET		40

#define RTIT_CTL_ADDR2      		(0x0full << RTIT_CTL_ADDR2_OFFSET)

#define RTIT_CTL_ADDR3_OFFSET		44

#define RTIT_CTL_ADDR3      		(0x0full << RTIT_CTL_ADDR3_OFFSET)

#define RTIT_STATUS_FILTEREN		BIT(0)

#define RTIT_STATUS_CONTEXTEN		BIT(1)

#define RTIT_STATUS_TRIGGEREN		BIT(2)

#define RTIT_STATUS_BUFFOVF		BIT(3)

#define RTIT_STATUS_ERROR		BIT(4)

#define RTIT_STATUS_STOPPED		BIT(5)



/*

 * Single-entry ToPA: when this close to region boundary, switch

 * buffers to avoid losing data.

arch/x86/include/asm/msr-index.h

+33 −0
Original line number Diff line number Diff line
@@ -121,7 +121,40 @@ 
#define MSR_PEBS_LD_LAT_THRESHOLD	0x000003f6



#define MSR_IA32_RTIT_CTL		0x00000570

#define RTIT_CTL_TRACEEN		BIT(0)

#define RTIT_CTL_CYCLEACC		BIT(1)

#define RTIT_CTL_OS			BIT(2)

#define RTIT_CTL_USR			BIT(3)

#define RTIT_CTL_PWR_EVT_EN		BIT(4)

#define RTIT_CTL_FUP_ON_PTW		BIT(5)

#define RTIT_CTL_CR3EN			BIT(7)

#define RTIT_CTL_TOPA			BIT(8)

#define RTIT_CTL_MTC_EN			BIT(9)

#define RTIT_CTL_TSC_EN			BIT(10)

#define RTIT_CTL_DISRETC		BIT(11)

#define RTIT_CTL_PTW_EN			BIT(12)

#define RTIT_CTL_BRANCH_EN		BIT(13)

#define RTIT_CTL_MTC_RANGE_OFFSET	14

#define RTIT_CTL_MTC_RANGE		(0x0full << RTIT_CTL_MTC_RANGE_OFFSET)

#define RTIT_CTL_CYC_THRESH_OFFSET	19

#define RTIT_CTL_CYC_THRESH		(0x0full << RTIT_CTL_CYC_THRESH_OFFSET)

#define RTIT_CTL_PSB_FREQ_OFFSET	24

#define RTIT_CTL_PSB_FREQ		(0x0full << RTIT_CTL_PSB_FREQ_OFFSET)

#define RTIT_CTL_ADDR0_OFFSET		32

#define RTIT_CTL_ADDR0			(0x0full << RTIT_CTL_ADDR0_OFFSET)

#define RTIT_CTL_ADDR1_OFFSET		36

#define RTIT_CTL_ADDR1			(0x0full << RTIT_CTL_ADDR1_OFFSET)

#define RTIT_CTL_ADDR2_OFFSET		40

#define RTIT_CTL_ADDR2			(0x0full << RTIT_CTL_ADDR2_OFFSET)

#define RTIT_CTL_ADDR3_OFFSET		44

#define RTIT_CTL_ADDR3			(0x0full << RTIT_CTL_ADDR3_OFFSET)

#define MSR_IA32_RTIT_STATUS		0x00000571

#define RTIT_STATUS_FILTEREN		BIT(0)

#define RTIT_STATUS_CONTEXTEN		BIT(1)

#define RTIT_STATUS_TRIGGEREN		BIT(2)

#define RTIT_STATUS_BUFFOVF		BIT(3)

#define RTIT_STATUS_ERROR		BIT(4)

#define RTIT_STATUS_STOPPED		BIT(5)

#define MSR_IA32_RTIT_ADDR0_A		0x00000580

#define MSR_IA32_RTIT_ADDR0_B		0x00000581

#define MSR_IA32_RTIT_ADDR1_A		0x00000582