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

Groups > linux.kernel > #1294092

[PATCH v4 02/12] arm-cci: Refactor pmu_write_counter

Show all headers | View raw

Refactor pmu_write_counter to add __pmu_write_counter() which
will actually write to the counter once the event is validated.
This can be used by hooks specific to CCI PMU model to program
the counter, where the event is already validated.

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

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 3786879..ce0d3ef 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -767,16 +767,22 @@ static u32 pmu_read_counter(struct perf_event *event)
 	return value;
 }
 
+static void __pmu_write_counter(struct cci_pmu *cci_pmu, u32 value, int idx)
+{
+	pmu_write_register(cci_pmu, value, idx, CCI_PMU_CNTR);
+}
+
 static void pmu_write_counter(struct perf_event *event, u32 value)
 {
 	struct cci_pmu *cci_pmu = to_cci_pmu(event->pmu);
 	struct hw_perf_event *hw_counter = &event->hw;
 	int idx = hw_counter->idx;
 
-	if (unlikely(!pmu_is_valid_counter(cci_pmu, idx)))
+	if (unlikely(!pmu_is_valid_counter(cci_pmu, idx))) {
 		dev_err(&cci_pmu->plat_device->dev, "Invalid CCI PMU counter %d\n", idx);
-	else
-		pmu_write_register(cci_pmu, value, idx, CCI_PMU_CNTR);
+		return;
+	}
+	__pmu_write_counter(cci_pmu, value, idx);
 }
 
 static u64 pmu_event_update(struct perf_event *event)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCHv4 00/12] arm-cci: PMU updates "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 18:50 +0100
  [PATCH v4 09/12] arm-cci: Provide hook for writing to PMU counters "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 18:50 +0100
  [PATCH v4 08/12] arm-cci: Add routines to save/restore all counters "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 18:50 +0100
  [PATCH v4 11/12] arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 18:50 +0100
  [PATCH v4 10/12] arm-cci: CCI-500: Work around PMU counter writes "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 02/12] arm-cci: Refactor pmu_write_counter "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 01/12] arm-cci: Define CCI counter period "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 06/12] arm-cci: Refactor CCI PMU enable/disable methods "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 05/12] arm-cci: PMU: Add support for transactions "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
    Re: [PATCH v4 05/12] arm-cci: PMU: Add support for transactions Peter Zijlstra <peterz@infradead.org> - 2015-12-17 19:50 +0100
      Re: [PATCH v4 05/12] arm-cci: PMU: Add support for transactions "Suzuki K. Poulose" <Suzuki.Poulose@arm.com> - 2015-12-18 11:30 +0100
        Re: [PATCH v4 05/12] arm-cci: PMU: Add support for transactions Peter Zijlstra <peterz@infradead.org> - 2015-12-18 11:50 +0100
          Re: [PATCH v4 05/12] arm-cci: PMU: Add support for transactions "Suzuki K. Poulose" <Suzuki.Poulose@arm.com> - 2015-12-18 12:00 +0100
            Re: [PATCH v4 05/12] arm-cci: PMU: Add support for transactions Peter Zijlstra <peterz@infradead.org> - 2015-12-18 12:50 +0100
  [PATCH v4 07/12] arm-cci: Get the status of a counter "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 03/12] arm-cci: Group writes to counter "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 04/12] arm-cci: Fix the flags for pmu_start called from pmu_add "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100
  [PATCH v4 12/12] arm-cci: CoreLink CCI-550 PMU driver "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-12-17 19:00 +0100

csiph-web