From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 06/16] PM / devfreq: tegra: Drop primary interrupt handler
Date: Thu, 2 May 2019 02:38:05 +0300 [thread overview]
Message-ID: <20190501233815.32643-7-digetx@gmail.com> (raw)
Message-ID: <20190501233805.YhiOeEl7N4Q33CImEtTUgfEnDP_DRhkN6sblCqrllzw@z> (raw)
In-Reply-To: <20190501233815.32643-1-digetx@gmail.com>
There is no real need in the primary interrupt handler, hence move
everything to the secondary (threaded) handler. In a result locking
is consistent now and there are no potential races with the interrupt
handler because it is protected with the devfreq's mutex.
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/devfreq/tegra-devfreq.c | 55 +++++++++++----------------------
1 file changed, 18 insertions(+), 37 deletions(-)
diff --git a/drivers/devfreq/tegra-devfreq.c b/drivers/devfreq/tegra-devfreq.c
index 24ec65556c39..b65313fe3c2e 100644
--- a/drivers/devfreq/tegra-devfreq.c
+++ b/drivers/devfreq/tegra-devfreq.c
@@ -144,7 +144,6 @@ static struct tegra_devfreq_device_config actmon_device_configs[] = {
struct tegra_devfreq_device {
const struct tegra_devfreq_device_config *config;
void __iomem *regs;
- spinlock_t lock;
/* Average event count sampled in the last interrupt */
u32 avg_count;
@@ -249,11 +248,8 @@ static void actmon_write_barrier(struct tegra_devfreq *tegra)
static void actmon_isr_device(struct tegra_devfreq *tegra,
struct tegra_devfreq_device *dev)
{
- unsigned long flags;
u32 intr_status, dev_ctrl;
- spin_lock_irqsave(&dev->lock, flags);
-
dev->avg_count = device_readl(dev, ACTMON_DEV_AVG_COUNT);
tegra_devfreq_update_avg_wmark(tegra, dev);
@@ -302,26 +298,6 @@ static void actmon_isr_device(struct tegra_devfreq *tegra,
device_writel(dev, ACTMON_INTR_STATUS_CLEAR, ACTMON_DEV_INTR_STATUS);
actmon_write_barrier(tegra);
-
- spin_unlock_irqrestore(&dev->lock, flags);
-}
-
-static irqreturn_t actmon_isr(int irq, void *data)
-{
- struct tegra_devfreq *tegra = data;
- bool handled = false;
- unsigned int i;
- u32 val;
-
- val = actmon_readl(tegra, ACTMON_GLB_STATUS);
- for (i = 0; i < ARRAY_SIZE(tegra->devices); i++) {
- if (val & tegra->devices[i].config->irq_mask) {
- actmon_isr_device(tegra, tegra->devices + i);
- handled = true;
- }
- }
-
- return handled ? IRQ_WAKE_THREAD : IRQ_NONE;
}
static unsigned long actmon_cpu_to_emc_rate(struct tegra_devfreq *tegra,
@@ -348,15 +324,12 @@ static void actmon_update_target(struct tegra_devfreq *tegra,
unsigned long cpu_freq = 0;
unsigned long static_cpu_emc_freq = 0;
unsigned int avg_sustain_coef;
- unsigned long flags;
if (dev->config->avg_dependency_threshold) {
cpu_freq = cpufreq_get(0);
static_cpu_emc_freq = actmon_cpu_to_emc_rate(tegra, cpu_freq);
}
- spin_lock_irqsave(&dev->lock, flags);
-
dev->target_freq = dev->avg_count / ACTMON_SAMPLING_PERIOD;
avg_sustain_coef = 100 * 100 / dev->config->boost_up_threshold;
dev->target_freq = do_percent(dev->target_freq, avg_sustain_coef);
@@ -364,19 +337,31 @@ static void actmon_update_target(struct tegra_devfreq *tegra,
if (dev->avg_count >= dev->config->avg_dependency_threshold)
dev->target_freq = max(dev->target_freq, static_cpu_emc_freq);
-
- spin_unlock_irqrestore(&dev->lock, flags);
}
static irqreturn_t actmon_thread_isr(int irq, void *data)
{
struct tegra_devfreq *tegra = data;
+ bool handled = false;
+ unsigned int i;
+ u32 val;
mutex_lock(&tegra->devfreq->lock);
- update_devfreq(tegra->devfreq);
+
+ val = actmon_readl(tegra, ACTMON_GLB_STATUS);
+ for (i = 0; i < ARRAY_SIZE(tegra->devices); i++) {
+ if (val & tegra->devices[i].config->irq_mask) {
+ actmon_isr_device(tegra, tegra->devices + i);
+ handled = true;
+ }
+ }
+
+ if (handled)
+ update_devfreq(tegra->devfreq);
+
mutex_unlock(&tegra->devfreq->lock);
- return IRQ_HANDLED;
+ return handled ? IRQ_HANDLED : IRQ_NONE;
}
static int tegra_actmon_rate_notify_cb(struct notifier_block *nb,
@@ -386,7 +371,6 @@ static int tegra_actmon_rate_notify_cb(struct notifier_block *nb,
struct tegra_devfreq *tegra;
struct tegra_devfreq_device *dev;
unsigned int i;
- unsigned long flags;
if (action != POST_RATE_CHANGE)
return NOTIFY_OK;
@@ -398,9 +382,7 @@ static int tegra_actmon_rate_notify_cb(struct notifier_block *nb,
for (i = 0; i < ARRAY_SIZE(tegra->devices); i++) {
dev = &tegra->devices[i];
- spin_lock_irqsave(&dev->lock, flags);
tegra_devfreq_update_wmark(tegra, dev);
- spin_unlock_irqrestore(&dev->lock, flags);
}
actmon_write_barrier(tegra);
@@ -682,7 +664,6 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
dev = tegra->devices + i;
dev->config = actmon_device_configs + i;
dev->regs = tegra->regs + dev->config->offset;
- spin_lock_init(&dev->lock);
tegra_actmon_configure_device(tegra, dev);
}
@@ -700,8 +681,8 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, tegra);
- err = devm_request_threaded_irq(&pdev->dev, irq, actmon_isr,
- actmon_thread_isr, IRQF_SHARED,
+ err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+ actmon_thread_isr, IRQF_ONESHOT,
"tegra-devfreq", tegra);
if (err) {
dev_err(&pdev->dev, "Interrupt request failed\n");
--
2.21.0
next prev parent reply other threads:[~2019-05-01 23:43 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20190501234148epcas5p1cc9a8dafa9ee6d8d046d1292b8270727@epcas5p1.samsung.com>
2019-05-01 23:37 ` [PATCH v4 00/16] NVIDIA Tegra devfreq improvements and Tegra20/30 support Dmitry Osipenko
2019-05-01 23:37 ` Dmitry Osipenko
2019-05-01 23:38 ` [PATCH v4 01/16] PM / devfreq: tegra: Fix kHz to Hz conversion Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 10:54 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 02/16] PM / devfreq: tegra: Replace readl-writel with relaxed versions Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 10:55 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 03/16] PM / devfreq: tegra: Replace write memory barrier with the read barrier Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 10:56 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 04/16] PM / devfreq: tegra: Don't ignore clk errors Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 10:57 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 05/16] PM / devfreq: tegra: Don't set EMC clock rate to maximum on probe Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:00 ` Thierry Reding
2019-06-04 13:05 ` Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko [this message]
2019-05-01 23:38 ` [PATCH v4 06/16] PM / devfreq: tegra: Drop primary interrupt handler Dmitry Osipenko
2019-06-04 11:02 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 07/16] PM / devfreq: tegra: Properly disable interrupts Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:07 ` Thierry Reding
2019-06-04 13:40 ` Dmitry Osipenko
2019-06-04 14:06 ` Thierry Reding
2019-06-04 14:59 ` Dmitry Osipenko
2019-06-04 22:55 ` Dmitry Osipenko
2019-06-07 16:58 ` Dmitry Osipenko
2019-05-01 23:38 ` [PATCH v4 08/16] PM / devfreq: tegra: Clean up driver's probe / remove Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:09 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 09/16] PM / devfreq: tegra: Avoid inconsistency of current frequency value Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:14 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 10/16] PM / devfreq: tegra: Mark ACTMON's governor as immutable Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:15 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 11/16] PM / devfreq: tegra: Move governor registration to driver's probe Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:15 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 12/16] PM / devfreq: tegra: Reconfigure hardware on governor's restart Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:17 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 13/16] PM / devfreq: tegra: Support Tegra30 Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:18 ` Thierry Reding
2019-05-01 23:38 ` [PATCH v4 14/16] PM / devfreq: tegra: Enable COMPILE_TEST for the driver Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:20 ` Thierry Reding
2019-06-04 13:53 ` Dmitry Osipenko
2019-06-04 14:10 ` Thierry Reding
2019-06-04 14:18 ` Thierry Reding
2019-06-04 14:41 ` Dmitry Osipenko
2019-06-04 14:50 ` Thierry Reding
2019-06-04 15:15 ` Dmitry Osipenko
2019-05-01 23:38 ` [PATCH v4 15/16] PM / devfreq: tegra: Rename tegra-devfreq.c to tegra30-devfreq.c Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:23 ` Thierry Reding
2019-06-04 14:35 ` Dmitry Osipenko
2019-05-01 23:38 ` [PATCH v4 16/16] PM / devfreq: Introduce driver for NVIDIA Tegra20 Dmitry Osipenko
2019-05-01 23:38 ` Dmitry Osipenko
2019-06-04 11:25 ` Thierry Reding
2019-06-04 13:57 ` Dmitry Osipenko
2019-05-03 0:31 ` [PATCH v4 00/16] NVIDIA Tegra devfreq improvements and Tegra20/30 support Chanwoo Choi
2019-05-03 0:31 ` Chanwoo Choi
2019-05-03 0:52 ` Dmitry Osipenko
2019-05-03 0:52 ` Dmitry Osipenko
2019-06-03 16:52 ` Dmitry Osipenko
2019-06-04 0:49 ` Chanwoo Choi
2019-06-04 23:09 ` Dmitry Osipenko
2019-06-23 17:17 ` Dmitry Osipenko
2019-06-23 23:50 ` Chanwoo Choi
2019-06-24 0:35 ` Dmitry Osipenko
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=20190501233815.32643-7-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=jonathanh@nvidia.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tomeu.vizoso@collabora.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).