| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 31 May 2022 15:40:00 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: Keerthy <j-keerthy@...com>, Dave Gerlach <d-gerlach@...com>,
Viresh Kumar <vireshk@...nel.org>, Nishanth Menon <nm@...com>,
Stephen Boyd <sboyd@...nel.org>,
"Rafael J. Wysocki" <rafael@...nel.org>
Cc: Viresh Kumar <viresh.kumar@...aro.org>, linux-pm@...r.kernel.org,
Vincent Guittot <vincent.guittot@...aro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH 1/5] OPP: Add support for config_regulators() helper
Extend the dev_pm_opp_set_config() interface to allow adding
config_regulators() helpers. This helper will be called to set the
voltages of the regulators from the regular path in _set_opp(), while we
are trying to change the OPP.
This will eventually replace the custom set_opp() helper.
Signed-off-by: Viresh Kumar <viresh.kumar@...aro.org>
---
drivers/opp/core.c | 63 ++++++++++++++++++++++++++++++++++++++++++
drivers/opp/opp.h | 2 ++
include/linux/pm_opp.h | 5 ++++
3 files changed, 70 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 62c5d4308e01..bac91d078cbb 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1181,6 +1181,15 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
dev_err(dev, "Failed to set bw: %d\n", ret);
return ret;
}
+
+ if (opp_table->config_regulators) {
+ ret = opp_table->config_regulators(dev, old_opp, opp, opp_table->regulators,
+ opp_table->regulator_count);
+ if (ret) {
+ dev_err(dev, "Failed to set regulator voltages: %d\n", ret);
+ return ret;
+ }
+ }
}
if (opp_table->set_opp) {
@@ -1198,6 +1207,15 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
/* Scaling down? Configure required OPPs after frequency */
if (scaling_down) {
+ if (opp_table->config_regulators) {
+ ret = opp_table->config_regulators(dev, old_opp, opp, opp_table->regulators,
+ opp_table->regulator_count);
+ if (ret) {
+ dev_err(dev, "Failed to set regulator voltages: %d\n", ret);
+ return ret;
+ }
+ }
+
ret = _set_opp_bw(opp_table, opp, dev);
if (ret) {
dev_err(dev, "Failed to set bw: %d\n", ret);
@@ -2237,6 +2255,43 @@ static void _opp_unregister_set_opp_helper(struct opp_table *opp_table)
}
}
+/**
+ * _opp_set_config_regulators_helper() - Register custom set regulator helper.
+ * @dev: Device for which the helper is getting registered.
+ * @config_regulators: Custom set regulator helper.
+ *
+ * This is useful to support platforms with multiple regulators per device.
+ *
+ * This must be called before any OPPs are initialized for the device.
+ */
+static int _opp_set_config_regulators_helper(struct opp_table *opp_table, struct device *dev,
+ config_regulators_t config_regulators)
+{
+ /* Another CPU that shares the OPP table has set the helper ? */
+ if (!opp_table->config_regulators) {
+ mutex_lock(&opp_table->lock);
+ opp_table->config_regulators = config_regulators;
+ mutex_unlock(&opp_table->lock);
+ }
+
+ return 0;
+}
+
+/**
+ * _opp_put_config_regulators_helper() - Releases resources blocked for config_regulators helper.
+ * @opp_table: OPP table returned from _opp_set_config_regulators_helper().
+ *
+ * Release resources blocked for platform specific config_regulators helper.
+ */
+static void _opp_put_config_regulators_helper(struct opp_table *opp_table)
+{
+ if (opp_table->config_regulators) {
+ mutex_lock(&opp_table->lock);
+ opp_table->config_regulators = NULL;
+ mutex_unlock(&opp_table->lock);
+ }
+}
+
static void _detach_genpd(struct opp_table *opp_table)
{
int index;
@@ -2404,6 +2459,13 @@ struct opp_table *dev_pm_opp_set_config(struct device *dev,
goto err;
}
+ /* Configure config_regulators helper */
+ if (config->config_regulators) {
+ ret = _opp_set_config_regulators_helper(opp_table, dev, config->config_regulators);
+ if (ret)
+ goto err;
+ }
+
/* Configure supported hardware */
if (config->supported_hw) {
ret = _opp_set_supported_hw(opp_table, config->supported_hw,
@@ -2458,6 +2520,7 @@ void dev_pm_opp_clear_config(struct opp_table *opp_table)
_opp_detach_genpd(opp_table);
_opp_put_regulators(opp_table);
_opp_put_supported_hw(opp_table);
+ _opp_put_config_regulators_helper(opp_table);
_opp_unregister_set_opp_helper(opp_table);
_opp_put_prop_name(opp_table);
_opp_put_clkname(opp_table);
diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
index 9e1cfcb0ea98..4695d315e7f9 100644
--- a/drivers/opp/opp.h
+++ b/drivers/opp/opp.h
@@ -151,6 +151,7 @@ enum opp_table_access {
* @prop_name: A name to postfix to many DT properties, while parsing them.
* @clk_configured: Clock name is configured by the platform.
* @clk: Device's clock handle
+ * @config_regulators: Platform specific config_regulators() callback.
* @regulators: Supply regulators
* @regulator_count: Number of power supply regulators. Its value can be -1
* (uninitialized), 0 (no opp-microvolt property) or > 0 (has opp-microvolt
@@ -203,6 +204,7 @@ struct opp_table {
const char *prop_name;
bool clk_configured;
struct clk *clk;
+ config_regulators_t config_regulators;
struct regulator **regulators;
int regulator_count;
struct icc_path **paths;
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 6cf1bbc71ed2..7e7986106274 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -90,11 +90,15 @@ struct dev_pm_set_opp_data {
struct device *dev;
};
+typedef int (*config_regulators_t)(struct device *dev, struct dev_pm_opp *old_opp,
+ struct dev_pm_opp *new_opp, struct regulator **regulators,
+ unsigned int count);
/**
* struct dev_pm_opp_config - Device OPP configuration values
* @clk_name: Clk name.
* @prop_name: Name to postfix to properties.
* @set_opp: Custom set OPP helper.
+ * @config_regulators: Custom set regulator helper.
* @supported_hw: Array of hierarchy of versions to match.
* @supported_hw_count: Number of elements in the array.
* @regulator_names: Array of pointers to the names of the regulator.
@@ -108,6 +112,7 @@ struct dev_pm_opp_config {
const char *clk_name;
const char *prop_name;
int (*set_opp)(struct dev_pm_set_opp_data *data);
+ config_regulators_t config_regulators;
unsigned int *supported_hw;
unsigned int supported_hw_count;
const char * const *regulator_names;
--
2.31.1.272.g89b43f80a514
Powered by blists - more mailing lists