| Message ID | 0f22cc1791d8b88c50a9790c2dc19455b34ec7b0.1611742564.git.viresh.kumar@linaro.org |
|---|---|
| State | Rejected |
| Headers | show |
| Series | memory: tegra: Remove calls to dev_pm_opp_set_clkname() | expand |
27.01.2021 13:16, Viresh Kumar пишет: > There is no point calling dev_pm_opp_set_clkname() with the "name" > parameter set to NULL, this is already done by the OPP core at setup > time and should work as it is. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > V2: Update tegra124 as well. > > Krzysztof, please take this through your tree, it doesn't have any > dependency in the OPP tree. > --- > drivers/memory/tegra/tegra124-emc.c | 13 ++----------- > drivers/memory/tegra/tegra20-emc.c | 13 ++----------- > drivers/memory/tegra/tegra30-emc.c | 13 ++----------- > 3 files changed, 6 insertions(+), 33 deletions(-) Ideally drivers should be able to ensure that OPP table received the clk, IMO. But this is also almost fine with me since realistically clk_get() shouldn't fail if it already succeeded a moment ago. Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Tested-by: Dmitry Osipenko <digetx@gmail.com> Could we please fix the _allocate_opp_table() to not ignore clk_get() errors like -ENOMEM and etc?
On 27-01-21, 22:27, Dmitry Osipenko wrote: > 27.01.2021 13:16, Viresh Kumar пишет: > > There is no point calling dev_pm_opp_set_clkname() with the "name" > > parameter set to NULL, this is already done by the OPP core at setup > > time and should work as it is. > > > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > > > --- > > V2: Update tegra124 as well. > > > > Krzysztof, please take this through your tree, it doesn't have any > > dependency in the OPP tree. > > --- > > drivers/memory/tegra/tegra124-emc.c | 13 ++----------- > > drivers/memory/tegra/tegra20-emc.c | 13 ++----------- > > drivers/memory/tegra/tegra30-emc.c | 13 ++----------- > > 3 files changed, 6 insertions(+), 33 deletions(-) > > Ideally drivers should be able to ensure that OPP table received the > clk, IMO. I don't really agree with that, this stuff is internal to the OPP core. And it should all work unless there is a bug, whose effects we will see anyway. > But this is also almost fine with me since realistically > clk_get() shouldn't fail if it already succeeded a moment ago. > > Reviewed-by: Dmitry Osipenko <digetx@gmail.com> > Tested-by: Dmitry Osipenko <digetx@gmail.com> Thanks. Krzysztof, please apply the patch to your tree. Thanks. > Could we please fix the _allocate_opp_table() to not ignore clk_get() > errors like -ENOMEM and etc? Maybe we should fail if the error is anything other than -ENODEV ?
On Wed, Jan 27, 2021 at 03:46:22PM +0530, Viresh Kumar wrote: > There is no point calling dev_pm_opp_set_clkname() with the "name" > parameter set to NULL, this is already done by the OPP core at setup > time and should work as it is. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > V2: Update tegra124 as well. > > Krzysztof, please take this through your tree, it doesn't have any > dependency in the OPP tree. > --- > drivers/memory/tegra/tegra124-emc.c | 13 ++----------- > drivers/memory/tegra/tegra20-emc.c | 13 ++----------- > drivers/memory/tegra/tegra30-emc.c | 13 ++----------- > 3 files changed, 6 insertions(+), 33 deletions(-) Thanks, applied. Best regards, Krzysztof
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c index 9706550bdd5d..bee8d9f79b04 100644 --- a/drivers/memory/tegra/tegra124-emc.c +++ b/drivers/memory/tegra/tegra124-emc.c @@ -1399,21 +1399,14 @@ 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_speedo_id); - struct opp_table *clk_opp_table, *hw_opp_table; + struct opp_table *hw_opp_table; int err; - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); - err = PTR_ERR_OR_ZERO(clk_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); 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); @@ -1442,8 +1435,6 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc) 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; } diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index 686aaf477d8a..d653a6be8d7f 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -911,21 +911,14 @@ 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 *hw_opp_table; int err; - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); - err = PTR_ERR_OR_ZERO(clk_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); 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); @@ -954,8 +947,6 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc) 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; } diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index 44ac155936aa..6985da0ffb35 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -1483,21 +1483,14 @@ 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_speedo_id); - struct opp_table *clk_opp_table, *hw_opp_table; + struct opp_table *hw_opp_table; int err; - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); - err = PTR_ERR_OR_ZERO(clk_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); 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); @@ -1526,8 +1519,6 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc) 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; }
There is no point calling dev_pm_opp_set_clkname() with the "name" parameter set to NULL, this is already done by the OPP core at setup time and should work as it is. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- V2: Update tegra124 as well. Krzysztof, please take this through your tree, it doesn't have any dependency in the OPP tree. --- drivers/memory/tegra/tegra124-emc.c | 13 ++----------- drivers/memory/tegra/tegra20-emc.c | 13 ++----------- drivers/memory/tegra/tegra30-emc.c | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-)