From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, ak@linux.intel.com, acme@kernel.org,
tglx@linutronix.de
Subject: [tip:perf/core] perf/x86/intel: Remove incorrect model number from Haswell perf
Date: Wed, 24 Sep 2014 07:58:58 -0700 [thread overview]
Message-ID: <tip-b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1@git.kernel.org> (raw)
In-Reply-To: <1409683455-29168-1-git-send-email-andi@firstfloor.org>
Commit-ID: b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1
Gitweb: http://git.kernel.org/tip/b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Tue, 2 Sep 2014 11:44:11 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 24 Sep 2014 14:48:15 +0200
perf/x86/intel: Remove incorrect model number from Haswell perf
71 is a Broadwell, not a Haswell. The model number was added
by mistake earlier.
Remove it for now, until it can be re-added later with
real Broadwell support.
In practice it does not cause a lot of issues because the Broadwell
PMU is very similar to Haswell, but some details were wrong,
and it's better to handle it correctly.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: eranian@google.com
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Link: http://lkml.kernel.org/r/1409683455-29168-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/cpu/perf_event_intel.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 89bc750..f962e26 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -2544,7 +2544,6 @@ __init int intel_pmu_init(void)
case 63:
case 69:
case 70:
- case 71:
x86_pmu.late_ack = true;
memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, sizeof(hw_cache_event_ids));
memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));
prev parent reply other threads:[~2014-09-24 14:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 18:44 [PATCH 1/5] perf, x86: Remove incorrect model number from Haswell perf Andi Kleen
2014-09-02 18:44 ` [PATCH 2/5] perf, x86: Document all Haswell models Andi Kleen
2014-09-24 14:59 ` [tip:perf/core] perf/x86/intel: " tip-bot for Andi Kleen
2014-09-02 18:44 ` [PATCH 3/5] perf, x86: Add Broadwell core support Andi Kleen
2014-09-24 14:59 ` [tip:perf/core] perf/x86/intel: " tip-bot for Andi Kleen
2014-10-29 11:03 ` [tip:perf/urgent] perf/x86/intel: Revert incomplete and undocumented Broadwell client support tip-bot for Ingo Molnar
2014-09-02 18:44 ` [PATCH 4/5] perf, x86: Add INST_RETIRED.ALL workarounds Andi Kleen
2014-09-24 14:59 ` [tip:perf/core] perf/x86: " tip-bot for Andi Kleen
2014-09-02 18:44 ` [PATCH 5/5] perf, x86: Use Broadwell cache event list for Haswell Andi Kleen
2014-09-24 14:59 ` [tip:perf/core] perf/x86/intel: " tip-bot for Andi Kleen
2014-09-18 22:42 ` [PATCH 1/5] perf, x86: Remove incorrect model number from Haswell perf Peter Zijlstra
2014-09-24 14:58 ` tip-bot for Andi Kleen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox