linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: arm@kernel.org, arnd@arndb.de, olof@lixom.net,
	punit.agrawal@arm.com, mark.rutland@arm.com, will.deacon@arm.com,
	linux-kernel@vger.kernel.org,
	Suzuki K Poulose <suzuki.poulose@arm.com>
Subject: [PATCH 09/13] arm-cci: Add helper to enable PMU without synchornising counters
Date: Tue, 23 Feb 2016 10:49:51 +0000	[thread overview]
Message-ID: <1456224595-3282-10-git-send-email-suzuki.poulose@arm.com> (raw)
In-Reply-To: <1456224595-3282-1-git-send-email-suzuki.poulose@arm.com>

On CCI-500 writing to a counter requires turning the PMU on. So,
synchronising the counter state should not be performed for such special cases,
while turning the PMU on. This patch adds a helper, __cci_pmu_enable_nosync(),
without flushing the counter states.

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 |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 7ce7da0..bcc4c59 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -640,18 +640,23 @@ void cci_pmu_sync_counters(struct cci_pmu *cci_pmu)
 }
 
 /* Should be called with cci_pmu->hw_events->pmu_lock held */
-static void __cci_pmu_enable(struct cci_pmu *cci_pmu)
+static void __cci_pmu_enable_nosync(struct cci_pmu *cci_pmu)
 {
 	u32 val;
 
-	cci_pmu_sync_counters(cci_pmu);
-
 	/* Enable all the PMU counters. */
 	val = readl_relaxed(cci_ctrl_base + CCI_PMCR) | CCI_PMCR_CEN;
 	writel(val, cci_ctrl_base + CCI_PMCR);
 }
 
 /* Should be called with cci_pmu->hw_events->pmu_lock held */
+static void __cci_pmu_enable_sync(struct cci_pmu *cci_pmu)
+{
+	cci_pmu_sync_counters(cci_pmu);
+	__cci_pmu_enable_nosync(cci_pmu);
+}
+
+/* Should be called with cci_pmu->hw_events->pmu_lock held */
 static void __cci_pmu_disable(void)
 {
 	u32 val;
@@ -960,7 +965,7 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
 	}
 
 	/* Enable the PMU and sync possibly overflowed counters */
-	__cci_pmu_enable(cci_pmu);
+	__cci_pmu_enable_sync(cci_pmu);
 	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
 
 	return IRQ_RETVAL(handled);
@@ -1004,7 +1009,7 @@ static void cci_pmu_enable(struct pmu *pmu)
 		return;
 
 	raw_spin_lock_irqsave(&hw_events->pmu_lock, flags);
-	__cci_pmu_enable(cci_pmu);
+	__cci_pmu_enable_sync(cci_pmu);
 	raw_spin_unlock_irqrestore(&hw_events->pmu_lock, flags);
 
 }
-- 
1.7.9.5

  parent reply	other threads:[~2016-02-23 10:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-23 10:49 [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 01/13] arm-cci: simplify sysfs attr handling Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 02/13] arm-cci: fix handling cpumask_any_but return value Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 03/13] arm-cci: Group writes to counter Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 04/13] arm-cci: Refactor CCI PMU enable/disable methods Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 05/13] arm-cci: Delay PMU counter writes to pmu::pmu_enable Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 06/13] arm-cci: write_counter: Remove redundant check Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 07/13] arm-cci: Get the status of a counter Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 08/13] arm-cci: Add routines to save/restore all counters Suzuki K Poulose
2016-02-23 10:49 ` Suzuki K Poulose [this message]
2016-02-23 10:49 ` [PATCH 10/13] arm-cci: Provide hook for writing to PMU counters Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 11/13] arm-cci: CCI-500: Work around PMU counter writes Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 12/13] arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU Suzuki K Poulose
2016-02-23 10:49 ` [PATCH 13/13] arm-cci: CoreLink CCI-550 PMU driver Suzuki K Poulose
2016-02-23 11:40 ` [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Will Deacon
2016-02-23 13:55   ` Suzuki K. Poulose
2016-02-24 16:58     ` Olof Johansson
2016-02-24 17:12       ` Will Deacon
2016-02-24 18:46         ` Olof Johansson
2016-02-26 16:48           ` Will Deacon

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=1456224595-3282-10-git-send-email-suzuki.poulose@arm.com \
    --to=suzuki.poulose@arm.com \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=olof@lixom.net \
    --cc=punit.agrawal@arm.com \
    --cc=will.deacon@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;
as well as URLs for NNTP newsgroup(s).