Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-13 Thread Stephane Eranian
On Tue, Aug 13, 2013 at 8:29 AM, Yan, Zheng  wrote:
> From: "Yan, Zheng" 
>
> This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
> (bit 21) which is missing from the documentation in Table-2.75 of
> Intel Xeon Processor E5-2600 Product Family Uncore Performance
> Monitoring Guide. It is referred to later in Table-2.81. Without
> this selection bit explicitly enabled by the kernel, some events
> such as COREx_TRANSITION_CYCLES do not count correctly.
>
> Signed-off-by: Yan, Zheng 

Reviewed-by: Stephane Eranian 

> ---
>  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
>  arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
> b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> index 6b8b9c9..e9696d8 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> @@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] 
> = {
>  };
>
>  static struct attribute *snbep_uncore_pcu_formats_attr[] = {
> -   _attr_event.attr,
> +   _attr_event_ext.attr,
> _attr_occ_sel.attr,
> _attr_edge.attr,
> _attr_inv.attr,
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
> b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> index 628500e..a80ab71 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> @@ -117,6 +117,7 @@
> (SNBEP_PMON_CTL_EV_SEL_MASK | \
>  SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
>  SNBEP_PMON_CTL_EDGE_DET | \
> +SNBEP_PMON_CTL_EV_SEL_EXT | \
>  SNBEP_PMON_CTL_INVERT | \
>  SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
>  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
> --
> 1.8.1.4
>
--
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/


[PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-13 Thread Yan, Zheng
From: "Yan, Zheng" 

This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
(bit 21) which is missing from the documentation in Table-2.75 of
Intel Xeon Processor E5-2600 Product Family Uncore Performance
Monitoring Guide. It is referred to later in Table-2.81. Without
this selection bit explicitly enabled by the kernel, some events
such as COREx_TRANSITION_CYCLES do not count correctly.

Signed-off-by: Yan, Zheng 
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 6b8b9c9..e9696d8 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] = 
{
 };
 
 static struct attribute *snbep_uncore_pcu_formats_attr[] = {
-   _attr_event.attr,
+   _attr_event_ext.attr,
_attr_occ_sel.attr,
_attr_edge.attr,
_attr_inv.attr,
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 628500e..a80ab71 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -117,6 +117,7 @@
(SNBEP_PMON_CTL_EV_SEL_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
 SNBEP_PMON_CTL_EDGE_DET | \
+SNBEP_PMON_CTL_EV_SEL_EXT | \
 SNBEP_PMON_CTL_INVERT | \
 SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
-- 
1.8.1.4

--
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/


[PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-13 Thread Yan, Zheng
From: Yan, Zheng zheng.z@intel.com

This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
(bit 21) which is missing from the documentation in Table-2.75 of
Intel Xeon Processor E5-2600 Product Family Uncore Performance
Monitoring Guide. It is referred to later in Table-2.81. Without
this selection bit explicitly enabled by the kernel, some events
such as COREx_TRANSITION_CYCLES do not count correctly.

Signed-off-by: Yan, Zheng zheng.z@intel.com
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 6b8b9c9..e9696d8 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] = 
{
 };
 
 static struct attribute *snbep_uncore_pcu_formats_attr[] = {
-   format_attr_event.attr,
+   format_attr_event_ext.attr,
format_attr_occ_sel.attr,
format_attr_edge.attr,
format_attr_inv.attr,
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 628500e..a80ab71 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -117,6 +117,7 @@
(SNBEP_PMON_CTL_EV_SEL_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
 SNBEP_PMON_CTL_EDGE_DET | \
+SNBEP_PMON_CTL_EV_SEL_EXT | \
 SNBEP_PMON_CTL_INVERT | \
 SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
-- 
1.8.1.4

--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-13 Thread Stephane Eranian
On Tue, Aug 13, 2013 at 8:29 AM, Yan, Zheng zheng.z@intel.com wrote:
 From: Yan, Zheng zheng.z@intel.com

 This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
 (bit 21) which is missing from the documentation in Table-2.75 of
 Intel Xeon Processor E5-2600 Product Family Uncore Performance
 Monitoring Guide. It is referred to later in Table-2.81. Without
 this selection bit explicitly enabled by the kernel, some events
 such as COREx_TRANSITION_CYCLES do not count correctly.

 Signed-off-by: Yan, Zheng zheng.z@intel.com

Reviewed-by: Stephane Eranian eran...@google.com

 ---
  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
  arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
 b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 index 6b8b9c9..e9696d8 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 @@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] 
 = {
  };

  static struct attribute *snbep_uncore_pcu_formats_attr[] = {
 -   format_attr_event.attr,
 +   format_attr_event_ext.attr,
 format_attr_occ_sel.attr,
 format_attr_edge.attr,
 format_attr_inv.attr,
 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
 b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 index 628500e..a80ab71 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 @@ -117,6 +117,7 @@
 (SNBEP_PMON_CTL_EV_SEL_MASK | \
  SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
  SNBEP_PMON_CTL_EDGE_DET | \
 +SNBEP_PMON_CTL_EV_SEL_EXT | \
  SNBEP_PMON_CTL_INVERT | \
  SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
 --
 1.8.1.4

--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Stephane Eranian
Hi,

How about:

This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
(bit 21) which is
missing from the documentation in Table-2.75 of Intel® Xeon® Processor
E5-2600 Product Family
Uncore Performance Monitoring Guide. It is referred to later in
Table-2.81. Without this
selection bit explicitly enabled by the kernel, some events such as
COREx_TRANSITION_CYCLES do not count correctly.



On Mon, Aug 12, 2013 at 5:29 PM, Andi Kleen  wrote:
> On Mon, Aug 12, 2013 at 05:16:32PM +0200, Peter Zijlstra wrote:
>> On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
>> > From: "Yan, Zheng" 
>> >
>> > PCU uncore event control register has a undocumented ev_sel_ext bit.
>> > The bit is needed by Andi's pmu-tools.
>>
>> Please provide documentation. Andi needing it isn't a good changelog (or
>> even reason).
>
> The bit is in the uncore guide, just not in the register documentation,
> but in the event descriptions.
>
> e.g. the PCU part calls it "Extra Select Bit"
>
> -Andi
>
> --
> a...@linux.intel.com -- Speaking for myself only
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Andi Kleen
On Mon, Aug 12, 2013 at 05:16:32PM +0200, Peter Zijlstra wrote:
> On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
> > From: "Yan, Zheng" 
> > 
> > PCU uncore event control register has a undocumented ev_sel_ext bit.
> > The bit is needed by Andi's pmu-tools.
> 
> Please provide documentation. Andi needing it isn't a good changelog (or
> even reason).

The bit is in the uncore guide, just not in the register documentation,
but in the event descriptions.

e.g. the PCU part calls it "Extra Select Bit"

-Andi

-- 
a...@linux.intel.com -- Speaking for myself only
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Peter Zijlstra
On Fri, Aug 09, 2013 at 11:53:53AM +0200, Stephane Eranian wrote:
> On Wed, Aug 7, 2013 at 8:17 AM, Yan, Zheng  wrote:
> >
> > From: "Yan, Zheng" 
> >
> > PCU uncore event control register has a undocumented ev_sel_ext bit.
> > The bit is needed by Andi's pmu-tools.
> >
> > Signed-off-by: Yan, Zheng 
> 
> 
> Works for me. Is also needed by libpfm4 uncore PCU events.
> Now results make more sense. Please apply.
> 
> Reviewed-by: Stephane Eranian 

Seriously guys; how am I going to justify merging a changelog that
reads: Provides magic bit to sprinkle fairy dust; required by $people. ?


--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Peter Zijlstra
On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
> From: "Yan, Zheng" 
> 
> PCU uncore event control register has a undocumented ev_sel_ext bit.
> The bit is needed by Andi's pmu-tools.

Please provide documentation. Andi needing it isn't a good changelog (or
even reason).
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Peter Zijlstra
On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
 From: Yan, Zheng zheng.z@intel.com
 
 PCU uncore event control register has a undocumented ev_sel_ext bit.
 The bit is needed by Andi's pmu-tools.

Please provide documentation. Andi needing it isn't a good changelog (or
even reason).
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Peter Zijlstra
On Fri, Aug 09, 2013 at 11:53:53AM +0200, Stephane Eranian wrote:
 On Wed, Aug 7, 2013 at 8:17 AM, Yan, Zheng zheng.z@intel.com wrote:
 
  From: Yan, Zheng zheng.z@intel.com
 
  PCU uncore event control register has a undocumented ev_sel_ext bit.
  The bit is needed by Andi's pmu-tools.
 
  Signed-off-by: Yan, Zheng zheng.z@intel.com
 
 
 Works for me. Is also needed by libpfm4 uncore PCU events.
 Now results make more sense. Please apply.
 
 Reviewed-by: Stephane Eranian eran...@google.com

Seriously guys; how am I going to justify merging a changelog that
reads: Provides magic bit to sprinkle fairy dust; required by $people. ?


--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Andi Kleen
On Mon, Aug 12, 2013 at 05:16:32PM +0200, Peter Zijlstra wrote:
 On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
  From: Yan, Zheng zheng.z@intel.com
  
  PCU uncore event control register has a undocumented ev_sel_ext bit.
  The bit is needed by Andi's pmu-tools.
 
 Please provide documentation. Andi needing it isn't a good changelog (or
 even reason).

The bit is in the uncore guide, just not in the register documentation,
but in the event descriptions.

e.g. the PCU part calls it Extra Select Bit

-Andi

-- 
a...@linux.intel.com -- Speaking for myself only
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-12 Thread Stephane Eranian
Hi,

How about:

This patch adds support for the SNB-EP PCU uncore PMU extra_sel_bit
(bit 21) which is
missing from the documentation in Table-2.75 of Intel® Xeon® Processor
E5-2600 Product Family
Uncore Performance Monitoring Guide. It is referred to later in
Table-2.81. Without this
selection bit explicitly enabled by the kernel, some events such as
COREx_TRANSITION_CYCLES do not count correctly.



On Mon, Aug 12, 2013 at 5:29 PM, Andi Kleen a...@linux.intel.com wrote:
 On Mon, Aug 12, 2013 at 05:16:32PM +0200, Peter Zijlstra wrote:
 On Wed, Aug 07, 2013 at 02:17:25PM +0800, Yan, Zheng wrote:
  From: Yan, Zheng zheng.z@intel.com
 
  PCU uncore event control register has a undocumented ev_sel_ext bit.
  The bit is needed by Andi's pmu-tools.

 Please provide documentation. Andi needing it isn't a good changelog (or
 even reason).

 The bit is in the uncore guide, just not in the register documentation,
 but in the event descriptions.

 e.g. the PCU part calls it Extra Select Bit

 -Andi

 --
 a...@linux.intel.com -- Speaking for myself only
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-09 Thread Stephane Eranian
On Wed, Aug 7, 2013 at 8:17 AM, Yan, Zheng  wrote:
>
> From: "Yan, Zheng" 
>
> PCU uncore event control register has a undocumented ev_sel_ext bit.
> The bit is needed by Andi's pmu-tools.
>
> Signed-off-by: Yan, Zheng 


Works for me. Is also needed by libpfm4 uncore PCU events.
Now results make more sense. Please apply.

Reviewed-by: Stephane Eranian 


>
> ---
>  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
>  arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
> b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> index 6b8b9c9..e9696d8 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> @@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] 
> = {
>  };
>
>  static struct attribute *snbep_uncore_pcu_formats_attr[] = {
> -   _attr_event.attr,
> +   _attr_event_ext.attr,
> _attr_occ_sel.attr,
> _attr_edge.attr,
> _attr_inv.attr,
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
> b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> index 628500e..a80ab71 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
> @@ -117,6 +117,7 @@
> (SNBEP_PMON_CTL_EV_SEL_MASK | \
>  SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
>  SNBEP_PMON_CTL_EDGE_DET | \
> +SNBEP_PMON_CTL_EV_SEL_EXT | \
>  SNBEP_PMON_CTL_INVERT | \
>  SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
>  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
> --
> 1.8.1.4
>
--
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/


Re: [PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-09 Thread Stephane Eranian
On Wed, Aug 7, 2013 at 8:17 AM, Yan, Zheng zheng.z@intel.com wrote:

 From: Yan, Zheng zheng.z@intel.com

 PCU uncore event control register has a undocumented ev_sel_ext bit.
 The bit is needed by Andi's pmu-tools.

 Signed-off-by: Yan, Zheng zheng.z@intel.com


Works for me. Is also needed by libpfm4 uncore PCU events.
Now results make more sense. Please apply.

Reviewed-by: Stephane Eranian eran...@google.com



 ---
  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
  arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
 b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 index 6b8b9c9..e9696d8 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 @@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] 
 = {
  };

  static struct attribute *snbep_uncore_pcu_formats_attr[] = {
 -   format_attr_event.attr,
 +   format_attr_event_ext.attr,
 format_attr_occ_sel.attr,
 format_attr_edge.attr,
 format_attr_inv.attr,
 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
 b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 index 628500e..a80ab71 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 @@ -117,6 +117,7 @@
 (SNBEP_PMON_CTL_EV_SEL_MASK | \
  SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
  SNBEP_PMON_CTL_EDGE_DET | \
 +SNBEP_PMON_CTL_EV_SEL_EXT | \
  SNBEP_PMON_CTL_INVERT | \
  SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
 --
 1.8.1.4

--
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/


[PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-07 Thread Yan, Zheng
From: "Yan, Zheng" 

PCU uncore event control register has a undocumented ev_sel_ext bit.
The bit is needed by Andi's pmu-tools.

Signed-off-by: Yan, Zheng 
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 6b8b9c9..e9696d8 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] = 
{
 };
 
 static struct attribute *snbep_uncore_pcu_formats_attr[] = {
-   _attr_event.attr,
+   _attr_event_ext.attr,
_attr_occ_sel.attr,
_attr_edge.attr,
_attr_inv.attr,
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 628500e..a80ab71 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -117,6 +117,7 @@
(SNBEP_PMON_CTL_EV_SEL_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
 SNBEP_PMON_CTL_EDGE_DET | \
+SNBEP_PMON_CTL_EV_SEL_EXT | \
 SNBEP_PMON_CTL_INVERT | \
 SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
-- 
1.8.1.4

--
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/


[PATCH 3/3] perf, uncore: enable ev_sel_ext bit for PCU.

2013-08-07 Thread Yan, Zheng
From: Yan, Zheng zheng.z@intel.com

PCU uncore event control register has a undocumented ev_sel_ext bit.
The bit is needed by Andi's pmu-tools.

Signed-off-by: Yan, Zheng zheng.z@intel.com
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 6b8b9c9..e9696d8 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -301,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] = 
{
 };
 
 static struct attribute *snbep_uncore_pcu_formats_attr[] = {
-   format_attr_event.attr,
+   format_attr_event_ext.attr,
format_attr_occ_sel.attr,
format_attr_edge.attr,
format_attr_inv.attr,
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h 
b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 628500e..a80ab71 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -117,6 +117,7 @@
(SNBEP_PMON_CTL_EV_SEL_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
 SNBEP_PMON_CTL_EDGE_DET | \
+SNBEP_PMON_CTL_EV_SEL_EXT | \
 SNBEP_PMON_CTL_INVERT | \
 SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
 SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
-- 
1.8.1.4

--
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/