mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Suzuki K. Poulose" <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, punit.agrawal@arm.com, arm@kernel.org,
	linux-kernel@vger.kernel.org,
	"Suzuki K. Poulose" <suzuki.poulose@arm.com>
Subject: [PATCH v6 07/12] arm-cci: Add routines to save/restore all counters
Date: Mon, 25 Jan 2016 11:21:12 +0000	[thread overview]
Message-ID: <1453720877-24962-8-git-send-email-suzuki.poulose@arm.com> (raw)
In-Reply-To: <1453720877-24962-1-git-send-email-suzuki.poulose@arm.com>

Adds helper routines to disable the counter controls for
all the counters on the CCI PMU and restore it back, by
preserving the original state in caller provided mask.

Cc: Punit Agrawal <punit.agrawal@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
---
 drivers/bus/arm-cci.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index f8f6a17..997ad36 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -719,6 +719,44 @@ static void pmu_set_event(struct cci_pmu *cci_pmu, int idx, unsigned long event)
 }
 
 /*
+ * For all counters on the CCI-PMU, disable any 'enabled' counters,
+ * saving the changed counters in the mask, so that we can restore
+ * it later using pmu_restore_counters. The mask is private to the
+ * caller. We cannot rely on the used_mask maintained by the CCI_PMU
+ * as it only tells us if the counter is assigned to perf_event or not.
+ * The state of the perf_event cannot be locked by the PMU layer, hence
+ * we check the individual counter status (which can be locked by
+ * cci_pm->hw_events->pmu_lock).
+ *
+ * @mask should be initialised to empty by the caller.
+ */
+static void __maybe_unused
+pmu_save_counters(struct cci_pmu *cci_pmu, unsigned long *mask)
+{
+	int i;
+
+	for (i = 0; i < cci_pmu->num_cntrs; i++) {
+		if (pmu_counter_is_enabled(cci_pmu, i)) {
+			set_bit(i, mask);
+			pmu_disable_counter(cci_pmu, i);
+		}
+	}
+}
+
+/*
+ * Restore the status of the counters. Reversal of the pmu_save_counters().
+ * For each counter set in the mask, enable the counter back.
+ */
+static void __maybe_unused
+pmu_restore_counters(struct cci_pmu *cci_pmu, unsigned long *mask)
+{
+	int i;
+
+	for_each_set_bit(i, mask, cci_pmu->num_cntrs)
+		pmu_enable_counter(cci_pmu, i);
+}
+
+/*
  * Returns the number of programmable counters actually implemented
  * by the cci
  */
-- 
1.7.9.5

  parent reply	other threads:[~2016-01-25 11:24 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25 11:21 [PATCH v6 00/12] arm-cci: PMU driver updates Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 01/12] arm-cci: simplify sysfs attr handling Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 02/12] arm-cci: Group writes to counter Suzuki K. Poulose
2016-02-22 14:49   ` Mark Rutland
2016-01-25 11:21 ` [PATCH v6 03/12] arm-cci: Refactor CCI PMU enable/disable methods Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 04/12] arm-cci: Delay PMU counter writes to pmu::pmu_enable Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 05/12] arm-cci: write_counter: Remove redundant check Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 06/12] arm-cci: Get the status of a counter Suzuki K. Poulose
2016-01-25 11:21 ` Suzuki K. Poulose [this message]
2016-01-25 11:21 ` [PATCH v6 08/12] __cci_pmu_enable: Make counter sync optional Suzuki K. Poulose
2016-02-22 15:14   ` Mark Rutland
2016-01-25 11:21 ` [PATCH v6 09/12] arm-cci: Provide hook for writing to PMU counters Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 10/12] arm-cci: CCI-500: Work around PMU counter writes Suzuki K. Poulose
2016-02-22 15:02   ` Mark Rutland
2016-02-22 15:16   ` Mark Rutland
2016-01-25 11:21 ` [PATCH v6 11/12] arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU Suzuki K. Poulose
2016-01-25 11:21 ` [PATCH v6 12/12] arm-cci: CoreLink CCI-550 PMU driver Suzuki K. Poulose
2016-02-14 11:13 ` [PATCH v6 00/12] arm-cci: PMU driver updates Suzuki K. Poulose
2016-02-22 15:18 ` Mark Rutland

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=1453720877-24962-8-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=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®