Re: [PATCH] OPP: Fix _set_required_opps when opp is NULL

From: Bryan O'Donoghue
Date: Wed Dec 27 2023 - 07:41:43 EST


On 26/12/2023 05:59, Viresh Kumar wrote:
On 23-12-23, 02:34, Bryan O'Donoghue wrote:
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index c022d548067d7..182e07ab6baf3 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1083,7 +1083,11 @@ static int _set_required_opps(struct device *dev, struct opp_table *opp_table,
while (index != target) {
if (devs[index]) {
- ret = dev_pm_opp_set_opp(devs[index], opp->required_opps[index]);
+ if (opp)
+ ret = dev_pm_opp_set_opp(devs[index], opp->required_opps[index]);
+ else
+ ret = dev_pm_domain_set_performance_state(devs[index], 0);
+
if (ret)
return ret;
}

Sorry about that, my mistake. Can you test below instead please ?

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index c022d548067d..c4d695e0e5fd 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1061,6 +1061,7 @@ static int _set_required_opps(struct device *dev, struct opp_table *opp_table,
struct dev_pm_opp *opp, bool up)
{
struct device **devs = opp_table->required_devs;
+ struct dev_pm_opp *required_opp;
int index, target, delta, ret;

if (!devs)
@@ -1083,7 +1084,9 @@ static int _set_required_opps(struct device *dev, struct opp_table *opp_table,

while (index != target) {
if (devs[index]) {
- ret = dev_pm_opp_set_opp(devs[index], opp->required_opps[index]);
+ required_opp = opp ? opp->required_opps[index] : NULL;
+
+ ret = dev_pm_opp_set_opp(devs[index], required_opp);
if (ret)
return ret;
}


Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>