Skip to contentSkip to conversation

drm/panfrost: Enable devfreq to work without regulator

bug report In review Dan Carpenter 3 participants 4 messages Aug 22, 2019 – Aug 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hello Steven Price,

This is a semi-automatic email about new static checker warnings.

The patch e21dd290881b: "drm/panfrost: Enable devfreq to work without regulator" from Aug 16, 2019, leads to the following Smatch complaint:

    drivers/gpu/drm/panfrost/panfrost_devfreq.c:56 panfrost_devfreq_target()
    error: we previously assumed 'pfdev->regulator' could be null (see line 42)

drivers/gpu/drm/panfrost/panfrost_devfreq.c

    41		 */
    42		if (old_clk_rate < target_rate && pfdev->regulator) {
                                                  ^^^^^^^^^^^^^^^^

We added some new checks.

    43			err = regulator_set_voltage(pfdev->regulator, target_volt,
    44						    target_volt);
    45			if (err) {
    46				dev_err(dev, "Cannot set voltage %lu uV\n",
    47					target_volt);
    48				return err;
    49			}
    50		}
    51	
    52		err = clk_set_rate(pfdev->clock, target_rate);
    53		if (err) {
    54			dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate,
    55				err);
    56			regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,
                                              ^^^^^^^^^^^^^^^^

But here it isn't checked.

    57					      pfdev->devfreq.cur_volt);
    58			return err;

regards,
dan carpenter
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#1 lore raw

PATCH 1/1 drm/panfrost: Add missing check for pfdev->regulator

When modifying panfrost_devfreq_target() to support a device without a regulator defined I missed the check on the error path. Let's add it.

Fixes e21dd290881b ("drm/panfrost: Enable devfreq to work without regulator")
---
 drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +4 -2
index 710d903f8e0d..a1f5fa6a742a 100644
@@ -53,8 +53,10 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq,
 	if (err) {
 		dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate,
 			err);
-		regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,
-				      pfdev->devfreq.cur_volt);
+		if (pfdev->regulator)
+			regulator_set_voltage(pfdev->regulator,
+					      pfdev->devfreq.cur_volt,
+					      pfdev->devfreq.cur_volt);
 		return err;
 	}
 
Signature · 1 line
2.20.1
maintainer
#2 lore raw

Re: [PATCH] drm/panfrost: Add missing check for pfdev->regulator

Quoted 10 lines · Steven Price

When modifying panfrost_devfreq_target() to support a device without a regulator defined I missed the check on the error path. Let's add it.

Fixes e21dd290881b ("drm/panfrost: Enable devfreq to work without regulator")
---
 drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Looks fine to me, but seems to be delayed getting to the list and patchwork. I'm guessing you're not subscribed to dri-devel because all your patches seem to get delayed.

Rob

Quoted 21 lines
drivers/gpu/drm/panfrost/panfrost_devfreq.c +4 -3
index 710d903f8e0d..a1f5fa6a742a 100644
@@ -53,8 +53,10 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq,
        if (err) {
                dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate,
                        err);
-               regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,
-                                     pfdev->devfreq.cur_volt);
+               if (pfdev->regulator)
+                       regulator_set_voltage(pfdev->regulator,
+                                             pfdev->devfreq.cur_volt,
+                                             pfdev->devfreq.cur_volt);
                return err;
        }
 
--

2.20.1

maintainer
#3 lore raw

Re: [PATCH] drm/panfrost: Add missing check for pfdev->regulator

Quoted 12 lines · Rob Herring
Quoted 10 lines · Steven Price

When modifying panfrost_devfreq_target() to support a device without a regulator defined I missed the check on the error path. Let's add it.

Fixes e21dd290881b ("drm/panfrost: Enable devfreq to work without regulator")
---
 drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Quoted 3 lines

Looks fine to me, but seems to be delayed getting to the list and patchwork. I'm guessing you're not subscribed to dri-devel because all your patches seem to get delayed.

Ah, yes I'm subscribed with a different email address - hopefully now also subscribed with my @arm.com one.

Steve
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel