All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX
@ 2018-09-21 14:07 kan.liang
  2018-09-21 14:14 ` Peter Zijlstra
  2018-10-02 10:02 ` [tip:perf/core] " tip-bot for Kan Liang
  0 siblings, 2 replies; 4+ messages in thread
From: kan.liang @ 2018-09-21 14:07 UTC (permalink / raw)
  To: tglx, peterz, mingo, linux-kernel; +Cc: ak, eranian, stable, Kan Liang

From: Kan Liang <kan.liang@linux.intel.com>

The counters on M3UPI Link 0 and Link 3 don't count. Writing 0 to
these counters may causes system crash on some machines.

The PCI BDF addresses of M3UPI in current code are incorrect.
The correct addresses should be
D18:F1 	0x204D
D18:F2 	0x204E
D18:F5 	0x204D

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
 arch/x86/events/intel/uncore_snbep.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 51d7c11..3b3fc92 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3931,16 +3931,16 @@ static const struct pci_device_id skx_uncore_pci_ids[] = {
 		.driver_data = UNCORE_PCI_DEV_FULL_DATA(21, 5, SKX_PCI_UNCORE_M2PCIE, 3),
 	},
 	{ /* M3UPI0 Link 0 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204C),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 0, SKX_PCI_UNCORE_M3UPI, 0),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 1, SKX_PCI_UNCORE_M3UPI, 0),
 	},
 	{ /* M3UPI0 Link 1 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 1, SKX_PCI_UNCORE_M3UPI, 1),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204E),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 2, SKX_PCI_UNCORE_M3UPI, 1),
 	},
 	{ /* M3UPI1 Link 2 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204C),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 4, SKX_PCI_UNCORE_M3UPI, 2),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 5, SKX_PCI_UNCORE_M3UPI, 2),
 	},
 	{ /* end: all zeroes */ }
 };
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX
  2018-09-21 14:07 [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX kan.liang
@ 2018-09-21 14:14 ` Peter Zijlstra
  2018-09-21 14:37   ` Liang, Kan
  2018-10-02 10:02 ` [tip:perf/core] " tip-bot for Kan Liang
  1 sibling, 1 reply; 4+ messages in thread
From: Peter Zijlstra @ 2018-09-21 14:14 UTC (permalink / raw)
  To: kan.liang; +Cc: tglx, mingo, linux-kernel, ak, eranian, stable

On Fri, Sep 21, 2018 at 07:07:06AM -0700, kan.liang@linux.intel.com wrote:
> From: Kan Liang <kan.liang@linux.intel.com>
> 
> The counters on M3UPI Link 0 and Link 3 don't count. Writing 0 to
> these counters may causes system crash on some machines.
> 
> The PCI BDF addresses of M3UPI in current code are incorrect.
> The correct addresses should be
> D18:F1 	0x204D
> D18:F2 	0x204E
> D18:F5 	0x204D

Should this have a Fixes: tag?


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX
  2018-09-21 14:14 ` Peter Zijlstra
@ 2018-09-21 14:37   ` Liang, Kan
  0 siblings, 0 replies; 4+ messages in thread
From: Liang, Kan @ 2018-09-21 14:37 UTC (permalink / raw)
  To: Peter Zijlstra; +Cc: tglx, mingo, linux-kernel, ak, eranian, stable



On 9/21/2018 10:14 AM, Peter Zijlstra wrote:
> On Fri, Sep 21, 2018 at 07:07:06AM -0700, kan.liang@linux.intel.com wrote:
>> From: Kan Liang <kan.liang@linux.intel.com>
>>
>> The counters on M3UPI Link 0 and Link 3 don't count. Writing 0 to
>> these counters may causes system crash on some machines.
>>
>> The PCI BDF addresses of M3UPI in current code are incorrect.
>> The correct addresses should be
>> D18:F1 	0x204D
>> D18:F2 	0x204E
>> D18:F5 	0x204D
> 
> Should this have a Fixes: tag?
> 

Yes, sorry for missing it.
Here it is.
Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore 
support")

Thanks,
Kan

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip:perf/core] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX
  2018-09-21 14:07 [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX kan.liang
  2018-09-21 14:14 ` Peter Zijlstra
@ 2018-10-02 10:02 ` tip-bot for Kan Liang
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Kan Liang @ 2018-10-02 10:02 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: hpa, acme, jolsa, linux-kernel, kan.liang, peterz,
	alexander.shishkin, eranian, torvalds, vincent.weaver, mingo,
	tglx

Commit-ID:  9d92cfeaf5215158d26d2991be7f7ff865cb98f3
Gitweb:     https://git.kernel.org/tip/9d92cfeaf5215158d26d2991be7f7ff865cb98f3
Author:     Kan Liang <kan.liang@linux.intel.com>
AuthorDate: Fri, 21 Sep 2018 07:07:06 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 2 Oct 2018 09:38:02 +0200

perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX

The counters on M3UPI Link 0 and Link 3 don't count properly, and writing
0 to these counters may causes system crash on some machines.

The PCI BDF addresses of the M3UPI in the current code are incorrect.

The correct addresses should be:

  D18:F1	0x204D
  D18:F2	0x204E
  D18:F5	0x204D

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support")
Link: http://lkml.kernel.org/r/1537538826-55489-1-git-send-email-kan.liang@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/intel/uncore_snbep.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 53b981dcdb42..c07bee31abe8 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3931,16 +3931,16 @@ static const struct pci_device_id skx_uncore_pci_ids[] = {
 		.driver_data = UNCORE_PCI_DEV_FULL_DATA(21, 5, SKX_PCI_UNCORE_M2PCIE, 3),
 	},
 	{ /* M3UPI0 Link 0 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204C),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 0, SKX_PCI_UNCORE_M3UPI, 0),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 1, SKX_PCI_UNCORE_M3UPI, 0),
 	},
 	{ /* M3UPI0 Link 1 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 1, SKX_PCI_UNCORE_M3UPI, 1),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204E),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 2, SKX_PCI_UNCORE_M3UPI, 1),
 	},
 	{ /* M3UPI1 Link 2 */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204C),
-		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 4, SKX_PCI_UNCORE_M3UPI, 2),
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x204D),
+		.driver_data = UNCORE_PCI_DEV_FULL_DATA(18, 5, SKX_PCI_UNCORE_M3UPI, 2),
 	},
 	{ /* end: all zeroes */ }
 };

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-10-02 10:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-21 14:07 [PATCH] perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX kan.liang
2018-09-21 14:14 ` Peter Zijlstra
2018-09-21 14:37   ` Liang, Kan
2018-10-02 10:02 ` [tip:perf/core] " tip-bot for Kan Liang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.