From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Jonathan Hunter <jonathanh@nvidia.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 v2 08/17] PM / devfreq: tegra30: Move clk-notifier's registration to governor's start
Date: Wed, 26 Jun 2019 04:32:42 +0300 [thread overview]
Message-ID: <20190626013252.30470-9-digetx@gmail.com> (raw)
In-Reply-To: <20190626013252.30470-1-digetx@gmail.com>
There is no point in receiving of the notifications while governor is
stopped, let's keep them disabled like we do for the CPU freq-change
notifications. This also fixes a potential use-after-free bug if
notification happens after device's removal.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/devfreq/tegra30-devfreq.c | 33 ++++++++++++++++++-------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/drivers/devfreq/tegra30-devfreq.c b/drivers/devfreq/tegra30-devfreq.c
index a2cae8348dce..8e1c56790ac3 100644
--- a/drivers/devfreq/tegra30-devfreq.c
+++ b/drivers/devfreq/tegra30-devfreq.c
@@ -574,6 +574,19 @@ static int tegra_actmon_start(struct tegra_devfreq *tegra)
actmon_writel(tegra, ACTMON_SAMPLING_PERIOD - 1,
ACTMON_GLB_PERIOD_CTRL);
+ /*
+ * CLK notifications are needed in order to reconfigure the upper
+ * consecutive watermark in accordance to the actual clock rate
+ * to avoid unnecessary upper interrupts.
+ */
+ err = clk_notifier_register(tegra->emc_clock,
+ &tegra->clk_rate_change_nb);
+ if (err) {
+ dev_err(tegra->devfreq->dev.parent,
+ "Failed to register rate change notifier\n");
+ return err;
+ }
+
for (i = 0; i < ARRAY_SIZE(tegra->devices); i++)
tegra_actmon_configure_device(tegra, &tegra->devices[i]);
@@ -600,6 +613,8 @@ static int tegra_actmon_start(struct tegra_devfreq *tegra)
for (i = 0; i < ARRAY_SIZE(tegra->devices); i++)
tegra_actmon_stop_device(&tegra->devices[i]);
+ clk_notifier_unregister(tegra->emc_clock, &tegra->clk_rate_change_nb);
+
return err;
}
@@ -616,6 +631,8 @@ static void tegra_actmon_stop(struct tegra_devfreq *tegra)
for (i = 0; i < ARRAY_SIZE(tegra->devices); i++)
tegra_actmon_stop_device(&tegra->devices[i]);
+
+ clk_notifier_unregister(tegra->emc_clock, &tegra->clk_rate_change_nb);
}
static int tegra_devfreq_target(struct device *dev, unsigned long *freq,
@@ -860,22 +877,14 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, tegra);
+ tegra->clk_rate_change_nb.notifier_call = tegra_actmon_clk_notify_cb;
tegra->cpu_rate_change_nb.notifier_call = tegra_actmon_cpu_notify_cb;
INIT_WORK(&tegra->update_work, tegra_actmon_delayed_update);
- tegra->clk_rate_change_nb.notifier_call = tegra_actmon_clk_notify_cb;
- err = clk_notifier_register(tegra->emc_clock,
- &tegra->clk_rate_change_nb);
- if (err) {
- dev_err(&pdev->dev,
- "Failed to register rate change notifier\n");
- goto remove_opps;
- }
-
err = devfreq_add_governor(&tegra_devfreq_governor);
if (err) {
dev_err(&pdev->dev, "Failed to add governor: %d\n", err);
- goto unreg_notifier;
+ goto remove_opps;
}
tegra_devfreq_profile.initial_freq = clk_get_rate(tegra->emc_clock);
@@ -891,9 +900,6 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
remove_governor:
devfreq_remove_governor(&tegra_devfreq_governor);
-unreg_notifier:
- clk_notifier_unregister(tegra->emc_clock, &tegra->clk_rate_change_nb);
-
remove_opps:
dev_pm_opp_remove_all_dynamic(&pdev->dev);
@@ -910,7 +916,6 @@ static int tegra_devfreq_remove(struct platform_device *pdev)
devfreq_remove_device(tegra->devfreq);
devfreq_remove_governor(&tegra_devfreq_governor);
- clk_notifier_unregister(tegra->emc_clock, &tegra->clk_rate_change_nb);
dev_pm_opp_remove_all_dynamic(&pdev->dev);
reset_control_reset(tegra->reset);
--
2.22.0
next prev parent reply other threads:[~2019-06-26 1:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 1:32 [PATCH v2 00/17] More improvements for Tegra30 devfreq driver Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 01/17] PM / devfreq: tegra30: Change irq type to unsigned int Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 02/17] PM / devfreq: tegra30: Keep interrupt disabled while governor is stopped Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 03/17] PM / devfreq: tegra30: Handle possible round-rate error Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 04/17] PM / devfreq: tegra30: Drop write-barrier Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 05/17] PM / devfreq: tegra30: Set up watermarks properly Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 06/17] PM / devfreq: tegra30: Tuneup boosting thresholds Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 07/17] PM / devfreq: tegra30: Use CPUFreq notifier Dmitry Osipenko
2019-06-26 1:32 ` Dmitry Osipenko [this message]
2019-06-26 1:32 ` [PATCH v2 09/17] PM / devfreq: tegra30: Reset boosting on startup Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 10/17] PM / devfreq: tegra30: Don't enable consecutive-down interrupt " Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 11/17] PM / devfreq: tegra30: Add debug messages Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 12/17] PM / devfreq: tegra30: Inline all one-line functions Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 13/17] PM / devfreq: tegra30: Constify structs Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 14/17] PM / devfreq: tegra30: Ensure that target freq won't overflow Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 15/17] PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 16/17] PM / devfreq: tegra30: Use kHz units uniformly in the code Dmitry Osipenko
2019-06-26 1:32 ` [PATCH v2 17/17] PM / devfreq: tegra20/30: Add Dmitry as a maintainer 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=20190626013252.30470-9-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).