leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/oprofile: macro definition cleanup in op_model_athlon.c

Browse Source 
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Robert Richter 2008-07-22 21:09:03 +02:00 committed by Ingo Molnar
parent a4c408a411
commit 87f0baccc2
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arch/x86/oprofile/op_model_athlon.c
View File

@ -47,32 +47,20 @@
#define CTRL_SET_HOST_ONLY(val, h) (val |= ((h & 1) << 9)) #define CTRL_SET_HOST_ONLY(val, h) (val |= ((h & 1) << 9))
#define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h & 1) << 8)) #define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h & 1) << 8))
#define IBS_FETCH_CTL_HIGH_MASK 0xFFFFFFFF /* IbsFetchCtl bits/masks */
/* high dword bit IbsFetchCtl[bit 49] */ #define IBS_FETCH_HIGH_VALID_BIT (1UL << 17) /* bit 49 */
#define IBS_FETCH_VALID_BIT (1UL << 17) #define IBS_FETCH_HIGH_ENABLE (1UL << 16) /* bit 48 */
/* high dword bit IbsFetchCtl[bit 52] */ #define IBS_FETCH_LOW_MAX_CNT_MASK 0x0000FFFFUL /* MaxCnt mask */
#define IBS_FETCH_PHY_ADDR_VALID_BIT (1UL << 20)
/* high dword bit IbsFetchCtl[bit 48] */
#define IBS_FETCH_ENABLE (1UL << 16)
#define IBS_FETCH_CTL_CNT_MASK 0x00000000FFFF0000UL /*IbsOpCtl bits */
#define IBS_FETCH_CTL_MAX_CNT_MASK 0x000000000000FFFFUL #define IBS_OP_LOW_VALID_BIT (1ULL<<18) /* bit 18 */
#define IBS_OP_LOW_ENABLE (1ULL<<17) /* bit 17 */
/*IbsOpCtl masks/bits */
#define IBS_OP_VALID_BIT (1ULL<<18) /* IbsOpCtl[bit18] */
#define IBS_OP_ENABLE (1ULL<<17) /* IBS_OP_ENABLE[bit17]*/
/* Codes used in cpu_buffer.c */ /* Codes used in cpu_buffer.c */
/* This produces duplicate code, need to be fixed */
#define IBS_FETCH_BEGIN 3 #define IBS_FETCH_BEGIN 3
#define IBS_OP_BEGIN 4 #define IBS_OP_BEGIN 4
/*IbsOpData3 masks */
#define IBS_CTL_LVT_OFFSET_VALID_BIT (1ULL<<8)
/*PCI Extended Configuration Constants */
/* MSR to set the IBS control register APIC LVT offset */
#define IBS_LVT_OFFSET_PCI 0x1CC
/* The function interface needs to be fixed, something like add /* The function interface needs to be fixed, something like add
data. Should then be added to linux/oprofile.h. */ data. Should then be added to linux/oprofile.h. */
extern void oprofile_add_ibs_sample(struct pt_regs *const regs, extern void oprofile_add_ibs_sample(struct pt_regs *const regs,
@ -213,7 +201,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
if (ibs_config.fetch_enabled) { if (ibs_config.fetch_enabled) {
rdmsr(MSR_AMD64_IBSFETCHCTL, low, high); rdmsr(MSR_AMD64_IBSFETCHCTL, low, high);
if (high & IBS_FETCH_VALID_BIT) { if (high & IBS_FETCH_HIGH_VALID_BIT) {
ibs_fetch.ibs_fetch_ctl_high = high; ibs_fetch.ibs_fetch_ctl_high = high;
ibs_fetch.ibs_fetch_ctl_low = low; ibs_fetch.ibs_fetch_ctl_low = low;
rdmsr(MSR_AMD64_IBSFETCHLINAD, low, high); rdmsr(MSR_AMD64_IBSFETCHLINAD, low, high);
@ -229,16 +217,16 @@ op_amd_handle_ibs(struct pt_regs * const regs,
/*reenable the IRQ */ /*reenable the IRQ */
rdmsr(MSR_AMD64_IBSFETCHCTL, low, high); rdmsr(MSR_AMD64_IBSFETCHCTL, low, high);
high &= ~(IBS_FETCH_VALID_BIT); high &= ~IBS_FETCH_HIGH_VALID_BIT;
high |= IBS_FETCH_ENABLE; high |= IBS_FETCH_HIGH_ENABLE;
low &= IBS_FETCH_CTL_MAX_CNT_MASK; low &= IBS_FETCH_LOW_MAX_CNT_MASK;
wrmsr(MSR_AMD64_IBSFETCHCTL, low, high); wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);
} }
} }
if (ibs_config.op_enabled) { if (ibs_config.op_enabled) {
rdmsr(MSR_AMD64_IBSOPCTL, low, high); rdmsr(MSR_AMD64_IBSOPCTL, low, high);
if (low & IBS_OP_VALID_BIT) { if (low & IBS_OP_LOW_VALID_BIT) {
rdmsr(MSR_AMD64_IBSOPRIP, low, high); rdmsr(MSR_AMD64_IBSOPRIP, low, high);
ibs_op.ibs_op_rip_low = low; ibs_op.ibs_op_rip_low = low;
ibs_op.ibs_op_rip_high = high; ibs_op.ibs_op_rip_high = high;
@ -263,8 +251,8 @@ op_amd_handle_ibs(struct pt_regs * const regs,
(unsigned int *)&ibs_op, (unsigned int *)&ibs_op,
IBS_OP_BEGIN); IBS_OP_BEGIN);
rdmsr(MSR_AMD64_IBSOPCTL, low, high); rdmsr(MSR_AMD64_IBSOPCTL, low, high);
low &= ~(IBS_OP_VALID_BIT); low &= ~IBS_OP_LOW_VALID_BIT;
low |= IBS_OP_ENABLE; low |= IBS_OP_LOW_ENABLE;
wrmsr(MSR_AMD64_IBSOPCTL, low, high); wrmsr(MSR_AMD64_IBSOPCTL, low, high);
} }
} }
@ -307,12 +295,12 @@ static void op_amd_start(struct op_msrs const * const msrs)
} }
if (ibs_allowed && ibs_config.fetch_enabled) { if (ibs_allowed && ibs_config.fetch_enabled) {
low = (ibs_config.max_cnt_fetch >> 4) & 0xFFFF; low = (ibs_config.max_cnt_fetch >> 4) & 0xFFFF;
high = IBS_FETCH_ENABLE; high = IBS_FETCH_HIGH_ENABLE;
wrmsr(MSR_AMD64_IBSFETCHCTL, low, high); wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);
} }
if (ibs_allowed && ibs_config.op_enabled) { if (ibs_allowed && ibs_config.op_enabled) {
low = ((ibs_config.max_cnt_op >> 4) & 0xFFFF) + IBS_OP_ENABLE; low = ((ibs_config.max_cnt_op >> 4) & 0xFFFF) + IBS_OP_LOW_ENABLE;
high = 0; high = 0;
wrmsr(MSR_AMD64_IBSOPCTL, low, high); wrmsr(MSR_AMD64_IBSOPCTL, low, high);
} }