| Message ID | 20210509113354.660190-14-jic23@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | IIO: Runtime PM related cleanups. | expand |
Em Sun, 9 May 2021 12:33:39 +0100 Jonathan Cameron <jic23@kernel.org> escreveu: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Found using coccicheck script under review at: > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ > > pm_runtime_resume_and_get() returns <= 0 only so simplify related checks > to bring this more inline with nearby calls. > > This is a prequel to taking a closer look at the runtime pm in IIO drivers > in general. Hmm... I guess there are some weird things happening there at inv_mpu_core_probe(). The code there does: ... pm_runtime_put(dev); // Already mentioned above result = devm_add_action_or_reset(dev, inv_mpu_pm_disable, dev); if (result) return result; and inv_mpu_pm_disable, in turn, calls: pm_runtime_put_sync_suspend(dev); I failed to see where the corresponding get for both pm_runtime_put() and pm_runtime_put_sync_suspend(), as the remaining RPM get/put logic seemed balanced. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 18 ++++++------------ > drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 6 ++---- > 2 files changed, 8 insertions(+), 16 deletions(-) > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > index 6244a07048df..06b9c84f6bfb 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > @@ -570,11 +570,9 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev, > freq_hz = INV_MPU6050_DIVIDER_TO_FIFO_RATE(st->chip_config.divider); > period_us = 1000000 / freq_hz; > > - result = pm_runtime_get_sync(pdev); > - if (result < 0) { > - pm_runtime_put_noidle(pdev); > + result = pm_runtime_resume_and_get(pdev); > + if (result) > return result; > - } > > switch (chan->type) { > case IIO_ANGL_VEL: > @@ -812,11 +810,9 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev, > return result; > > mutex_lock(&st->lock); > - result = pm_runtime_get_sync(pdev); > - if (result < 0) { > - pm_runtime_put_noidle(pdev); > + result = pm_runtime_resume_and_get(pdev); > + if (result) > goto error_write_raw_unlock; > - } > > switch (mask) { > case IIO_CHAN_INFO_SCALE: > @@ -930,11 +926,9 @@ inv_mpu6050_fifo_rate_store(struct device *dev, struct device_attribute *attr, > result = 0; > goto fifo_rate_fail_unlock; > } > - result = pm_runtime_get_sync(pdev); > - if (result < 0) { > - pm_runtime_put_noidle(pdev); > + result = pm_runtime_resume_and_get(pdev); > + if (result) > goto fifo_rate_fail_unlock; > - } > > result = regmap_write(st->map, st->reg->sample_rate_div, d); > if (result) > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > index e21ba778595a..2d0e8cdd4848 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > @@ -173,11 +173,9 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable) > > if (enable) { > scan = inv_scan_query(indio_dev); > - result = pm_runtime_get_sync(pdev); > - if (result < 0) { > - pm_runtime_put_noidle(pdev); > + result = pm_runtime_resume_and_get(pdev); > + if (result) > return result; > - } > /* > * In case autosuspend didn't trigger, turn off first not > * required sensors. Thanks, Mauro
On Wed, 12 May 2021 16:11:02 +0200 Mauro Carvalho Chehab <mchehab@kernel.org> wrote: > Em Sun, 9 May 2021 12:33:39 +0100 > Jonathan Cameron <jic23@kernel.org> escreveu: > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > Found using coccicheck script under review at: > > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ > > > > pm_runtime_resume_and_get() returns <= 0 only so simplify related checks > > to bring this more inline with nearby calls. > > > > This is a prequel to taking a closer look at the runtime pm in IIO drivers > > in general. > > Hmm... I guess there are some weird things happening there at > inv_mpu_core_probe(). The code there does: > > ... > pm_runtime_put(dev); // Already mentioned above That one is ok I think as it matches the pm_runtime_get_noresume() a couple of lines further up. That will increment the counter, but not carry out a resume (which make sense as the device is already powered up). The pm_runtime_put() will cause the device to suspend which is fine and somewhat logical. > result = devm_add_action_or_reset(dev, inv_mpu_pm_disable, dev); > if (result) > return result; > > and inv_mpu_pm_disable, in turn, calls: > > pm_runtime_put_sync_suspend(dev); Good spot on that one. I'll drop it in v2. > > I failed to see where the corresponding get for both > pm_runtime_put() and pm_runtime_put_sync_suspend(), as the > remaining RPM get/put logic seemed balanced. > > > > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > --- > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 18 ++++++------------ > > drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 6 ++---- > > 2 files changed, 8 insertions(+), 16 deletions(-) > > > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > index 6244a07048df..06b9c84f6bfb 100644 > > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > @@ -570,11 +570,9 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev, > > freq_hz = INV_MPU6050_DIVIDER_TO_FIFO_RATE(st->chip_config.divider); > > period_us = 1000000 / freq_hz; > > > > - result = pm_runtime_get_sync(pdev); > > - if (result < 0) { > > - pm_runtime_put_noidle(pdev); > > + result = pm_runtime_resume_and_get(pdev); > > + if (result) > > return result; > > - } > > > > switch (chan->type) { > > case IIO_ANGL_VEL: > > @@ -812,11 +810,9 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev, > > return result; > > > > mutex_lock(&st->lock); > > - result = pm_runtime_get_sync(pdev); > > - if (result < 0) { > > - pm_runtime_put_noidle(pdev); > > + result = pm_runtime_resume_and_get(pdev); > > + if (result) > > goto error_write_raw_unlock; > > - } > > > > switch (mask) { > > case IIO_CHAN_INFO_SCALE: > > @@ -930,11 +926,9 @@ inv_mpu6050_fifo_rate_store(struct device *dev, struct device_attribute *attr, > > result = 0; > > goto fifo_rate_fail_unlock; > > } > > - result = pm_runtime_get_sync(pdev); > > - if (result < 0) { > > - pm_runtime_put_noidle(pdev); > > + result = pm_runtime_resume_and_get(pdev); > > + if (result) > > goto fifo_rate_fail_unlock; > > - } > > > > result = regmap_write(st->map, st->reg->sample_rate_div, d); > > if (result) > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > > index e21ba778595a..2d0e8cdd4848 100644 > > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c > > @@ -173,11 +173,9 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable) > > > > if (enable) { > > scan = inv_scan_query(indio_dev); > > - result = pm_runtime_get_sync(pdev); > > - if (result < 0) { > > - pm_runtime_put_noidle(pdev); > > + result = pm_runtime_resume_and_get(pdev); > > + if (result) > > return result; > > - } > > /* > > * In case autosuspend didn't trigger, turn off first not > > * required sensors. > > > > Thanks, > Mauro
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 6244a07048df..06b9c84f6bfb 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -570,11 +570,9 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev, freq_hz = INV_MPU6050_DIVIDER_TO_FIFO_RATE(st->chip_config.divider); period_us = 1000000 / freq_hz; - result = pm_runtime_get_sync(pdev); - if (result < 0) { - pm_runtime_put_noidle(pdev); + result = pm_runtime_resume_and_get(pdev); + if (result) return result; - } switch (chan->type) { case IIO_ANGL_VEL: @@ -812,11 +810,9 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev, return result; mutex_lock(&st->lock); - result = pm_runtime_get_sync(pdev); - if (result < 0) { - pm_runtime_put_noidle(pdev); + result = pm_runtime_resume_and_get(pdev); + if (result) goto error_write_raw_unlock; - } switch (mask) { case IIO_CHAN_INFO_SCALE: @@ -930,11 +926,9 @@ inv_mpu6050_fifo_rate_store(struct device *dev, struct device_attribute *attr, result = 0; goto fifo_rate_fail_unlock; } - result = pm_runtime_get_sync(pdev); - if (result < 0) { - pm_runtime_put_noidle(pdev); + result = pm_runtime_resume_and_get(pdev); + if (result) goto fifo_rate_fail_unlock; - } result = regmap_write(st->map, st->reg->sample_rate_div, d); if (result) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c index e21ba778595a..2d0e8cdd4848 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c @@ -173,11 +173,9 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable) if (enable) { scan = inv_scan_query(indio_dev); - result = pm_runtime_get_sync(pdev); - if (result < 0) { - pm_runtime_put_noidle(pdev); + result = pm_runtime_resume_and_get(pdev); + if (result) return result; - } /* * In case autosuspend didn't trigger, turn off first not * required sensors.