From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: Wei-Ning Huang <wnhuang@google.com>,
linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org,
james.clark@arm.com, leo.yan@linaro.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] coresight: etm4x: Allow configuring cycle count threshold
Date: Thu, 19 Oct 2023 10:23:46 +0100 [thread overview]
Message-ID: <e642fa48-ed0a-f785-42ba-2df1249e0593@arm.com> (raw)
In-Reply-To: <20231019082357.1505047-1-wnhuang@google.com>
On 19/10/2023 09:23, Wei-Ning Huang wrote:
> Allow userspace to configure cycle count threshold through
> perf_event_attr config. The last high 12-bit of config value is used to
> store the cycle count threshold.
>
We have queued the support already in coreisght next tree,
patches posted here [0]
[0] -
https://lore.kernel.org/r/20230921033631.1298723-1-anshuman.khandual@arm.com
Suzuki
> Signed-off-by: Wei-Ning Huang <wnhuang@google.com>
> ---
> drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 +++++-
> include/linux/coresight-pmu.h | 14 ++++++++------
> tools/include/linux/coresight-pmu.h | 14 ++++++++------
> 3 files changed, 21 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index 77b0271ce6eb..155441668b4a 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -645,6 +645,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev,
> struct perf_event_attr *attr = &event->attr;
> unsigned long cfg_hash;
> int preset;
> + u64 cyc_threadhold;
>
> /* Clear configuration from previous run */
> memset(config, 0, sizeof(struct etmv4_config));
> @@ -667,7 +668,10 @@ static int etm4_parse_event_config(struct coresight_device *csdev,
> if (attr->config & BIT(ETM_OPT_CYCACC)) {
> config->cfg |= TRCCONFIGR_CCI;
> /* TRM: Must program this for cycacc to work */
> - config->ccctlr = ETM_CYC_THRESHOLD_DEFAULT;
> + cyc_threshold = ((attr->config >> ETM_OPT_CYC_THRESHOLD_SHIFT) &
> + ETM_OPT_CYC_THRESHOLD_MASK;
> + config->ccctlr = cyc_threshold ? cyc_threshold :
> + ETM_CYC_THRESHOLD_DEFAULT;
> }
> if (attr->config & BIT(ETM_OPT_TS)) {
> /*
> diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h
> index 51ac441a37c3..14f48658ff1c 100644
> --- a/include/linux/coresight-pmu.h
> +++ b/include/linux/coresight-pmu.h
> @@ -29,12 +29,14 @@
> * ETMv3.5/PTM doesn't define ETMCR config bits with prefix "ETM3_" and
> * directly use below macros as config bits.
> */
> -#define ETM_OPT_BRANCH_BROADCAST 8
> -#define ETM_OPT_CYCACC 12
> -#define ETM_OPT_CTXTID 14
> -#define ETM_OPT_CTXTID2 15
> -#define ETM_OPT_TS 28
> -#define ETM_OPT_RETSTK 29
> +#define ETM_OPT_BRANCH_BROADCAST 8
> +#define ETM_OPT_CYCACC 12
> +#define ETM_OPT_CTXTID 14
> +#define ETM_OPT_CTXTID2 15
> +#define ETM_OPT_TS 28
> +#define ETM_OPT_RETSTK 29
> +#define ETM_OPT_CYC_THRESHOLD_SHIFT 52
> +#define ETM_OPT_CYC_THRESHOLD_MASK 0xfff
>
> /* ETMv4 CONFIGR programming bits for the ETM OPTs */
> #define ETM4_CFG_BIT_BB 3
> diff --git a/tools/include/linux/coresight-pmu.h b/tools/include/linux/coresight-pmu.h
> index 51ac441a37c3..14f48658ff1c 100644
> --- a/tools/include/linux/coresight-pmu.h
> +++ b/tools/include/linux/coresight-pmu.h
> @@ -29,12 +29,14 @@
> * ETMv3.5/PTM doesn't define ETMCR config bits with prefix "ETM3_" and
> * directly use below macros as config bits.
> */
> -#define ETM_OPT_BRANCH_BROADCAST 8
> -#define ETM_OPT_CYCACC 12
> -#define ETM_OPT_CTXTID 14
> -#define ETM_OPT_CTXTID2 15
> -#define ETM_OPT_TS 28
> -#define ETM_OPT_RETSTK 29
> +#define ETM_OPT_BRANCH_BROADCAST 8
> +#define ETM_OPT_CYCACC 12
> +#define ETM_OPT_CTXTID 14
> +#define ETM_OPT_CTXTID2 15
> +#define ETM_OPT_TS 28
> +#define ETM_OPT_RETSTK 29
> +#define ETM_OPT_CYC_THRESHOLD_SHIFT 52
> +#define ETM_OPT_CYC_THRESHOLD_MASK 0xfff
>
> /* ETMv4 CONFIGR programming bits for the ETM OPTs */
> #define ETM4_CFG_BIT_BB 3
next prev parent reply other threads:[~2023-10-19 9:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 8:23 Wei-Ning Huang
2023-10-19 9:23 ` Suzuki K Poulose [this message]
2023-10-23 9:56 ` kernel test robot
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=e642fa48-ed0a-f785-42ba-2df1249e0593@arm.com \
--to=suzuki.poulose@arm.com \
--cc=coresight@lists.linaro.org \
--cc=james.clark@arm.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wnhuang@google.com \
/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
all inboxes | Powered by JetHome®