Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Yangtao Li (31): opp: Add devres wrapper for dev_pm_opp_set_clkname and dev_pm_opp_put_clkname opp: Add devres wrapper for dev_pm_opp_set_regulators and dev_pm_opp_put_regulators opp: Add devres wrapper for dev_pm_opp_set_supported_hw opp: Add devres wrapper for dev_pm_opp_of_add_table opp: Add devres wrapper for dev_pm_opp_register_notifier serial: qcom_geni_serial: fix potential mem leak in qcom_geni_serial_probe() serial: qcom_geni_serial: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() qcom-geni-se: remove opp_table mmc: sdhci-msm: fix potential mem leak in sdhci_msm_probe() mmc: sdhci-msm: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in qcom_qspi_probe() spi: spi-qcom-qspi: convert to use devm_pm_opp_* API drm/msm: fix potential mem leak drm/msm: convert to use devm_pm_opp_* API and remove dp_ctrl_put drm/lima: convert to use devm_pm_opp_* API drm/lima: remove unneeded devm_devfreq_remove_device() drm/panfrost: convert to use devm_pm_opp_* API media: venus: fix error check in core_get_v4() media: venus: convert to use devm_pm_opp_* API memory: samsung: exynos5422-dmc: fix return error in exynos5_init_freq_table memory: samsung: exynos5422-dmc: convert to use devm_pm_opp_* API memory: tegra20: convert to use devm_pm_opp_* API memory: tegra30: convert to use devm_pm_opp_* API PM / devfreq: tegra30: convert to use devm_pm_opp_* API PM / devfreq: rk3399_dmc: convert to use devm_pm_opp_* API PM / devfreq: imx8m-ddrc: convert to use devm_pm_opp_* API PM / devfreq: imx-bus: convert to use devm_pm_opp_* API PM / devfreq: exynos: convert to use devm_pm_opp_* API PM / devfreq: convert to devm_pm_opp_register_notifier and remove unused API
drivers/devfreq/devfreq.c | 66 +------ drivers/devfreq/exynos-bus.c | 42 +---- drivers/devfreq/imx-bus.c | 14 +- drivers/devfreq/imx8m-ddrc.c | 15 +- drivers/devfreq/rk3399_dmc.c | 22 +-- drivers/devfreq/tegra30-devfreq.c | 21 +-- drivers/gpu/drm/lima/lima_devfreq.c | 45 +---- drivers/gpu/drm/lima/lima_devfreq.h | 2 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 31 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/dp/dp_ctrl.c | 29 +-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 23 ++- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 +--- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - .../media/platform/qcom/venus/pm_helpers.c | 22 +-- drivers/memory/samsung/exynos5422-dmc.c | 13 +- drivers/memory/tegra/tegra20-emc.c | 29 +-- drivers/memory/tegra/tegra30-emc.c | 29 +-- drivers/mmc/host/sdhci-msm.c | 27 ++- drivers/opp/core.c | 173 ++++++++++++++++++ drivers/opp/of.c | 36 ++++ drivers/spi/spi-geni-qcom.c | 23 ++- drivers/spi/spi-qcom-qspi.c | 25 ++- drivers/tty/serial/qcom_geni_serial.c | 31 ++-- include/linux/devfreq.h | 23 --- include/linux/pm_opp.h | 38 ++++ include/linux/qcom-geni-se.h | 2 - 32 files changed, 402 insertions(+), 428 deletions(-)
Add devres wrapper for dev_pm_opp_set_clkname() and dev_pm_opp_put_clkname() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/opp/core.c | 47 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 9 ++++++++ 2 files changed, 56 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 4268eb359915..53fdf33732d5 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1948,6 +1948,53 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table) } EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname);
+static void devm_pm_opp_clkname_release(void *data) +{ + dev_pm_opp_put_clkname(data); +} + +/** + * devm_pm_opp_set_clkname() - Set clk name for the device + * @dev: Device for which clk name is being set. + * @name: Clk name. + * + * In order to support OPP switching, OPP layer needs to get pointer to the + * clock for the device. Simple cases work fine without using this routine (i.e. + * by passing connection-id as NULL), but for a device with multiple clocks + * available, the OPP core needs to know the exact name of the clk to use. + * + * This must be called before any OPPs are initialized for the device. + * + * The opp_table structure will be freed after the device is destroyed. + */ +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) +{ + struct opp_table *opp_table; + int err; + + opp_table = dev_pm_opp_set_clkname(dev, name); + if (IS_ERR(opp_table)) + return opp_table; + + err = devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, opp_table); + if (err) + opp_table = ERR_PTR(err); + + return opp_table; +} +EXPORT_SYMBOL_GPL(devm_pm_opp_set_clkname); + +/** + * devm_pm_opp_put_clkname() - Releases resources blocked for clk. + * @dev: Device for which we do this operation. + * @opp_table: OPP table returned from devm_pm_opp_set_clkname(). + */ +void devm_pm_opp_put_clkname(struct device *dev, struct opp_table *opp_table) +{ + devm_release_action(dev, devm_pm_opp_clkname_release, opp_table); +} +EXPORT_SYMBOL_GPL(devm_pm_opp_put_clkname); + /** * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper * @dev: Device for which the helper is getting registered. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 1435c054016a..3418a2874f88 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -145,6 +145,8 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev, const char * con void dev_pm_opp_put_regulators(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char * name); void dev_pm_opp_put_clkname(struct opp_table *opp_table); +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name); +void devm_pm_opp_put_clkname(struct device *dev, struct opp_table *opp_table); struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table); struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char **names, struct device ***virt_devs); @@ -326,6 +328,13 @@ static inline struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const
static inline void dev_pm_opp_put_clkname(struct opp_table *opp_table) {}
+static inline struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) +{ + return ERR_PTR(-ENOTSUPP); +} + +static inline void devm_pm_opp_put_clkname(struct device *dev, struct opp_table *opp_table) {} + static inline struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char **names, struct device ***virt_devs) { return ERR_PTR(-ENOTSUPP);
On 01-01-21, 16:54, Yangtao Li wrote:
+/**
- devm_pm_opp_put_clkname() - Releases resources blocked for clk.
- @dev: Device for which we do this operation.
- @opp_table: OPP table returned from devm_pm_opp_set_clkname().
- */
+void devm_pm_opp_put_clkname(struct device *dev, struct opp_table *opp_table) +{
- devm_release_action(dev, devm_pm_opp_clkname_release, opp_table);
+} +EXPORT_SYMBOL_GPL(devm_pm_opp_put_clkname);
We shouldn't be needing changes like this, please drop them for all patches.
Add devres wrapper for dev_pm_opp_set_regulators() dev_pm_opp_put_regulators () to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/opp/core.c | 50 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 9 ++++++++ 2 files changed, 59 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 53fdf33732d5..8709689a7152 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1878,6 +1878,56 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table) } EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulators);
+static void devm_pm_opp_regulators_release(void *data) +{ + dev_pm_opp_put_regulators(data); +} + +/** + * devm_pm_opp_set_regulators() - Set regulator names for the device + * @dev: Device for which regulator name is being set. + * @names: Array of pointers to the names of the regulator. + * @count: Number of regulators. + * + * In order to support OPP switching, OPP layer needs to know the name of the + * device's regulators, as the core would be required to switch voltages as + * well. + * + * This must be called before any OPPs are initialized for the device. + * + * The opp_table structure will be freed after the device is destroyed. + */ +struct opp_table *devm_pm_opp_set_regulators(struct device *dev, + const char * const names[], + unsigned int count) +{ + struct opp_table *opp_table; + int err; + + opp_table = dev_pm_opp_set_regulators(dev, names, count); + if (IS_ERR(opp_table)) + return opp_table; + + err = devm_add_action_or_reset(dev, devm_pm_opp_regulators_release, + opp_table); + if (err) + opp_table = ERR_PTR(err); + + return opp_table; +} +EXPORT_SYMBOL_GPL(devm_pm_opp_set_regulators); + +/** + * devm_pm_opp_put_regulators() - Releases resources blocked for regulator + * @dev: Device for which we do this operation. + * @opp_table: OPP table returned from dev_pm_opp_set_regulators(). + */ +void devm_pm_opp_put_regulators(struct device *dev, struct opp_table *opp_table) +{ + devm_release_action(dev, devm_pm_opp_regulators_release, opp_table); +} +EXPORT_SYMBOL_GPL(devm_pm_opp_put_regulators); + /** * dev_pm_opp_set_clkname() - Set clk name for the device * @dev: Device for which clk name is being set. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 3418a2874f88..8a329247e08e 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -143,6 +143,8 @@ struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name) void dev_pm_opp_put_prop_name(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count); void dev_pm_opp_put_regulators(struct opp_table *opp_table); +struct opp_table *devm_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count); +void devm_pm_opp_put_regulators(struct device *dev, struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char * name); void dev_pm_opp_put_clkname(struct opp_table *opp_table); struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name); @@ -321,6 +323,13 @@ static inline struct opp_table *dev_pm_opp_set_regulators(struct device *dev, co
static inline void dev_pm_opp_put_regulators(struct opp_table *opp_table) {}
+static inline struct opp_table *devm_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count) +{ + return ERR_PTR(-ENOTSUPP); +} + +static inline void devm_pm_opp_put_regulators(struct device *dev, struct opp_table *opp_table) {} + static inline struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char * name) { return ERR_PTR(-ENOTSUPP);
01.01.2021 19:54, Yangtao Li пишет:
Add devres wrapper for dev_pm_opp_set_regulators() dev_pm_opp_put_regulators () to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/opp/core.c | 50 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 9 ++++++++ 2 files changed, 59 insertions(+)
Reviewed-by: Dmitry Osipenko digetx@gmail.com Tested-by: Dmitry Osipenko digetx@gmail.com
Add devres wrapper for dev_pm_opp_set_supported_hw() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/opp/core.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 8 ++++++++ 2 files changed, 46 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 8709689a7152..6b83e373f0d8 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1674,6 +1674,44 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table) } EXPORT_SYMBOL_GPL(dev_pm_opp_put_supported_hw);
+static void devm_pm_opp_supported_hw_release(void *data) +{ + dev_pm_opp_put_supported_hw(data); +} + +/** + * devm_pm_opp_set_supported_hw() - Set supported platforms + * @dev: Device for which supported-hw has to be set. + * @versions: Array of hierarchy of versions to match. + * @count: Number of elements in the array. + * + * This is required only for the V2 bindings, and it enables a platform to + * specify the hierarchy of versions it supports. OPP layer will then enable + * OPPs, which are available for those versions, based on its 'opp-supported-hw' + * property. + * + * The opp_table structure will be freed after the device is destroyed. + */ +struct opp_table *devm_pm_opp_set_supported_hw(struct device *dev, + const u32 *versions, + unsigned int count) +{ + struct opp_table *opp_table; + int err; + + opp_table = dev_pm_opp_set_supported_hw(dev, versions, count); + if (IS_ERR(opp_table)) + return opp_table; + + err = devm_add_action_or_reset(dev, devm_pm_opp_supported_hw_release, + opp_table); + if (err) + opp_table = ERR_PTR(err); + + return opp_table; +} +EXPORT_SYMBOL_GPL(devm_pm_opp_set_supported_hw); + /** * dev_pm_opp_set_prop_name() - Set prop-extn name * @dev: Device for which the prop-name has to be set. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 8a329247e08e..e5260fc82ba1 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -139,6 +139,7 @@ int dev_pm_opp_unregister_notifier(struct device *dev, struct notifier_block *nb
struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, unsigned int count); void dev_pm_opp_put_supported_hw(struct opp_table *opp_table); +struct opp_table *devm_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, unsigned int count); struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name); void dev_pm_opp_put_prop_name(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count); @@ -301,6 +302,13 @@ static inline struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev,
static inline void dev_pm_opp_put_supported_hw(struct opp_table *opp_table) {}
+static inline struct opp_table *devm_pm_opp_set_supported_hw(struct device *dev, + const u32 *versions, + unsigned int count) +{ + return ERR_PTR(-ENOTSUPP); +} + static inline struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)) {
01.01.2021 19:54, Yangtao Li пишет:
Add devres wrapper for dev_pm_opp_set_supported_hw() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/opp/core.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 8 ++++++++ 2 files changed, 46 insertions(+)
Reviewed-by: Dmitry Osipenko digetx@gmail.com Tested-by: Dmitry Osipenko digetx@gmail.com
Add devres wrapper for dev_pm_opp_of_add_table() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/opp/of.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 6 ++++++ 2 files changed, 42 insertions(+)
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 03cb387236c4..50df483c7dc3 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -998,6 +998,42 @@ int dev_pm_opp_of_add_table(struct device *dev) } EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table);
+static void devm_pm_opp_of_table_release(void *data) +{ + dev_pm_opp_of_remove_table(data); +} + +/** + * devm_pm_opp_of_add_table() - Initialize opp table from device tree + * @dev: device pointer used to lookup OPP table. + * + * Register the initial OPP table with the OPP library for given device. + * + * The opp_table structure will be freed after the device is destroyed. + * + * Return: + * 0 On success OR + * Duplicate OPPs (both freq and volt are same) and opp->available + * -EEXIST Freq are same and volt are different OR + * Duplicate OPPs (both freq and volt are same) and !opp->available + * -ENOMEM Memory allocation failure + * -ENODEV when 'operating-points' property is not found or is invalid data + * in device node. + * -ENODATA when empty 'operating-points' property is found + * -EINVAL when invalid entries are found in opp-v2 table + */ +int devm_pm_opp_of_add_table(struct device *dev) +{ + int ret; + + ret = dev_pm_opp_of_add_table(dev); + if (ret) + return ret; + + return devm_add_action_or_reset(dev, devm_pm_opp_of_table_release, dev); +} +EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table); + /** * dev_pm_opp_of_add_table_indexed() - Initialize indexed opp table from device tree * @dev: device pointer used to lookup OPP table. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index e5260fc82ba1..e8bdac5f9555 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -398,6 +398,7 @@ static inline void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask int dev_pm_opp_of_add_table(struct device *dev); int dev_pm_opp_of_add_table_indexed(struct device *dev, int index); void dev_pm_opp_of_remove_table(struct device *dev); +int devm_pm_opp_of_add_table(struct device *dev); int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask); void dev_pm_opp_of_cpumask_remove_table(const struct cpumask *cpumask); int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask); @@ -425,6 +426,11 @@ static inline void dev_pm_opp_of_remove_table(struct device *dev) { }
+static inline int devm_pm_opp_of_add_table(struct device *dev) +{ + return -ENOTSUPP; +} + static inline int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask) { return -ENOTSUPP;
01.01.2021 19:54, Yangtao Li пишет:
Add devres wrapper for dev_pm_opp_of_add_table() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/opp/of.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 6 ++++++ 2 files changed, 42 insertions(+)
Reviewed-by: Dmitry Osipenko digetx@gmail.com Tested-by: Dmitry Osipenko digetx@gmail.com
Add devres wrapper for dev_pm_opp_register_notifier() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/opp/core.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 6 ++++++ 2 files changed, 44 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 6b83e373f0d8..ef3544f8cecd 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2599,6 +2599,44 @@ int dev_pm_opp_unregister_notifier(struct device *dev, } EXPORT_SYMBOL(dev_pm_opp_unregister_notifier);
+static void devm_pm_opp_notifier_release(struct device *dev, void *res) +{ + struct notifier_block *nb = *(struct notifier_block **)res; + + WARN_ON(dev_pm_opp_unregister_notifier(dev, nb)); +} + +/** + * devm_pm_opp_register_notifier() - Register OPP notifier for the device + * @dev: Device for which notifier needs to be registered + * @nb: Notifier block to be registered + * + * Return: 0 on success or a negative error value. + * + * The notifier will be unregistered after the device is destroyed. + */ +int devm_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb) +{ + struct notifier_block **ptr; + int ret; + + ptr = devres_alloc(devm_pm_opp_notifier_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + ret = dev_pm_opp_register_notifier(dev, nb); + if (ret) { + devres_free(ptr); + return ret; + } + + *ptr = nb; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL(devm_pm_opp_register_notifier); + /** * dev_pm_opp_remove_table() - Free all OPPs associated with the device * @dev: device pointer used to lookup OPP table. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index e8bdac5f9555..c24bd34339d7 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -136,6 +136,7 @@ int dev_pm_opp_disable(struct device *dev, unsigned long freq);
int dev_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb); int dev_pm_opp_unregister_notifier(struct device *dev, struct notifier_block *nb); +int devm_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb);
struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, unsigned int count); void dev_pm_opp_put_supported_hw(struct opp_table *opp_table); @@ -288,6 +289,11 @@ static inline int dev_pm_opp_register_notifier(struct device *dev, struct notifi return -ENOTSUPP; }
+static inline int devm_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb) +{ + return -ENOTSUPP; +} + static inline int dev_pm_opp_unregister_notifier(struct device *dev, struct notifier_block *nb) { return -ENOTSUPP;
On 01-01-21, 16:54, Yangtao Li wrote:
Add devres wrapper for dev_pm_opp_register_notifier() to simplify driver code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/opp/core.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 6 ++++++ 2 files changed, 44 insertions(+)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 6b83e373f0d8..ef3544f8cecd 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2599,6 +2599,44 @@ int dev_pm_opp_unregister_notifier(struct device *dev, } EXPORT_SYMBOL(dev_pm_opp_unregister_notifier);
+static void devm_pm_opp_notifier_release(struct device *dev, void *res) +{
- struct notifier_block *nb = *(struct notifier_block **)res;
- WARN_ON(dev_pm_opp_unregister_notifier(dev, nb));
+}
+/**
- devm_pm_opp_register_notifier() - Register OPP notifier for the device
- @dev: Device for which notifier needs to be registered
- @nb: Notifier block to be registered
- Return: 0 on success or a negative error value.
- The notifier will be unregistered after the device is destroyed.
- */
+int devm_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb) +{
- struct notifier_block **ptr;
- int ret;
- ptr = devres_alloc(devm_pm_opp_notifier_release, sizeof(*ptr), GFP_KERNEL);
- if (!ptr)
return -ENOMEM;- ret = dev_pm_opp_register_notifier(dev, nb);
- if (ret) {
devres_free(ptr);return ret;- }
- *ptr = nb;
- devres_add(dev, ptr);
- return 0;
+} +EXPORT_SYMBOL(devm_pm_opp_register_notifier);
I am not in favor of this patch, and it only has one user, which makes it more unwanted.
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/tty/serial/qcom_geni_serial.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 291649f02821..5aada7ebae35 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1438,9 +1438,12 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) return PTR_ERR(port->se.opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (ret && ret != -ENODEV) { - dev_err(&pdev->dev, "invalid OPP table in device tree\n"); - goto put_clkname; + if (ret) { + dev_pm_opp_put_clkname(port->se.opp_table); + if (ret != -ENODEV) { + dev_err(&pdev->dev, "invalid OPP table in device tree\n"); + return ret; + } }
port->private_data.drv = drv; @@ -1482,7 +1485,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) return 0; err: dev_pm_opp_of_remove_table(&pdev->dev); -put_clkname: dev_pm_opp_put_clkname(port->se.opp_table); return ret; }
On 01-01-21, 16:54, Yangtao Li wrote:
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/tty/serial/qcom_geni_serial.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 291649f02821..5aada7ebae35 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1438,9 +1438,12 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) return PTR_ERR(port->se.opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev);
- if (ret && ret != -ENODEV) {
dev_err(&pdev->dev, "invalid OPP table in device tree\n");goto put_clkname;
if (ret) {
dev_pm_opp_put_clkname(port->se.opp_table);if (ret != -ENODEV) {dev_err(&pdev->dev, "invalid OPP table in device tree\n");return ret;}}
port->private_data.drv = drv;
@@ -1482,7 +1485,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) return 0; err: dev_pm_opp_of_remove_table(&pdev->dev); -put_clkname: dev_pm_opp_put_clkname(port->se.opp_table); return ret; }
Since put_clkname is always done in remove(), I don't think there is any memleak here. Over that with your patch we will do put_clkname twice now, once in probe and once in remove. And that is a bug AFAICT.
Use devm_pm_opp_* API to simplify code, and we don't need to make opp_table glabal.
Let's remove opp_table from geni_se later.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/tty/serial/qcom_geni_serial.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 5aada7ebae35..36a92df8ec11 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1352,6 +1352,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) int irq; bool console = false; struct uart_driver *drv; + struct opp_table *opp_table;
if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart")) console = true; @@ -1433,13 +1434,13 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (of_property_read_bool(pdev->dev.of_node, "cts-rts-swap")) port->cts_rts_swap = true;
- port->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se"); - if (IS_ERR(port->se.opp_table)) - return PTR_ERR(port->se.opp_table); + opp_table = devm_pm_opp_set_clkname(&pdev->dev, "se"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) { - dev_pm_opp_put_clkname(port->se.opp_table); + devm_pm_opp_put_clkname(&pdev->dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "invalid OPP table in device tree\n"); return ret; @@ -1453,7 +1454,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
ret = uart_add_one_port(drv, uport); if (ret) - goto err; + return ret;
irq_set_status_flags(uport->irq, IRQ_NOAUTOEN); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr, @@ -1461,7 +1462,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (ret) { dev_err(uport->dev, "Failed to get IRQ ret %d\n", ret); uart_remove_one_port(drv, uport); - goto err; + return ret; }
/* @@ -1478,15 +1479,11 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (ret) { device_init_wakeup(&pdev->dev, false); uart_remove_one_port(drv, uport); - goto err; + return ret; } }
return 0; -err: - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(port->se.opp_table); - return ret; }
static int qcom_geni_serial_remove(struct platform_device *pdev) @@ -1494,8 +1491,6 @@ static int qcom_geni_serial_remove(struct platform_device *pdev) struct qcom_geni_serial_port *port = platform_get_drvdata(pdev); struct uart_driver *drv = port->private_data.drv;
- dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(port->se.opp_table); dev_pm_clear_wake_irq(&pdev->dev); device_init_wakeup(&pdev->dev, false); uart_remove_one_port(drv, &port->uport);
On 01-01-21, 16:54, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code, and we don't need to make opp_table glabal.
Let's remove opp_table from geni_se later.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/tty/serial/qcom_geni_serial.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 5aada7ebae35..36a92df8ec11 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1352,6 +1352,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) int irq; bool console = false; struct uart_driver *drv;
struct opp_table *opp_table;
if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart")) console = true;
@@ -1433,13 +1434,13 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (of_property_read_bool(pdev->dev.of_node, "cts-rts-swap")) port->cts_rts_swap = true;
- port->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se");
- if (IS_ERR(port->se.opp_table))
return PTR_ERR(port->se.opp_table);
- opp_table = devm_pm_opp_set_clkname(&pdev->dev, "se");
- if (IS_ERR(opp_table))
return PTR_ERR(opp_table);
- ret = dev_pm_opp_of_add_table(&pdev->dev);
- ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) {
dev_pm_opp_put_clkname(port->se.opp_table);
devm_pm_opp_put_clkname(&pdev->dev, opp_table);
We shouldn't be doing this here, i.e. put_clkname. Even when the OPP table isn't present, this driver calls dev_pm_opp_set_rate() which behaves like clk_set_rate() in this case and so the clk name is still required by the OPP core.
if (ret != -ENODEV) { dev_err(&pdev->dev, "invalid OPP table in device tree\n"); return ret;@@ -1453,7 +1454,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
ret = uart_add_one_port(drv, uport); if (ret)
goto err;
return ret;irq_set_status_flags(uport->irq, IRQ_NOAUTOEN); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr,
@@ -1461,7 +1462,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (ret) { dev_err(uport->dev, "Failed to get IRQ ret %d\n", ret); uart_remove_one_port(drv, uport);
goto err;
return ret;}
/*
@@ -1478,15 +1479,11 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (ret) { device_init_wakeup(&pdev->dev, false); uart_remove_one_port(drv, uport);
goto err;
return ret;} }
return 0;
-err:
- dev_pm_opp_of_remove_table(&pdev->dev);
- dev_pm_opp_put_clkname(port->se.opp_table);
- return ret;
}
static int qcom_geni_serial_remove(struct platform_device *pdev) @@ -1494,8 +1491,6 @@ static int qcom_geni_serial_remove(struct platform_device *pdev) struct qcom_geni_serial_port *port = platform_get_drvdata(pdev); struct uart_driver *drv = port->private_data.drv;
- dev_pm_opp_of_remove_table(&pdev->dev);
- dev_pm_opp_put_clkname(port->se.opp_table); dev_pm_clear_wake_irq(&pdev->dev); device_init_wakeup(&pdev->dev, false); uart_remove_one_port(drv, &port->uport);
-- 2.25.1
Dropped lots of people from cc list
On 04-01-21, 12:49, Viresh Kumar wrote:
On 01-01-21, 16:54, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code, and we don't need to make opp_table glabal.
Let's remove opp_table from geni_se later.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/tty/serial/qcom_geni_serial.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 5aada7ebae35..36a92df8ec11 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1352,6 +1352,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) int irq; bool console = false; struct uart_driver *drv;
struct opp_table *opp_table;
if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart")) console = true;
@@ -1433,13 +1434,13 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (of_property_read_bool(pdev->dev.of_node, "cts-rts-swap")) port->cts_rts_swap = true;
- port->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se");
- if (IS_ERR(port->se.opp_table))
return PTR_ERR(port->se.opp_table);
- opp_table = devm_pm_opp_set_clkname(&pdev->dev, "se");
- if (IS_ERR(opp_table))
return PTR_ERR(opp_table);
- ret = dev_pm_opp_of_add_table(&pdev->dev);
- ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) {
dev_pm_opp_put_clkname(port->se.opp_table);
devm_pm_opp_put_clkname(&pdev->dev, opp_table);We shouldn't be doing this here, i.e. put_clkname. Even when the OPP table isn't present, this driver calls dev_pm_opp_set_rate() which behaves like clk_set_rate() in this case and so the clk name is still required by the OPP core.
The same problem is there with multiple patches, fix them all please.
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/spi/spi-geni-qcom.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 512e925d5ea4..2b5a164fecb9 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -620,9 +620,12 @@ static int spi_geni_probe(struct platform_device *pdev) return PTR_ERR(mas->se.opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (ret && ret != -ENODEV) { - dev_err(&pdev->dev, "invalid OPP table in device tree\n"); - goto put_clkname; + if (ret) { + dev_pm_opp_put_clkname(mas->se.opp_table); + if (ret != -ENODEV) { + dev_err(&pdev->dev, "invalid OPP table in device tree\n"); + return ret; + } }
spi->bus_num = -1; @@ -675,7 +678,6 @@ static int spi_geni_probe(struct platform_device *pdev) spi_geni_probe_runtime_disable: pm_runtime_disable(dev); dev_pm_opp_of_remove_table(&pdev->dev); -put_clkname: dev_pm_opp_put_clkname(mas->se.opp_table); return ret; }
On Fri, Jan 01, 2021 at 04:54:44PM +0000, Yangtao Li wrote:
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Acked-by: Mark Brown broonie@kernel.org
Use devm_pm_opp_* API to simplify code, and we don't need to make opp_table glabal.
Let's remove opp_table from geni_se later.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/spi/spi-geni-qcom.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 2b5a164fecb9..e330c46a9243 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -590,6 +590,7 @@ static int spi_geni_probe(struct platform_device *pdev) void __iomem *base; struct clk *clk; struct device *dev = &pdev->dev; + struct opp_table *opp_table;
irq = platform_get_irq(pdev, 0); if (irq < 0) @@ -615,13 +616,13 @@ static int spi_geni_probe(struct platform_device *pdev) mas->se.wrapper = dev_get_drvdata(dev->parent); mas->se.base = base; mas->se.clk = clk; - mas->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se"); - if (IS_ERR(mas->se.opp_table)) - return PTR_ERR(mas->se.opp_table); + opp_table = devm_pm_opp_set_clkname(dev, "se"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) { - dev_pm_opp_put_clkname(mas->se.opp_table); + devm_pm_opp_put_clkname(dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "invalid OPP table in device tree\n"); return ret; @@ -677,8 +678,6 @@ static int spi_geni_probe(struct platform_device *pdev) free_irq(mas->irq, spi); spi_geni_probe_runtime_disable: pm_runtime_disable(dev); - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(mas->se.opp_table); return ret; }
@@ -692,8 +691,6 @@ static int spi_geni_remove(struct platform_device *pdev)
free_irq(mas->irq, spi); pm_runtime_disable(&pdev->dev); - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(mas->se.opp_table); return 0; }
On Fri, Jan 01, 2021 at 04:54:45PM +0000, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code, and we don't need to make opp_table glabal.
Acked-by: Mark brown broonie@kernel.org
opp_table isn't used anymore, remove it.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- include/linux/qcom-geni-se.h | 2 -- 1 file changed, 2 deletions(-)
diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index ec2ad4b0fe14..cddef864a760 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -47,7 +47,6 @@ struct geni_icc_path { * @num_clk_levels: Number of valid clock levels in clk_perf_tbl * @clk_perf_tbl: Table of clock frequency input to serial engine clock * @icc_paths: Array of ICC paths for SE - * @opp_table: Pointer to the OPP table */ struct geni_se { void __iomem *base; @@ -57,7 +56,6 @@ struct geni_se { unsigned int num_clk_levels; unsigned long *clk_perf_tbl; struct geni_icc_path icc_paths[3]; - struct opp_table *opp_table; };
/* Common SE registers */
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/mmc/host/sdhci-msm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 9c7927b03253..094ef95f5ecc 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2291,9 +2291,12 @@ static int sdhci_msm_probe(struct platform_device *pdev)
/* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (ret && ret != -ENODEV) { - dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); - goto opp_put_clkname; + if (ret) { + dev_pm_opp_put_clkname(msm_host->opp_table); + if (ret != -ENODEV) { + dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); + goto bus_clk_disable; + } }
/* Vote for maximum clock rate for maximum performance */ @@ -2461,7 +2464,6 @@ static int sdhci_msm_probe(struct platform_device *pdev) msm_host->bulk_clks); opp_cleanup: dev_pm_opp_of_remove_table(&pdev->dev); -opp_put_clkname: dev_pm_opp_put_clkname(msm_host->opp_table); bus_clk_disable: if (!IS_ERR(msm_host->bus_clk))
Use devm_pm_opp_* API to simplify code, and remove opp_table from sdhci_msm_host.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/mmc/host/sdhci-msm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 094ef95f5ecc..490ba5d68f72 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -261,7 +261,6 @@ struct sdhci_msm_host { struct clk_bulk_data bulk_clks[4]; /* core, iface, cal, sleep clocks */ unsigned long clk_rate; struct mmc_host *mmc; - struct opp_table *opp_table; bool use_14lpp_dll_reset; bool tuning_done; bool calibration_done; @@ -2215,6 +2214,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) const struct sdhci_msm_offset *msm_offset; const struct sdhci_msm_variant_info *var_info; struct device_node *node = pdev->dev.of_node; + struct opp_table *opp_table;
host = sdhci_pltfm_init(pdev, &sdhci_msm_pdata, sizeof(*msm_host)); if (IS_ERR(host)) @@ -2283,16 +2283,16 @@ static int sdhci_msm_probe(struct platform_device *pdev) if (ret) goto bus_clk_disable;
- msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "core"); - if (IS_ERR(msm_host->opp_table)) { - ret = PTR_ERR(msm_host->opp_table); + opp_table = devm_pm_opp_set_clkname(&pdev->dev, "core"); + if (IS_ERR(opp_table)) { + ret = PTR_ERR(opp_table); goto bus_clk_disable; }
/* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) { - dev_pm_opp_put_clkname(msm_host->opp_table); + devm_pm_opp_put_clkname(&pdev->dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); goto bus_clk_disable; @@ -2317,7 +2317,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); if (ret) - goto opp_cleanup; + goto bus_clk_disable;
/* * xo clock is needed for FLL feature of cm_dll. @@ -2462,9 +2462,6 @@ static int sdhci_msm_probe(struct platform_device *pdev) clk_disable: clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); -opp_cleanup: - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(msm_host->opp_table); bus_clk_disable: if (!IS_ERR(msm_host->bus_clk)) clk_disable_unprepare(msm_host->bus_clk); @@ -2483,8 +2480,6 @@ static int sdhci_msm_remove(struct platform_device *pdev)
sdhci_remove_host(host, dead);
- dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(msm_host->opp_table); pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev);
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/spi/spi-qcom-qspi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c index 8863be370884..915ae115d8c1 100644 --- a/drivers/spi/spi-qcom-qspi.c +++ b/drivers/spi/spi-qcom-qspi.c @@ -536,9 +536,12 @@ static int qcom_qspi_probe(struct platform_device *pdev) return PTR_ERR(ctrl->opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (ret && ret != -ENODEV) { - dev_err(&pdev->dev, "invalid OPP table in device tree\n"); - goto exit_probe_put_clkname; + if (ret) { + dev_pm_opp_put_clkname(ctrl->opp_table); + if (ret != -ENODEV) { + dev_err(&pdev->dev, "invalid OPP table in device tree\n"); + return ret; + } }
pm_runtime_use_autosuspend(dev); @@ -551,8 +554,6 @@ static int qcom_qspi_probe(struct platform_device *pdev)
pm_runtime_disable(dev); dev_pm_opp_of_remove_table(&pdev->dev); - -exit_probe_put_clkname: dev_pm_opp_put_clkname(ctrl->opp_table);
return ret;
On Fri, Jan 01, 2021 at 04:54:49PM +0000, Yangtao Li wrote:
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Acked-by: Mark Brown broonie@kernel.org
Use devm_pm_opp_* API to simplify code, and remove opp_table from qcom_qspi.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/spi/spi-qcom-qspi.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c index 915ae115d8c1..1a1ab153ff59 100644 --- a/drivers/spi/spi-qcom-qspi.c +++ b/drivers/spi/spi-qcom-qspi.c @@ -142,7 +142,6 @@ struct qcom_qspi { struct clk_bulk_data *clks; struct qspi_xfer xfer; struct icc_path *icc_path_cpu_to_qspi; - struct opp_table *opp_table; unsigned long last_speed; /* Lock to protect data accessed by IRQs */ spinlock_t lock; @@ -459,6 +458,7 @@ static int qcom_qspi_probe(struct platform_device *pdev) struct device *dev; struct spi_master *master; struct qcom_qspi *ctrl; + struct opp_table *opp_table;
dev = &pdev->dev;
@@ -531,13 +531,13 @@ static int qcom_qspi_probe(struct platform_device *pdev) master->handle_err = qcom_qspi_handle_err; master->auto_runtime_pm = true;
- ctrl->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "core"); - if (IS_ERR(ctrl->opp_table)) - return PTR_ERR(ctrl->opp_table); + opp_table = devm_pm_opp_set_clkname(dev, "core"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) { - dev_pm_opp_put_clkname(ctrl->opp_table); + devm_pm_opp_put_clkname(dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "invalid OPP table in device tree\n"); return ret; @@ -553,8 +553,6 @@ static int qcom_qspi_probe(struct platform_device *pdev) return 0;
pm_runtime_disable(dev); - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(ctrl->opp_table);
return ret; } @@ -568,8 +566,6 @@ static int qcom_qspi_remove(struct platform_device *pdev) spi_unregister_master(master);
pm_runtime_disable(&pdev->dev); - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(ctrl->opp_table);
return 0; }
On Fri, Jan 01, 2021 at 04:54:50PM +0000, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code, and remove opp_table from qcom_qspi.
Acked-by: Mark Brown broonie@kernel.org
We should use dev_pm_opp_put_clkname() to free opp table each time dev_pm_opp_of_add_table() got error.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++++++---- drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 374b0e8471e6..6f19dfcb4965 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1093,9 +1093,12 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) return PTR_ERR(dpu_kms->opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(dev); - if (ret && ret != -ENODEV) { - dev_err(dev, "invalid OPP table in device tree\n"); - goto put_clkname; + if (ret) { + dev_pm_opp_put_clkname(dpu_kms->opp_table); + if (ret != -ENODEV) { + dev_err(dev, "invalid OPP table in device tree\n"); + return ret; + } }
mp = &dpu_kms->mp; @@ -1122,7 +1125,6 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) return ret; err: dev_pm_opp_of_remove_table(dev); -put_clkname: dev_pm_opp_put_clkname(dpu_kms->opp_table); return ret; } diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index ab281cba0f08..a282307f2799 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1891,10 +1891,12 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) return PTR_ERR(msm_host->opp_table); /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (ret && ret != -ENODEV) { - dev_err(&pdev->dev, "invalid OPP table in device tree\n"); + if (ret) { dev_pm_opp_put_clkname(msm_host->opp_table); - return ret; + if (ret != -ENODEV) { + dev_err(&pdev->dev, "invalid OPP table in device tree\n"); + return ret; + } }
init_completion(&msm_host->dma_comp);
1. Use devm_pm_opp_* to simplif code and avoid mem leak. 2. Remove opp_table from dpu_kms, dp_ctrl_private and msm_dsi_host, since it does not need a global scope. 3. Remove dp_ctrl_put.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 23 ++++++++------------ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/dp/dp_ctrl.c | 29 ++++++------------------- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 5 +---- drivers/gpu/drm/msm/dsi/dsi_host.c | 15 +++++-------- 9 files changed, 26 insertions(+), 55 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index a5af223eaf50..47e51c632209 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1560,7 +1560,7 @@ static void check_speed_bin(struct device *dev) nvmem_cell_put(cell); }
- dev_pm_opp_set_supported_hw(dev, &val, 1); + devm_pm_opp_set_supported_hw(dev, &val, 1); }
struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index e6703ae98760..bd159e6fac5a 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1321,7 +1321,7 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu) * The GMU handles its own frequency switching so build a list of * available frequencies to send during initialization */ - ret = dev_pm_opp_of_add_table(gmu->dev); + ret = devm_pm_opp_of_add_table(gmu->dev); if (ret) { DRM_DEV_ERROR(gmu->dev, "Unable to set the OPP table for the GMU\n"); return ret; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 6cf9975e951e..e6c446c436e3 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -845,7 +845,7 @@ static void adreno_get_pwrlevels(struct device *dev, if (!of_find_property(dev->of_node, "operating-points-v2", NULL)) ret = adreno_get_legacy_pwrlevels(dev); else { - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) DRM_DEV_ERROR(dev, "Unable to set the OPP table\n"); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 6f19dfcb4965..cb7e4fddf268 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1082,19 +1082,20 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) struct msm_drm_private *priv = ddev->dev_private; struct dpu_kms *dpu_kms; struct dss_module_power *mp; + struct opp_table *opp_table; int ret = 0;
dpu_kms = devm_kzalloc(&pdev->dev, sizeof(*dpu_kms), GFP_KERNEL); if (!dpu_kms) return -ENOMEM;
- dpu_kms->opp_table = dev_pm_opp_set_clkname(dev, "core"); - if (IS_ERR(dpu_kms->opp_table)) - return PTR_ERR(dpu_kms->opp_table); + opp_table = devm_pm_opp_set_clkname(dev, "core"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) { - dev_pm_opp_put_clkname(dpu_kms->opp_table); + devm_pm_opp_put_clkname(dev, opp_table); if (ret != -ENODEV) { dev_err(dev, "invalid OPP table in device tree\n"); return ret; @@ -1105,7 +1106,7 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) ret = msm_dss_parse_clock(pdev, mp); if (ret) { DPU_ERROR("failed to parse clocks, ret=%d\n", ret); - goto err; + return ret; }
platform_set_drvdata(pdev, dpu_kms); @@ -1113,7 +1114,7 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) ret = msm_kms_init(&dpu_kms->base, &kms_funcs); if (ret) { DPU_ERROR("failed to init kms, ret=%d\n", ret); - goto err; + return ret; } dpu_kms->dev = ddev; dpu_kms->pdev = pdev; @@ -1122,10 +1123,7 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) dpu_kms->rpm_enabled = true;
priv->kms = &dpu_kms->base; - return ret; -err: - dev_pm_opp_of_remove_table(dev); - dev_pm_opp_put_clkname(dpu_kms->opp_table); + return ret; }
@@ -1141,9 +1139,6 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)
if (dpu_kms->rpm_enabled) pm_runtime_disable(&pdev->dev); - - dev_pm_opp_of_remove_table(dev); - dev_pm_opp_put_clkname(dpu_kms->opp_table); }
static const struct component_ops dpu_ops = { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index d6717d6672f7..1483995a94d9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -130,8 +130,6 @@ struct dpu_kms { struct platform_device *pdev; bool rpm_enabled;
- struct opp_table *opp_table; - struct dss_module_power mp;
/* reference count bandwidth requests, so we know when we can diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index e3462f5d96d7..fdb696ec9d9a 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -77,8 +77,6 @@ struct dp_ctrl_private { struct dp_parser *parser; struct dp_catalog *catalog;
- struct opp_table *opp_table; - struct completion idle_comp; struct completion video_comp; }; @@ -1873,6 +1871,7 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct dp_parser *parser) { struct dp_ctrl_private *ctrl; + struct opp_table *opp_table; int ret;
if (!dev || !panel || !aux || @@ -1887,19 +1886,18 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, return ERR_PTR(-ENOMEM); }
- ctrl->opp_table = dev_pm_opp_set_clkname(dev, "ctrl_link"); - if (IS_ERR(ctrl->opp_table)) { + opp_table = devm_pm_opp_set_clkname(dev, "ctrl_link"); + if (IS_ERR(opp_table)) { dev_err(dev, "invalid DP OPP table in device tree\n"); - /* caller do PTR_ERR(ctrl->opp_table) */ - return (struct dp_ctrl *)ctrl->opp_table; + /* caller do PTR_ERR(opp_table) */ + return (struct dp_ctrl *)opp_table; }
/* OPP table is optional */ - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) { dev_err(dev, "failed to add DP OPP table\n"); - dev_pm_opp_put_clkname(ctrl->opp_table); - ctrl->opp_table = NULL; + devm_pm_opp_put_clkname(dev, opp_table); }
init_completion(&ctrl->idle_comp); @@ -1916,16 +1914,3 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,
return &ctrl->dp_ctrl; } - -void dp_ctrl_put(struct dp_ctrl *dp_ctrl) -{ - struct dp_ctrl_private *ctrl; - - ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); - - if (ctrl->opp_table) { - dev_pm_opp_of_remove_table(ctrl->dev); - dev_pm_opp_put_clkname(ctrl->opp_table); - ctrl->opp_table = NULL; - } -} diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h index f60ba93c8678..dcd6bde2b23d 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -31,6 +31,5 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct dp_panel *panel, struct drm_dp_aux *aux, struct dp_power *power, struct dp_catalog *catalog, struct dp_parser *parser); -void dp_ctrl_put(struct dp_ctrl *dp_ctrl);
#endif /* _DP_CTRL_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 6e971d552911..44c1572e7005 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -706,7 +706,6 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data) static void dp_display_deinit_sub_modules(struct dp_display_private *dp) { dp_debug_put(dp->debug); - dp_ctrl_put(dp->ctrl); dp_panel_put(dp->panel); dp_aux_put(dp->aux); dp_audio_put(dp->audio); @@ -800,13 +799,11 @@ static int dp_init_sub_modules(struct dp_display_private *dp) rc = PTR_ERR(dp->audio); pr_err("failed to initialize audio, rc = %d\n", rc); dp->audio = NULL; - goto error_audio; + goto error_ctrl; }
return rc;
-error_audio: - dp_ctrl_put(dp->ctrl); error_ctrl: dp_panel_put(dp->panel); error_link: diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index a282307f2799..30c89dd448b9 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -113,8 +113,6 @@ struct msm_dsi_host { struct clk *pixel_clk_src; struct clk *byte_intf_clk;
- struct opp_table *opp_table; - u32 byte_clk_rate; u32 pixel_clk_rate; u32 esc_clk_rate; @@ -1822,6 +1820,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) { struct msm_dsi_host *msm_host = NULL; struct platform_device *pdev = msm_dsi->pdev; + struct opp_table *opp_table; int ret;
msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL); @@ -1886,13 +1885,13 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) goto fail; }
- msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "byte"); - if (IS_ERR(msm_host->opp_table)) - return PTR_ERR(msm_host->opp_table); + opp_table = devm_pm_opp_set_clkname(&pdev->dev, "byte"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) { - dev_pm_opp_put_clkname(msm_host->opp_table); + devm_pm_opp_put_clkname(&pdev->dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "invalid OPP table in device tree\n"); return ret; @@ -1934,8 +1933,6 @@ void msm_dsi_host_destroy(struct mipi_dsi_host *host) mutex_destroy(&msm_host->cmd_mutex); mutex_destroy(&msm_host->dev_mutex);
- dev_pm_opp_of_remove_table(&msm_host->pdev->dev); - dev_pm_opp_put_clkname(msm_host->opp_table); pm_runtime_disable(&msm_host->pdev->dev); }
Use devm_pm_opp_* API to simplify code, and remove opp_table from lima_devfreq.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/gpu/drm/lima/lima_devfreq.c | 40 ++++++++--------------------- drivers/gpu/drm/lima/lima_devfreq.h | 2 -- 2 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index 5686ad4aaf7c..d5937cf86504 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -99,13 +99,6 @@ void lima_devfreq_fini(struct lima_device *ldev) devm_devfreq_remove_device(ldev->dev, devfreq->devfreq); devfreq->devfreq = NULL; } - - dev_pm_opp_of_remove_table(ldev->dev); - - dev_pm_opp_put_regulators(devfreq->regulators_opp_table); - dev_pm_opp_put_clkname(devfreq->clkname_opp_table); - devfreq->regulators_opp_table = NULL; - devfreq->clkname_opp_table = NULL; }
int lima_devfreq_init(struct lima_device *ldev) @@ -125,15 +118,11 @@ int lima_devfreq_init(struct lima_device *ldev)
spin_lock_init(&ldevfreq->lock);
- opp_table = dev_pm_opp_set_clkname(dev, "core"); - if (IS_ERR(opp_table)) { - ret = PTR_ERR(opp_table); - goto err_fini; - } - - ldevfreq->clkname_opp_table = opp_table; + opp_table = devm_pm_opp_set_clkname(dev, "core"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table);
- opp_table = dev_pm_opp_set_regulators(dev, + opp_table = devm_pm_opp_set_regulators(dev, (const char *[]){ "mali" }, 1); if (IS_ERR(opp_table)) { @@ -141,24 +130,20 @@ int lima_devfreq_init(struct lima_device *ldev)
/* Continue if the optional regulator is missing */ if (ret != -ENODEV) - goto err_fini; - } else { - ldevfreq->regulators_opp_table = opp_table; + return ret; }
- ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) - goto err_fini; + return ret;
lima_devfreq_reset(ldevfreq);
cur_freq = clk_get_rate(ldev->clk_gpu);
opp = devfreq_recommended_opp(dev, &cur_freq, 0); - if (IS_ERR(opp)) { - ret = PTR_ERR(opp); - goto err_fini; - } + if (IS_ERR(opp)) + return PTR_ERR(opp);
lima_devfreq_profile.initial_freq = cur_freq; dev_pm_opp_put(opp); @@ -167,8 +152,7 @@ int lima_devfreq_init(struct lima_device *ldev) DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL); if (IS_ERR(devfreq)) { dev_err(dev, "Couldn't initialize GPU devfreq\n"); - ret = PTR_ERR(devfreq); - goto err_fini; + return PTR_ERR(devfreq); }
ldevfreq->devfreq = devfreq; @@ -180,10 +164,6 @@ int lima_devfreq_init(struct lima_device *ldev) ldevfreq->cooling = cooling;
return 0; - -err_fini: - lima_devfreq_fini(ldev); - return ret; }
void lima_devfreq_record_busy(struct lima_devfreq *devfreq) diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h index 2d9b3008ce77..c3bcae76ca07 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.h +++ b/drivers/gpu/drm/lima/lima_devfreq.h @@ -15,8 +15,6 @@ struct lima_device;
struct lima_devfreq { struct devfreq *devfreq; - struct opp_table *clkname_opp_table; - struct opp_table *regulators_opp_table; struct thermal_cooling_device *cooling;
ktime_t busy_time;
There is no need to manually release devm related resources.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/gpu/drm/lima/lima_devfreq.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index d5937cf86504..7690c5c69f9f 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -94,11 +94,6 @@ void lima_devfreq_fini(struct lima_device *ldev) devfreq_cooling_unregister(devfreq->cooling); devfreq->cooling = NULL; } - - if (devfreq->devfreq) { - devm_devfreq_remove_device(ldev->dev, devfreq->devfreq); - devfreq->devfreq = NULL; - } }
int lima_devfreq_init(struct lima_device *ldev)
On 01-01-21, 16:54, Yangtao Li wrote:
There is no need to manually release devm related resources.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/gpu/drm/lima/lima_devfreq.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index d5937cf86504..7690c5c69f9f 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -94,11 +94,6 @@ void lima_devfreq_fini(struct lima_device *ldev) devfreq_cooling_unregister(devfreq->cooling); devfreq->cooling = NULL; }
- if (devfreq->devfreq) {
devm_devfreq_remove_device(ldev->dev, devfreq->devfreq);devfreq->devfreq = NULL;- }
}
Why is this part of this patchset ?
Use devm_pm_opp_* API to simplify code, and remove opp_table from panfrost_devfreq.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 ++++++--------------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - 2 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index f44d28fad085..c42fa9eb43b1 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -92,25 +92,26 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) struct thermal_cooling_device *cooling; struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
- opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names, + opp_table = devm_pm_opp_set_regulators(dev, pfdev->comp->supply_names, pfdev->comp->num_supplies); if (IS_ERR(opp_table)) { ret = PTR_ERR(opp_table); /* Continue if the optional regulator is missing */ if (ret != -ENODEV) { DRM_DEV_ERROR(dev, "Couldn't set OPP regulators\n"); - goto err_fini; + return ret; } - } else { - pfdevfreq->regulators_opp_table = opp_table; }
- ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) { + if (!IS_ERR(opp_table)) + devm_pm_opp_put_regulators(dev, opp_table); + /* Optional, continue without devfreq */ if (ret == -ENODEV) ret = 0; - goto err_fini; + return ret; } pfdevfreq->opp_of_table_added = true;
@@ -121,10 +122,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) cur_freq = clk_get_rate(pfdev->clock);
opp = devfreq_recommended_opp(dev, &cur_freq, 0); - if (IS_ERR(opp)) { - ret = PTR_ERR(opp); - goto err_fini; - } + if (IS_ERR(opp)) + return PTR_ERR(opp);
panfrost_devfreq_profile.initial_freq = cur_freq; dev_pm_opp_put(opp); @@ -133,8 +132,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL); if (IS_ERR(devfreq)) { DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n"); - ret = PTR_ERR(devfreq); - goto err_fini; + return PTR_ERR(devfreq); } pfdevfreq->devfreq = devfreq;
@@ -145,10 +143,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) pfdevfreq->cooling = cooling;
return 0; - -err_fini: - panfrost_devfreq_fini(pfdev); - return ret; }
void panfrost_devfreq_fini(struct panfrost_device *pfdev) @@ -159,14 +153,6 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev) devfreq_cooling_unregister(pfdevfreq->cooling); pfdevfreq->cooling = NULL; } - - if (pfdevfreq->opp_of_table_added) { - dev_pm_opp_of_remove_table(&pfdev->pdev->dev); - pfdevfreq->opp_of_table_added = false; - } - - dev_pm_opp_put_regulators(pfdevfreq->regulators_opp_table); - pfdevfreq->regulators_opp_table = NULL; }
void panfrost_devfreq_resume(struct panfrost_device *pfdev) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h index db6ea48e21f9..a51854cc8c06 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h @@ -15,7 +15,6 @@ struct panfrost_device;
struct panfrost_devfreq { struct devfreq *devfreq; - struct opp_table *regulators_opp_table; struct thermal_cooling_device *cooling; bool opp_of_table_added;
On 01/01/2021 16:54, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code, and remove opp_table from panfrost_devfreq.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
Reviewed-by: Steven Price steven.price@arm.com
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 ++++++--------------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - 2 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index f44d28fad085..c42fa9eb43b1 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -92,25 +92,26 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) struct thermal_cooling_device *cooling; struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
- opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
- opp_table = devm_pm_opp_set_regulators(dev, pfdev->comp->supply_names, pfdev->comp->num_supplies); if (IS_ERR(opp_table)) { ret = PTR_ERR(opp_table); /* Continue if the optional regulator is missing */ if (ret != -ENODEV) { DRM_DEV_ERROR(dev, "Couldn't set OPP regulators\n");
goto err_fini;
return ret;
} else {
pfdevfreq->regulators_opp_table = opp_table;}
ret = dev_pm_opp_of_add_table(dev);
- ret = devm_pm_opp_of_add_table(dev); if (ret) {
if (!IS_ERR(opp_table))devm_pm_opp_put_regulators(dev, opp_table);- /* Optional, continue without devfreq */ if (ret == -ENODEV) ret = 0;
goto err_fini;
return ret;@@ -121,10 +122,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) cur_freq = clk_get_rate(pfdev->clock);
opp = devfreq_recommended_opp(dev, &cur_freq, 0);
- if (IS_ERR(opp)) {
ret = PTR_ERR(opp);goto err_fini;- }
if (IS_ERR(opp))
return PTR_ERR(opp);panfrost_devfreq_profile.initial_freq = cur_freq; dev_pm_opp_put(opp);
@@ -133,8 +132,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL); if (IS_ERR(devfreq)) { DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
ret = PTR_ERR(devfreq);goto err_fini;
return PTR_ERR(devfreq);@@ -145,10 +143,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) pfdevfreq->cooling = cooling;
return 0;
-err_fini:
panfrost_devfreq_fini(pfdev);
return ret; }
void panfrost_devfreq_fini(struct panfrost_device *pfdev)
@@ -159,14 +153,6 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev) devfreq_cooling_unregister(pfdevfreq->cooling); pfdevfreq->cooling = NULL; }
if (pfdevfreq->opp_of_table_added) {
dev_pm_opp_of_remove_table(&pfdev->pdev->dev);pfdevfreq->opp_of_table_added = false;}
dev_pm_opp_put_regulators(pfdevfreq->regulators_opp_table);
pfdevfreq->regulators_opp_table = NULL; }
void panfrost_devfreq_resume(struct panfrost_device *pfdev)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h index db6ea48e21f9..a51854cc8c06 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h @@ -15,7 +15,6 @@ struct panfrost_device;
struct panfrost_devfreq { struct devfreq *devfreq;
- struct opp_table *regulators_opp_table; struct thermal_cooling_device *cooling; bool opp_of_table_added;
Don't call dev_pm_opp_put_clkname() when got invalid OPP table in device tree, since we do this in core_put_v4().
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/media/platform/qcom/venus/pm_helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c index a3850261d697..59cbd6c39450 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -881,8 +881,9 @@ static int core_get_v4(struct device *dev) core->has_opp_table = true; } else if (ret != -ENODEV) { dev_err(dev, "invalid OPP table in device tree\n"); - dev_pm_opp_put_clkname(core->opp_table); return ret; + } else { + dev_pm_opp_put_clkname(core->opp_table); } }
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- .../media/platform/qcom/venus/pm_helpers.c | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c index 59cbd6c39450..9684c25558ef 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -871,31 +871,23 @@ static int core_get_v4(struct device *dev) if (legacy_binding) return 0;
- core->opp_table = dev_pm_opp_set_clkname(dev, "core"); + core->opp_table = devm_pm_opp_set_clkname(dev, "core"); if (IS_ERR(core->opp_table)) return PTR_ERR(core->opp_table);
if (core->res->opp_pmdomain) { - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (!ret) { core->has_opp_table = true; } else if (ret != -ENODEV) { dev_err(dev, "invalid OPP table in device tree\n"); return ret; } else { - dev_pm_opp_put_clkname(core->opp_table); + devm_pm_opp_put_clkname(dev, core->opp_table); } }
- ret = vcodec_domains_get(dev); - if (ret) { - if (core->has_opp_table) - dev_pm_opp_of_remove_table(dev); - dev_pm_opp_put_clkname(core->opp_table); - return ret; - } - - return 0; + return vcodec_domains_get(dev); }
static void core_put_v4(struct device *dev) @@ -906,11 +898,6 @@ static void core_put_v4(struct device *dev) return;
vcodec_domains_put(dev); - - if (core->has_opp_table) - dev_pm_opp_of_remove_table(dev); - dev_pm_opp_put_clkname(core->opp_table); - }
static int core_power_v4(struct device *dev, int on)
We can't always return -EINVAL, let's fix it.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/memory/samsung/exynos5422-dmc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/memory/samsung/exynos5422-dmc.c b/drivers/memory/samsung/exynos5422-dmc.c index c5ee4121a4d2..62a83633f837 100644 --- a/drivers/memory/samsung/exynos5422-dmc.c +++ b/drivers/memory/samsung/exynos5422-dmc.c @@ -353,16 +353,20 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count, sizeof(struct dmc_opp_table), GFP_KERNEL); - if (!dmc->opp) + if (!dmc->opp) { + ret = -ENOMEM; goto err_opp; + }
idx = dmc->opp_count - 1; for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) { struct dev_pm_opp *opp;
opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq); - if (IS_ERR(opp)) + if (IS_ERR(opp)) { + ret = PTR_ERR(opp); goto err_opp; + }
dmc->opp[idx - i].freq_hz = freq; dmc->opp[idx - i].volt_uv = dev_pm_opp_get_voltage(opp); @@ -375,7 +379,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, err_opp: dev_pm_opp_of_remove_table(dmc->dev);
- return -EINVAL; + return ret; }
/**
On Fri, Jan 01, 2021 at 04:54:58PM +0000, Yangtao Li wrote:
We can't always return -EINVAL, let's fix it.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/memory/samsung/exynos5422-dmc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Reviewed-by: Krzysztof Kozlowski krzk@kernel.org
I see that the next patch depends on it so feel free to take it via PM tree. Otherwise let me know.
Best regards, Krzysztof
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/memory/samsung/exynos5422-dmc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/drivers/memory/samsung/exynos5422-dmc.c b/drivers/memory/samsung/exynos5422-dmc.c index 62a83633f837..cab9fd74322b 100644 --- a/drivers/memory/samsung/exynos5422-dmc.c +++ b/drivers/memory/samsung/exynos5422-dmc.c @@ -343,7 +343,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, int idx; unsigned long freq;
- ret = dev_pm_opp_of_add_table(dmc->dev); + ret = devm_pm_opp_of_add_table(dmc->dev); if (ret < 0) { dev_err(dmc->dev, "Failed to get OPP table\n"); return ret; @@ -353,20 +353,16 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count, sizeof(struct dmc_opp_table), GFP_KERNEL); - if (!dmc->opp) { - ret = -ENOMEM; - goto err_opp; - } + if (!dmc->opp) + return -ENOMEM;
idx = dmc->opp_count - 1; for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) { struct dev_pm_opp *opp;
opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq); - if (IS_ERR(opp)) { - ret = PTR_ERR(opp); - goto err_opp; - } + if (IS_ERR(opp)) + return PTR_ERR(opp);
dmc->opp[idx - i].freq_hz = freq; dmc->opp[idx - i].volt_uv = dev_pm_opp_get_voltage(opp); @@ -375,11 +371,6 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, }
return 0; - -err_opp: - dev_pm_opp_of_remove_table(dmc->dev); - - return ret; }
/** @@ -1571,8 +1562,6 @@ static int exynos5_dmc_remove(struct platform_device *pdev) clk_disable_unprepare(dmc->mout_bpll); clk_disable_unprepare(dmc->fout_bpll);
- dev_pm_opp_remove_table(dmc->dev); - return 0; }
On Fri, Jan 01, 2021 at 04:54:59PM +0000, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/memory/samsung/exynos5422-dmc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
Reviewed-by: Krzysztof Kozlowski krzk@kernel.org
Best regards, Krzysztof
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com --- drivers/memory/tegra/tegra20-emc.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index 686aaf477d8a..223d9d97eb8f 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -911,31 +911,31 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc) static int tegra_emc_opp_table_init(struct tegra_emc *emc) { u32 hw_version = BIT(tegra_sku_info.soc_process_id); - struct opp_table *clk_opp_table, *hw_opp_table; + struct opp_table *opp_table; int err;
- clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); - err = PTR_ERR_OR_ZERO(clk_opp_table); + opp_table = devm_pm_opp_set_clkname(emc->dev, NULL); + err = PTR_ERR_OR_ZERO(opp_table); if (err) { dev_err(emc->dev, "failed to set OPP clk: %d\n", err); return err; }
- hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); - err = PTR_ERR_OR_ZERO(hw_opp_table); + opp_table = devm_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); + err = PTR_ERR_OR_ZERO(opp_table); if (err) { dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err); - goto put_clk_table; + return err; }
- err = dev_pm_opp_of_add_table(emc->dev); + err = devm_pm_opp_of_add_table(emc->dev); if (err) { if (err == -ENODEV) dev_err(emc->dev, "OPP table not found, please update your device tree\n"); else dev_err(emc->dev, "failed to add OPP table: %d\n", err);
- goto put_hw_table; + return err; }
dev_info(emc->dev, "OPP HW ver. 0x%x, current clock rate %lu MHz\n", @@ -943,19 +943,8 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc)
/* first dummy rate-set initializes voltage state */ err = dev_pm_opp_set_rate(emc->dev, clk_get_rate(emc->clk)); - if (err) { + if (err) dev_err(emc->dev, "failed to initialize OPP clock: %d\n", err); - goto remove_table; - } - - return 0; - -remove_table: - dev_pm_opp_of_remove_table(emc->dev); -put_hw_table: - dev_pm_opp_put_supported_hw(hw_opp_table); -put_clk_table: - dev_pm_opp_put_clkname(clk_opp_table);
return err; }
On Fri, Jan 01, 2021 at 04:55:00PM +0000, Yangtao Li wrote:
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/memory/tegra/tegra20-emc.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
Reviewed-by: Krzysztof Kozlowski krzk@kernel.org
Best regards, Krzysztof
01.01.2021 19:55, Yangtao Li пишет:
Use devm_pm_opp_* API to simplify code.
Signed-off-by: Yangtao Li tiny.windzz@gmail.com
drivers/memory/tegra/tegra20-emc.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
There are also tegra30-emc.c and tegra124-emc.c with a similar OPP code.
But could we please not touch these memory drivers? I already have a prepared patch which replaces all the tegra_emc_opp_table_init() with a single common helper that will use devm_opp_* helpers.
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Yangtao Li (31): opp: Add devres wrapper for dev_pm_opp_set_clkname and dev_pm_opp_put_clkname opp: Add devres wrapper for dev_pm_opp_set_regulators and dev_pm_opp_put_regulators opp: Add devres wrapper for dev_pm_opp_set_supported_hw opp: Add devres wrapper for dev_pm_opp_of_add_table opp: Add devres wrapper for dev_pm_opp_register_notifier serial: qcom_geni_serial: fix potential mem leak in qcom_geni_serial_probe() serial: qcom_geni_serial: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() qcom-geni-se: remove opp_table mmc: sdhci-msm: fix potential mem leak in sdhci_msm_probe() mmc: sdhci-msm: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in qcom_qspi_probe() spi: spi-qcom-qspi: convert to use devm_pm_opp_* API drm/msm: fix potential mem leak drm/msm: convert to use devm_pm_opp_* API and remove dp_ctrl_put drm/lima: convert to use devm_pm_opp_* API drm/lima: remove unneeded devm_devfreq_remove_device() drm/panfrost: convert to use devm_pm_opp_* API media: venus: fix error check in core_get_v4() media: venus: convert to use devm_pm_opp_* API memory: samsung: exynos5422-dmc: fix return error in exynos5_init_freq_table memory: samsung: exynos5422-dmc: convert to use devm_pm_opp_* API memory: tegra20: convert to use devm_pm_opp_* API memory: tegra30: convert to use devm_pm_opp_* API PM / devfreq: tegra30: convert to use devm_pm_opp_* API PM / devfreq: rk3399_dmc: convert to use devm_pm_opp_* API PM / devfreq: imx8m-ddrc: convert to use devm_pm_opp_* API PM / devfreq: imx-bus: convert to use devm_pm_opp_* API PM / devfreq: exynos: convert to use devm_pm_opp_* API PM / devfreq: convert to devm_pm_opp_register_notifier and remove unused API
drivers/devfreq/devfreq.c | 66 +------ drivers/devfreq/exynos-bus.c | 42 +---- drivers/devfreq/imx-bus.c | 14 +- drivers/devfreq/imx8m-ddrc.c | 15 +- drivers/devfreq/rk3399_dmc.c | 22 +-- drivers/devfreq/tegra30-devfreq.c | 21 +-- drivers/gpu/drm/lima/lima_devfreq.c | 45 +---- drivers/gpu/drm/lima/lima_devfreq.h | 2 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 31 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/dp/dp_ctrl.c | 29 +-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 23 ++- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 +--- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - .../media/platform/qcom/venus/pm_helpers.c | 22 +-- drivers/memory/samsung/exynos5422-dmc.c | 13 +- drivers/memory/tegra/tegra20-emc.c | 29 +-- drivers/memory/tegra/tegra30-emc.c | 29 +-- drivers/mmc/host/sdhci-msm.c | 27 ++- drivers/opp/core.c | 173 ++++++++++++++++++ drivers/opp/of.c | 36 ++++ drivers/spi/spi-geni-qcom.c | 23 ++- drivers/spi/spi-qcom-qspi.c | 25 ++- drivers/tty/serial/qcom_geni_serial.c | 31 ++-- include/linux/devfreq.h | 23 --- include/linux/pm_opp.h | 38 ++++ include/linux/qcom-geni-se.h | 2 - 32 files changed, 402 insertions(+), 428 deletions(-)
Hello,
Could you please add helper for dev_pm_opp_attach_genpd() and make cpufreq drivers to use the helpers?
I'd also like to see a devm helper for dev_pm_opp_register_set_opp_helper(), which should become useful for Tegra drivers sometime soon.
HI,
On Sun, Jan 3, 2021 at 8:52 PM Dmitry Osipenko digetx@gmail.com wrote:
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Yangtao Li (31): opp: Add devres wrapper for dev_pm_opp_set_clkname and dev_pm_opp_put_clkname opp: Add devres wrapper for dev_pm_opp_set_regulators and dev_pm_opp_put_regulators opp: Add devres wrapper for dev_pm_opp_set_supported_hw opp: Add devres wrapper for dev_pm_opp_of_add_table opp: Add devres wrapper for dev_pm_opp_register_notifier serial: qcom_geni_serial: fix potential mem leak in qcom_geni_serial_probe() serial: qcom_geni_serial: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() qcom-geni-se: remove opp_table mmc: sdhci-msm: fix potential mem leak in sdhci_msm_probe() mmc: sdhci-msm: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in qcom_qspi_probe() spi: spi-qcom-qspi: convert to use devm_pm_opp_* API drm/msm: fix potential mem leak drm/msm: convert to use devm_pm_opp_* API and remove dp_ctrl_put drm/lima: convert to use devm_pm_opp_* API drm/lima: remove unneeded devm_devfreq_remove_device() drm/panfrost: convert to use devm_pm_opp_* API media: venus: fix error check in core_get_v4() media: venus: convert to use devm_pm_opp_* API memory: samsung: exynos5422-dmc: fix return error in exynos5_init_freq_table memory: samsung: exynos5422-dmc: convert to use devm_pm_opp_* API memory: tegra20: convert to use devm_pm_opp_* API memory: tegra30: convert to use devm_pm_opp_* API PM / devfreq: tegra30: convert to use devm_pm_opp_* API PM / devfreq: rk3399_dmc: convert to use devm_pm_opp_* API PM / devfreq: imx8m-ddrc: convert to use devm_pm_opp_* API PM / devfreq: imx-bus: convert to use devm_pm_opp_* API PM / devfreq: exynos: convert to use devm_pm_opp_* API PM / devfreq: convert to devm_pm_opp_register_notifier and remove unused API
drivers/devfreq/devfreq.c | 66 +------ drivers/devfreq/exynos-bus.c | 42 +---- drivers/devfreq/imx-bus.c | 14 +- drivers/devfreq/imx8m-ddrc.c | 15 +- drivers/devfreq/rk3399_dmc.c | 22 +-- drivers/devfreq/tegra30-devfreq.c | 21 +-- drivers/gpu/drm/lima/lima_devfreq.c | 45 +---- drivers/gpu/drm/lima/lima_devfreq.h | 2 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 31 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/dp/dp_ctrl.c | 29 +-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 23 ++- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 +--- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - .../media/platform/qcom/venus/pm_helpers.c | 22 +-- drivers/memory/samsung/exynos5422-dmc.c | 13 +- drivers/memory/tegra/tegra20-emc.c | 29 +-- drivers/memory/tegra/tegra30-emc.c | 29 +-- drivers/mmc/host/sdhci-msm.c | 27 ++- drivers/opp/core.c | 173 ++++++++++++++++++ drivers/opp/of.c | 36 ++++ drivers/spi/spi-geni-qcom.c | 23 ++- drivers/spi/spi-qcom-qspi.c | 25 ++- drivers/tty/serial/qcom_geni_serial.c | 31 ++-- include/linux/devfreq.h | 23 --- include/linux/pm_opp.h | 38 ++++ include/linux/qcom-geni-se.h | 2 - 32 files changed, 402 insertions(+), 428 deletions(-)
Hello,
Could you please add helper for dev_pm_opp_attach_genpd() and make cpufreq drivers to use the helpers?
Thank you for reminding me. But we shouldn't use this for CPU devices as the CPU device doesn't get bound to a driver, it is rather a fake platform device which gets the cpufreq drivers probed.
I'd also like to see a devm helper for dev_pm_opp_register_set_opp_helper(), which should become useful for Tegra drivers sometime soon.
For non-cpu devices?
BR / Yangtao
03.01.2021 17:30, Frank Lee пишет:
HI,
On Sun, Jan 3, 2021 at 8:52 PM Dmitry Osipenko digetx@gmail.com wrote:
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Yangtao Li (31): opp: Add devres wrapper for dev_pm_opp_set_clkname and dev_pm_opp_put_clkname opp: Add devres wrapper for dev_pm_opp_set_regulators and dev_pm_opp_put_regulators opp: Add devres wrapper for dev_pm_opp_set_supported_hw opp: Add devres wrapper for dev_pm_opp_of_add_table opp: Add devres wrapper for dev_pm_opp_register_notifier serial: qcom_geni_serial: fix potential mem leak in qcom_geni_serial_probe() serial: qcom_geni_serial: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe() qcom-geni-se: remove opp_table mmc: sdhci-msm: fix potential mem leak in sdhci_msm_probe() mmc: sdhci-msm: convert to use devm_pm_opp_* API spi: spi-qcom-qspi: fix potential mem leak in qcom_qspi_probe() spi: spi-qcom-qspi: convert to use devm_pm_opp_* API drm/msm: fix potential mem leak drm/msm: convert to use devm_pm_opp_* API and remove dp_ctrl_put drm/lima: convert to use devm_pm_opp_* API drm/lima: remove unneeded devm_devfreq_remove_device() drm/panfrost: convert to use devm_pm_opp_* API media: venus: fix error check in core_get_v4() media: venus: convert to use devm_pm_opp_* API memory: samsung: exynos5422-dmc: fix return error in exynos5_init_freq_table memory: samsung: exynos5422-dmc: convert to use devm_pm_opp_* API memory: tegra20: convert to use devm_pm_opp_* API memory: tegra30: convert to use devm_pm_opp_* API PM / devfreq: tegra30: convert to use devm_pm_opp_* API PM / devfreq: rk3399_dmc: convert to use devm_pm_opp_* API PM / devfreq: imx8m-ddrc: convert to use devm_pm_opp_* API PM / devfreq: imx-bus: convert to use devm_pm_opp_* API PM / devfreq: exynos: convert to use devm_pm_opp_* API PM / devfreq: convert to devm_pm_opp_register_notifier and remove unused API
drivers/devfreq/devfreq.c | 66 +------ drivers/devfreq/exynos-bus.c | 42 +---- drivers/devfreq/imx-bus.c | 14 +- drivers/devfreq/imx8m-ddrc.c | 15 +- drivers/devfreq/rk3399_dmc.c | 22 +-- drivers/devfreq/tegra30-devfreq.c | 21 +-- drivers/gpu/drm/lima/lima_devfreq.c | 45 +---- drivers/gpu/drm/lima/lima_devfreq.h | 2 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 31 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/dp/dp_ctrl.c | 29 +-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 23 ++- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 34 +--- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 - .../media/platform/qcom/venus/pm_helpers.c | 22 +-- drivers/memory/samsung/exynos5422-dmc.c | 13 +- drivers/memory/tegra/tegra20-emc.c | 29 +-- drivers/memory/tegra/tegra30-emc.c | 29 +-- drivers/mmc/host/sdhci-msm.c | 27 ++- drivers/opp/core.c | 173 ++++++++++++++++++ drivers/opp/of.c | 36 ++++ drivers/spi/spi-geni-qcom.c | 23 ++- drivers/spi/spi-qcom-qspi.c | 25 ++- drivers/tty/serial/qcom_geni_serial.c | 31 ++-- include/linux/devfreq.h | 23 --- include/linux/pm_opp.h | 38 ++++ include/linux/qcom-geni-se.h | 2 - 32 files changed, 402 insertions(+), 428 deletions(-)
Hello,
Could you please add helper for dev_pm_opp_attach_genpd() and make cpufreq drivers to use the helpers?
Thank you for reminding me. But we shouldn't use this for CPU devices as the CPU device doesn't get bound to a driver, it is rather a fake platform device which gets the cpufreq drivers probed.
Indeed, the CPU device exists seprately from cpufreq driver.
I'd also like to see a devm helper for dev_pm_opp_register_set_opp_helper(), which should become useful for Tegra drivers sometime soon.
For non-cpu devices?
For DRM driver I'd want to use devm for both set_opp_helper() and opp_attach_genpd().
https://patchwork.ozlabs.org/project/linux-tegra/patch/20201217180638.22748-...
On 01-01-21, 16:54, Yangtao Li wrote:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
You can't put so many names in the cclist, we are getting failure messages while replying to your patches now.
Put all people you want to inform in the bcc section and only the important ones in to/cc list.
On 01-01-21, 16:54, Yangtao Li wrote:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Please also mention next time to all the maintainers that you need their Acks for their patches and that all these patches should get merged via the OPP tree.
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Hello Yangtao,
Thank you for your effort, looking forward to v2!
20.01.2021 19:01, Dmitry Osipenko пишет:
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Hello Yangtao,
Thank you for your effort, looking forward to v2!
Yangtao, could you please let me know what is the status of this series? Will you be able to make a v2 anytime soon?
On 02-03-21, 16:40, Dmitry Osipenko wrote:
20.01.2021 19:01, Dmitry Osipenko пишет:
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Hello Yangtao,
Thank you for your effort, looking forward to v2!
Yangtao, could you please let me know what is the status of this series? Will you be able to make a v2 anytime soon?
Dmitry, if Yangtao doesn't reply back this week with a proposal, please go ahead and respin the patches yourself. Thanks.
03.03.2021 07:01, Viresh Kumar пишет:
On 02-03-21, 16:40, Dmitry Osipenko wrote:
20.01.2021 19:01, Dmitry Osipenko пишет:
01.01.2021 19:54, Yangtao Li пишет:
Hi,
This patchset add devm_pm_opp_set_clkname, devm_pm_opp_put_clkname, devm_pm_opp_set_regulators, devm_pm_opp_put_regulators, devm_pm_opp_set_supported_hw, devm_pm_opp_of_add_table and devm_pm_opp_register_notifier.
Hello Yangtao,
Thank you for your effort, looking forward to v2!
Yangtao, could you please let me know what is the status of this series? Will you be able to make a v2 anytime soon?
Dmitry, if Yangtao doesn't reply back this week with a proposal, please go ahead and respin the patches yourself. Thanks.
Alright!
dri-devel@lists.freedesktop.org
-
Dmitry Osipenko -
Frank Lee -
Krzysztof Kozlowski -
Mark Brown -
Steven Price -
Viresh Kumar -
Yangtao Li