ping On 07/18/2013 05:02 PM, Yan, Zheng wrote: > From: "Yan, Zheng" <zheng.z....@intel.com> > > Silvermont (22nm Atom) has two offcore response configuration MSRs, > unlike other Intel CPU, its event code for MSR_OFFCORE_RSP_1 is 0x02b7. > To avoid complicating intel_fixup_er(), use INTEL_UEVENT_EXTRA_REG to > define MSR_OFFCORE_RSP_X. So intel_fixup_er() can find the event code > for OFFCORE_RSP_N by x86_pmu.extra_regs[N].event. > > Signed-off-by: Yan, Zheng <zheng.z....@intel.com> > --- > arch/x86/kernel/cpu/perf_event_intel.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kernel/cpu/perf_event_intel.c > b/arch/x86/kernel/cpu/perf_event_intel.c > index fbc9210..d312edf 100644 > --- a/arch/x86/kernel/cpu/perf_event_intel.c > +++ b/arch/x86/kernel/cpu/perf_event_intel.c > @@ -81,7 +81,8 @@ static struct event_constraint > intel_nehalem_event_constraints[] __read_mostly = > > static struct extra_reg intel_nehalem_extra_regs[] __read_mostly = > { > - INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0), > + /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ > + INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0), > INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b), > EVENT_EXTRA_END > }; > @@ -143,8 +144,9 @@ static struct event_constraint > intel_ivb_event_constraints[] __read_mostly = > > static struct extra_reg intel_westmere_extra_regs[] __read_mostly = > { > - INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0), > - INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0xffff, RSP_1), > + /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ > + INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0), > + INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0xffff, RSP_1), > INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b), > EVENT_EXTRA_END > }; > @@ -163,15 +165,17 @@ static struct event_constraint > intel_gen_event_constraints[] __read_mostly = > }; > > static struct extra_reg intel_snb_extra_regs[] __read_mostly = { > - INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0), > - INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1), > + /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ > + INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, > RSP_0), > + INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, > RSP_1), > INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), > EVENT_EXTRA_END > }; > > static struct extra_reg intel_snbep_extra_regs[] __read_mostly = { > - INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0), > - INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1), > + /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ > + INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, > RSP_0), > + INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, > RSP_1), > INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), > EVENT_EXTRA_END > }; > @@ -1301,11 +1305,11 @@ static void intel_fixup_er(struct perf_event *event, > int idx) > > if (idx == EXTRA_REG_RSP_0) { > event->hw.config &= ~INTEL_ARCH_EVENT_MASK; > - event->hw.config |= 0x01b7; > + event->hw.config |= x86_pmu.extra_regs[EXTRA_REG_RSP_0].event; > event->hw.extra_reg.reg = MSR_OFFCORE_RSP_0; > } else if (idx == EXTRA_REG_RSP_1) { > event->hw.config &= ~INTEL_ARCH_EVENT_MASK; > - event->hw.config |= 0x01bb; > + event->hw.config |= x86_pmu.extra_regs[EXTRA_REG_RSP_1].event; > event->hw.extra_reg.reg = MSR_OFFCORE_RSP_1; > } > } >
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/