On 02/19/2014 09:10 PM, Stephane Eranian wrote:
>
> This patch updates the CBOX PMU filters mapping tables for SNB-EP
> and IVT (model 45 and 62 respectively).
>
> The NID umask always comes in addition to another umask.
> When set, the NID filter is applied.
Do you means the NID always applies for LLC_LOOKUP no matter what umask is.
If yes, I think it's better to define filter as SNBEP_CBO_EVENT_EXTRA_REG(0x34,
0xff, 0x6)
Regards
Yan, Zheng
>
> The current mapping tables were missing some code/umask
> combinations to account for the NID umask. This patch
> fixes that.
>
> Signed-off-by: Stephane Eranian <eran...@google.com>
>
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> @@ -501,8 +501,11 @@ static struct extra_reg snbep_uncore_cbox_extra_regs[] =
> {
> SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,
> SNBEP_CBO_PMON_CTL_TID_EN, 0x1),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4334, 0xffff, 0x6),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4534, 0xffff, 0x6),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4934, 0xffff, 0x6),
> SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0x6),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x8),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x8),
> @@ -1178,10 +1181,15 @@ static struct extra_reg ivt_uncore_cbox_extra_regs[]
> = {
> SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,
> SNBEP_CBO_PMON_CTL_TID_EN, 0x1),
> SNBEP_CBO_EVENT_EXTRA_REG(0x1031, 0x10ff, 0x2),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0xc),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x5134, 0xffff, 0xc),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4334, 0xffff, 0xc),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4534, 0xffff, 0xc),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),
> - SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0xc),
> + SNBEP_CBO_EVENT_EXTRA_REG(0x4934, 0xffff, 0xc),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x10),
> SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x10),
> SNBEP_CBO_EVENT_EXTRA_REG(0x2135, 0xffff, 0x10),
>
--
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/
