From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 17/36] target/arm: Count PMU events when MDCR.SPME is set
Date: Mon, 14 Sep 2020 15:06:22 +0100 [thread overview]
Message-ID: <20200914140641.21369-18-peter.maydell@linaro.org> (raw)
In-Reply-To: <20200914140641.21369-1-peter.maydell@linaro.org>
From: Aaron Lindsay <aaron@os.amperecomputing.com>
This check was backwards when introduced in commit
033614c47de78409ad3fb39bb7bd1483b71c6789:
target/arm: Filter cycle counter based on PMCCFILTR_EL0
Cc: qemu-stable@nongnu.org
Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 44d666627a8..88bd9dd35da 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1452,7 +1452,7 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter)
}
} else {
prohibited = arm_feature(env, ARM_FEATURE_EL3) &&
- (env->cp15.mdcr_el3 & MDCR_SPME);
+ !(env->cp15.mdcr_el3 & MDCR_SPME);
}
if (prohibited && counter == 31) {
--
2.20.1
next prev parent reply other threads:[~2020-09-14 15:42 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 14:06 [PULL 00/36] target-arm queue Peter Maydell
2020-09-14 14:06 ` [PULL 01/36] hw/misc/a9scu: Do not allow invalid CPU count Peter Maydell
2020-09-14 14:06 ` [PULL 02/36] hw/misc/a9scu: Simplify setting MemoryRegionOps::valid fields Peter Maydell
2020-09-14 14:06 ` [PULL 03/36] hw/misc/a9scu: Simplify setting MemoryRegionOps::impl fields Peter Maydell
2020-09-14 14:06 ` [PULL 04/36] hw/misc/a9scu: Report unimplemented accesses with qemu_log_mask(UNIMP) Peter Maydell
2020-09-14 14:06 ` [PULL 05/36] hw/timer/armv7m_systick: assert that board code set system_clock_scale Peter Maydell
2020-09-14 14:06 ` [PULL 06/36] decodetree: Improve identifier matching Peter Maydell
2020-09-14 14:06 ` [PULL 07/36] target/arm: Convert Neon 3-same-fp size field to MO_* in decode Peter Maydell
2020-09-14 14:06 ` [PULL 08/36] target/arm: Convert Neon VCVT fp " Peter Maydell
2020-09-14 14:06 ` [PULL 09/36] target/arm: Convert VCMLA, VCADD " Peter Maydell
2020-09-14 14:06 ` [PULL 10/36] target/arm: Remove KVM support for 32-bit Arm hosts Peter Maydell
2020-09-14 14:06 ` [PULL 11/36] target/arm: Remove no-longer-reachable 32-bit KVM code Peter Maydell
2020-09-14 14:06 ` [PULL 12/36] hw/arm/mps2: New board model mps2-an386 Peter Maydell
2020-09-14 14:06 ` [PULL 13/36] hw/arm/mps2: New board model mps2-an500 Peter Maydell
2020-09-14 14:06 ` [PULL 14/36] docs/system/arm/mps2.rst: Make board list consistent Peter Maydell
2020-09-14 14:06 ` [PULL 15/36] Deprecate Unicore32 port Peter Maydell
2020-09-14 14:06 ` [PULL 16/36] Deprecate lm32 port Peter Maydell
2020-09-14 14:06 ` Peter Maydell [this message]
2020-09-14 14:06 ` [PULL 18/36] hw/arm: versal-virt: Correct the tx/rx GEM clocks Peter Maydell
2020-09-14 14:06 ` [PULL 19/36] hw/misc: Add NPCM7xx System Global Control Registers device model Peter Maydell
2020-09-14 14:06 ` [PULL 20/36] hw/misc: Add NPCM7xx Clock Controller " Peter Maydell
2020-09-14 14:06 ` [PULL 21/36] hw/timer: Add NPCM7xx Timer " Peter Maydell
2020-09-14 14:06 ` [PULL 22/36] hw/arm: Add NPCM730 and NPCM750 SoC models Peter Maydell
2020-09-14 14:06 ` [PULL 23/36] hw/arm: Add two NPCM7xx-based machines Peter Maydell
2020-09-14 14:06 ` [PULL 24/36] roms: Add virtual Boot ROM for NPCM7xx SoCs Peter Maydell
2020-09-14 14:06 ` [PULL 25/36] hw/arm: Load -bios image as a boot ROM for npcm7xx Peter Maydell
2020-09-14 14:06 ` [PULL 26/36] hw/nvram: NPCM7xx OTP device model Peter Maydell
2020-09-14 14:06 ` [PULL 27/36] hw/mem: Stubbed out NPCM7xx Memory Controller model Peter Maydell
2020-09-14 14:06 ` [PULL 28/36] hw/ssi: NPCM7xx Flash Interface Unit device model Peter Maydell
2020-09-14 14:06 ` [PULL 29/36] hw/arm: Wire up BMC boot flash for npcm750-evb and quanta-gsj Peter Maydell
2020-09-14 14:06 ` [PULL 30/36] hw/arm/npcm7xx: add board setup stub for CPU and UART clocks Peter Maydell
2020-09-14 14:06 ` [PULL 31/36] docs/system: Add Nuvoton machine documentation Peter Maydell
2020-09-14 14:06 ` [PULL 32/36] tests/acceptance: console boot tests for quanta-gsj Peter Maydell
2020-09-18 13:52 ` Philippe Mathieu-Daudé
2020-09-18 13:56 ` Philippe Mathieu-Daudé
2020-09-18 16:24 ` Havard Skinnemoen
2020-09-14 14:06 ` [PULL 33/36] hw/net/can: Introduce Xilinx ZynqMP CAN controller Peter Maydell
2020-09-14 14:06 ` [PULL 34/36] xlnx-zynqmp: Connect Xilinx ZynqMP CAN controllers Peter Maydell
2020-09-14 14:06 ` [PULL 35/36] tests/qtest: Introduce tests for Xilinx ZynqMP CAN controller Peter Maydell
2020-09-14 14:06 ` [PULL 36/36] MAINTAINERS: Add maintainer entry " Peter Maydell
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=20200914140641.21369-18-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).