From: "Suzuki K. Poulose" <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, arm@kernel.org,
mark.rutland@arm.com, punit.agrawal@arm.com,
peterz@infradead.org,
"Suzuki K. Poulose" <suzuki.poulose@arm.com>
Subject: [PATCH v5 08/11] arm-cci: Provide hook for writing to PMU counters
Date: Mon, 4 Jan 2016 11:54:47 +0000 [thread overview]
Message-ID: <1451908490-2615-9-git-send-email-suzuki.poulose@arm.com> (raw)
In-Reply-To: <1451908490-2615-1-git-send-email-suzuki.poulose@arm.com>
Add a hook for writing to CCI PMU counters. This callback
can be used for CCI models which requires some extra work
to program the PMU counter values. To accommodate group writes
and single counter writes, the call back accepts a bitmask
of the counter indices which need to be programmed with the
given value.
Cc: Punit Agrawal <punit.agrawal@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
---
drivers/bus/arm-cci.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 2f1fcf0..47c9581 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -134,6 +134,7 @@ struct cci_pmu_model {
struct event_range event_ranges[CCI_IF_MAX];
int (*validate_hw_event)(struct cci_pmu *, unsigned long);
int (*get_event_idx)(struct cci_pmu *, struct cci_pmu_hw_events *, unsigned long);
+ void (*write_counters)(struct cci_pmu *, unsigned long *, u32 val);
};
static struct cci_pmu_model cci_pmu_models[];
@@ -846,7 +847,15 @@ static void pmu_write_counter(struct perf_event *event, u32 value)
dev_err(&cci_pmu->plat_device->dev, "Invalid CCI PMU counter %d\n", idx);
return;
}
- __pmu_write_counter(cci_pmu, value, idx);
+
+ if (cci_pmu->model->write_counters) {
+ unsigned long mask[BITS_TO_LONGS(cci_pmu->num_cntrs)];
+
+ memset(mask, 0, BITS_TO_LONGS(cci_pmu->num_cntrs) * sizeof(unsigned long));
+ set_bit(idx, mask);
+ cci_pmu->model->write_counters(cci_pmu, mask, value);
+ } else
+ __pmu_write_counter(cci_pmu, value, idx);
}
/* Write a value to a given set of counters */
@@ -861,7 +870,10 @@ static void __pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask, u
static void __maybe_unused
pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask, u32 value)
{
- __pmu_write_counters(cci_pmu, mask, value);
+ if (cci_pmu->model->write_counters)
+ cci_pmu->model->write_counters(cci_pmu, mask, value);
+ else
+ __pmu_write_counters(cci_pmu, mask, value);
}
static u64 pmu_event_update(struct perf_event *event)
--
1.7.9.5
next prev parent reply other threads:[~2016-01-04 11:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-04 11:54 [PATCH v5 00/11] arm-cci: PMU updates Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 01/11] arm-cci: Define CCI counter period Suzuki K. Poulose
2016-01-04 18:27 ` Mark Rutland
2016-01-05 9:50 ` Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 02/11] arm-cci: Refactor pmu_write_counter Suzuki K. Poulose
2016-01-04 19:01 ` Mark Rutland
2016-01-04 11:54 ` [PATCH v5 03/11] arm-cci: Group writes to counter Suzuki K. Poulose
2016-01-04 19:03 ` Mark Rutland
2016-01-05 10:51 ` Suzuki K. Poulose
2016-01-11 10:44 ` Mark Rutland
2016-01-11 10:48 ` Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 04/11] arm-cci: Refactor CCI PMU enable/disable methods Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 05/11] arm-cci PMU: Delay counter writes to pmu_enable Suzuki K. Poulose
2016-01-04 19:24 ` Mark Rutland
2016-01-05 9:59 ` Suzuki K. Poulose
2016-01-11 10:46 ` Mark Rutland
2016-01-11 11:08 ` Suzuki K. Poulose
2016-01-11 11:24 ` Mark Rutland
2016-01-11 18:12 ` Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 06/11] arm-cci: Get the status of a counter Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 07/11] arm-cci: Add routines to save/restore all counters Suzuki K. Poulose
2016-01-11 10:50 ` Mark Rutland
2016-01-11 10:58 ` Suzuki K. Poulose
2016-01-04 11:54 ` Suzuki K. Poulose [this message]
2016-01-11 10:54 ` [PATCH v5 08/11] arm-cci: Provide hook for writing to PMU counters Mark Rutland
2016-01-11 12:14 ` Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 09/11] arm-cci: CCI-500: Work around PMU counter writes Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 10/11] arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU Suzuki K. Poulose
2016-01-04 11:54 ` [PATCH v5 11/11] arm-cci: CoreLink CCI-550 PMU driver Suzuki K. Poulose
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=1451908490-2615-9-git-send-email-suzuki.poulose@arm.com \
--to=suzuki.poulose@arm.com \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peterz@infradead.org \
--cc=punit.agrawal@arm.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®