* [PATCH] perf/x86/intel/uncore: fix Add BW copypasta
@ 2020-10-26 21:51 Arnd Bergmann
2020-11-10 16:59 ` Peter Zijlstra
2020-11-11 8:23 ` [tip: perf/urgent] perf/x86/intel/uncore: Fix " tip-bot2 for Arnd Bergmann
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2020-10-26 21:51 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Thomas Gleixner, Borislav Petkov, x86, Vaibhav Shankar
Cc: Arnd Bergmann, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, H. Peter Anvin, Kan Liang, Andi Kleen,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
gcc -Wextra points out a duplicate initialization of one array
member:
arch/x86/events/intel/uncore_snb.c:478:37: warning: initialized field overwritten [-Woverride-init]
478 | [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
The only sensible explanation is that a duplicate 'READS' was used
instead of the correct 'WRITES', so change it back.
Fixes: 24633d901ea4 ("perf/x86/intel/uncore: Add BW counters for GT, IA and IO breakdown")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/events/intel/uncore_snb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index 39e632ed6ca9..bbd1120ae161 100644
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -475,7 +475,7 @@ enum perf_snb_uncore_imc_freerunning_types {
static struct freerunning_counters snb_uncore_imc_freerunning[] = {
[SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_READS_BASE,
0x0, 0x0, 1, 32 },
- [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
+ [SNB_PCI_UNCORE_IMC_DATA_WRITES] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
0x0, 0x0, 1, 32 },
[SNB_PCI_UNCORE_IMC_GT_REQUESTS] = { SNB_UNCORE_PCI_IMC_GT_REQUESTS_BASE,
0x0, 0x0, 1, 32 },
--
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] perf/x86/intel/uncore: fix Add BW copypasta
2020-10-26 21:51 [PATCH] perf/x86/intel/uncore: fix Add BW copypasta Arnd Bergmann
@ 2020-11-10 16:59 ` Peter Zijlstra
2020-11-11 8:23 ` [tip: perf/urgent] perf/x86/intel/uncore: Fix " tip-bot2 for Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2020-11-10 16:59 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ingo Molnar, Arnaldo Carvalho de Melo, Thomas Gleixner,
Borislav Petkov, x86, Vaibhav Shankar, Arnd Bergmann,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
H. Peter Anvin, Kan Liang, Andi Kleen, linux-kernel
On Mon, Oct 26, 2020 at 10:51:57PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> gcc -Wextra points out a duplicate initialization of one array
> member:
>
> arch/x86/events/intel/uncore_snb.c:478:37: warning: initialized field overwritten [-Woverride-init]
> 478 | [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
>
> The only sensible explanation is that a duplicate 'READS' was used
> instead of the correct 'WRITES', so change it back.
>
> Fixes: 24633d901ea4 ("perf/x86/intel/uncore: Add BW counters for GT, IA and IO breakdown")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip: perf/urgent] perf/x86/intel/uncore: Fix Add BW copypasta
2020-10-26 21:51 [PATCH] perf/x86/intel/uncore: fix Add BW copypasta Arnd Bergmann
2020-11-10 16:59 ` Peter Zijlstra
@ 2020-11-11 8:23 ` tip-bot2 for Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Arnd Bergmann @ 2020-11-11 8:23 UTC (permalink / raw)
To: linux-tip-commits
Cc: Arnd Bergmann, Peter Zijlstra (Intel), x86, linux-kernel
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 1a8cfa24e21c2f154791f0cdd85fc28496918722
Gitweb: https://git.kernel.org/tip/1a8cfa24e21c2f154791f0cdd85fc28496918722
Author: Arnd Bergmann <arnd@arndb.de>
AuthorDate: Mon, 26 Oct 2020 22:51:57 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 10 Nov 2020 18:38:40 +01:00
perf/x86/intel/uncore: Fix Add BW copypasta
gcc -Wextra points out a duplicate initialization of one array
member:
arch/x86/events/intel/uncore_snb.c:478:37: warning: initialized field overwritten [-Woverride-init]
478 | [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
The only sensible explanation is that a duplicate 'READS' was used
instead of the correct 'WRITES', so change it back.
Fixes: 24633d901ea4 ("perf/x86/intel/uncore: Add BW counters for GT, IA and IO breakdown")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201026215203.3893972-1-arnd@kernel.org
---
arch/x86/events/intel/uncore_snb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index 39e632e..bbd1120 100644
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -475,7 +475,7 @@ enum perf_snb_uncore_imc_freerunning_types {
static struct freerunning_counters snb_uncore_imc_freerunning[] = {
[SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_READS_BASE,
0x0, 0x0, 1, 32 },
- [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
+ [SNB_PCI_UNCORE_IMC_DATA_WRITES] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE,
0x0, 0x0, 1, 32 },
[SNB_PCI_UNCORE_IMC_GT_REQUESTS] = { SNB_UNCORE_PCI_IMC_GT_REQUESTS_BASE,
0x0, 0x0, 1, 32 },
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-11 8:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-26 21:51 [PATCH] perf/x86/intel/uncore: fix Add BW copypasta Arnd Bergmann
2020-11-10 16:59 ` Peter Zijlstra
2020-11-11 8:23 ` [tip: perf/urgent] perf/x86/intel/uncore: Fix " tip-bot2 for Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®