Commit ebb6cc03 authored by Yan, Zheng's avatar Yan, Zheng Committed by Thomas Gleixner

perf/x86: Fixes for Nehalem-EX uncore driver

This patch includes following fixes and update:
 - Only some events in the Sbox and Mbox can use the match/mask
   registers, add code to check this.
 - The format definitions for xbr_mm_cfg and xbr_match registers
   in the Rbox are wrong, xbr_mm_cfg should use 32 bits, xbr_match
   should use 64 bits.
 - Cleanup the Rbox code. Compute the addresses extra registers in
   the enable_event function instead of the hw_config function.
   This simplifies the code in nhmex_rbox_alter_er().
Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1344229882-3907-2-git-send-email-zheng.z.yan@intel.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cffa59ba
...@@ -230,6 +230,7 @@ ...@@ -230,6 +230,7 @@
#define NHMEX_S1_MSR_MASK 0xe5a #define NHMEX_S1_MSR_MASK 0xe5a
#define NHMEX_S_PMON_MM_CFG_EN (0x1ULL << 63) #define NHMEX_S_PMON_MM_CFG_EN (0x1ULL << 63)
#define NHMEX_S_EVENT_TO_R_PROG_EV 0
/* NHM-EX Mbox */ /* NHM-EX Mbox */
#define NHMEX_M0_MSR_GLOBAL_CTL 0xca0 #define NHMEX_M0_MSR_GLOBAL_CTL 0xca0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment