Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1340540

[PATCH 08/13] arm-cci: Add routines to save/restore all counters

Show all headers | View raw

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 d289037..7ce7da0 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/13] arm-cci: PMU driver updates for 4.6 Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 05/13] arm-cci: Delay PMU counter writes to pmu::pmu_enable Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 07/13] arm-cci: Get the status of a counter Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 03/13] arm-cci: Group writes to counter Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 06/13] arm-cci: write_counter: Remove redundant check Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 09/13] arm-cci: Add helper to enable PMU without synchornising counters Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 08/13] arm-cci: Add routines to save/restore all counters Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  [PATCH 11/13] arm-cci: CCI-500: Work around PMU counter writes Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-02-23 12:00 +0100
  Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Will Deacon <will.deacon@arm.com> - 2016-02-23 12:50 +0100
    Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 "Suzuki K. Poulose" <Suzuki.Poulose@arm.com> - 2016-02-23 15:00 +0100
      Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Olof Johansson <olof@lixom.net> - 2016-02-24 18:00 +0100
        Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Will Deacon <will.deacon@arm.com> - 2016-02-24 18:20 +0100
          Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Olof Johansson <olof@lixom.net> - 2016-02-24 19:50 +0100
            Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Will Deacon <will.deacon@arm.com> - 2016-02-26 17:50 +0100

csiph-web