From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Sasha Levin <alexander.levin@verizon.com>
Subject: [PATCH 4.9 45/51] powerpc/perf: Add restrictions to PMC5 in power9 DD1
Date: Thu, 19 Oct 2017 15:49:06 +0200 [thread overview]
Message-ID: <20171019134844.165554638@linuxfoundation.org> (raw)
In-Reply-To: <20171019134841.383925150@linuxfoundation.org>
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
[ Upstream commit 8d911904f3ce412b20874a9c95f82009dcbb007c ]
PMC5 on POWER9 DD1 may not provide right counts in all
sampling scenarios, hence use PM_INST_DISP event instead
in PMC2 or PMC3 in preference.
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/perf/isa207-common.h | 4 ++++
arch/powerpc/perf/power9-pmu.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
--- a/arch/powerpc/perf/isa207-common.h
+++ b/arch/powerpc/perf/isa207-common.h
@@ -201,6 +201,10 @@
CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \
CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL
+/*
+ * Lets restrict use of PMC5 for instruction counting.
+ */
+#define P9_DD1_TEST_ADDER (ISA207_TEST_ADDER | CNST_PMC_VAL(5))
/* Bits in MMCR1 for PowerISA v2.07 */
#define MMCR1_UNIT_SHIFT(pmc) (60 - (4 * ((pmc) - 1)))
--- a/arch/powerpc/perf/power9-pmu.c
+++ b/arch/powerpc/perf/power9-pmu.c
@@ -295,7 +295,7 @@ static struct power_pmu power9_pmu = {
.name = "POWER9",
.n_counter = MAX_PMU_COUNTERS,
.add_fields = ISA207_ADD_FIELDS,
- .test_adder = ISA207_TEST_ADDER,
+ .test_adder = P9_DD1_TEST_ADDER,
.compute_mmcr = isa207_compute_mmcr,
.config_bhrb = power9_config_bhrb,
.bhrb_filter_map = power9_bhrb_filter_map,
next prev parent reply other threads:[~2017-10-19 13:49 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 13:48 [PATCH 4.9 00/51] 4.9.58-stable review Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 01/51] MIPS: Fix minimum alignment requirement of IRQ stack Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 02/51] Revert "bsg-lib: dont free job in bsg_prepare_job" Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 03/51] xen-netback: Use GFP_ATOMIC to allocate hash Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 05/51] watchdog: kempld: fix gcc-4.3 build Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 06/51] irqchip/crossbar: Fix incorrect type of local variables Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 07/51] initramfs: finish fput() before accessing any binary from initramfs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 08/51] mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 09/51] ALSA: hda: Add Geminilake HDMI codec ID Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 10/51] qed: Dont use attention PTT for configuring BW Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 11/51] mac80211: fix power saving clients handling in iwlwifi Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 12/51] net/mlx4_en: fix overflow in mlx4_en_init_timestamp() Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 13/51] staging: vchiq_2835_arm: Make cache-line-size a required DT property Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 14/51] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 15/51] iio: adc: xilinx: Fix error handling Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 16/51] f2fs: do SSR for data when there is enough free space Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 17/51] sched/fair: Update rq clock before changing a tasks CPU affinity Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 18/51] Btrfs: send, fix failure to rename top level inode due to name collision Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 19/51] f2fs: do not wait for writeback in write_begin Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 20/51] md/linear: shutup lockdep warnning Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 21/51] sparc64: Migrate hvcons irq to panicked cpu Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 22/51] net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 23/51] crypto: xts - Add ECB dependency Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 24/51] mm/memory_hotplug: set magic number to page->freelist instead of page->lru.next Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 25/51] ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 26/51] slub: do not merge cache if slub_debug contains a never-merge flag Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 27/51] scsi: scsi_dh_emc: return success in clariion_std_inquiry() Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 28/51] ASoC: mediatek: add I2C dependency for CS42XX8 Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 30/51] net: mvpp2: release reference to txq_cpu[] entry after unmapping Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 31/51] qede: Prevent index problems in loopback test Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 32/51] qed: Reserve doorbell BAR space for present CPUs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 33/51] qed: Read queue state before releasing buffer Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 34/51] i2c: at91: ensure state is restored after suspending Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 35/51] ceph: dont update_dentry_lease unless we actually got one Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 36/51] ceph: fix bogus endianness change in ceph_ioctl_set_layout Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 37/51] ceph: clean up unsafe d_parent accesses in build_dentry_path Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 38/51] uapi: fix linux/rds.h userspace compilation errors Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 39/51] uapi: fix linux/mroute6.h " Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 40/51] IB/hfi1: Use static CTLE with Preset 6 for integrated HFIs Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 41/51] IB/hfi1: Allocate context data on memory node Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 42/51] target/iscsi: Fix unsolicited data seq_end_offset calculation Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 43/51] hrtimer: Catch invalid clockids again Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 44/51] nfsd/callback: Cleanup callback cred on shutdown Greg Kroah-Hartman
2017-10-19 13:49 ` Greg Kroah-Hartman [this message]
2017-10-19 13:49 ` [PATCH 4.9 46/51] drm/nouveau/gr/gf100-: fix ccache error logging Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 47/51] regulator: core: Resolve supplies before disabling unused regulators Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 48/51] btmrvl: avoid double-disable_irq() race Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 49/51] EDAC, mce_amd: Print IPID and Syndrome on a separate line Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 50/51] cpufreq: CPPC: add ACPI_PROCESSOR dependency Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 51/51] usb: dwc3: gadget: Correct ISOC DATA PIDs for short packets Greg Kroah-Hartman
2017-10-19 22:18 ` [PATCH 4.9 00/51] 4.9.58-stable review Tom Gall
2017-10-20 6:28 ` Greg Kroah-Hartman
2017-10-20 13:12 ` Guenter Roeck
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=20171019134844.165554638@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alexander.levin@verizon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).