| Message ID | 20220319193459.2628876-1-ztong0001@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] iio:imu:bmi160: disable regulator in error path | expand |
On Sun, Mar 20, 2022 at 8:44 AM Tong Zhang <ztong0001@gmail.com> wrote: > > Regulator should be disabled in error path as mentioned in _regulator_put(). > Also disable accel if gyro cannot be enabled. > > [ 16.233604] WARNING: CPU: 0 PID: 2177 at drivers/regulator/core.c:2257 _regulator_put > [ 16.240453] Call Trace: > [ 16.240572] <TASK> > [ 16.240676] regulator_put+0x26/0x40 > [ 16.240853] regulator_bulk_free+0x26/0x50 > [ 16.241050] release_nodes+0x3f/0x70 > [ 16.241225] devres_release_group+0x147/0x1c0 > [ 16.241441] ? bmi160_core_probe+0x175/0x3a0 [bmi160_core] Haven't I given you a tag?
On Mon, Mar 21, 2022 at 1:28 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Sun, Mar 20, 2022 at 8:44 AM Tong Zhang <ztong0001@gmail.com> wrote: > > > > Regulator should be disabled in error path as mentioned in _regulator_put(). > > Also disable accel if gyro cannot be enabled. > > > > [ 16.233604] WARNING: CPU: 0 PID: 2177 at drivers/regulator/core.c:2257 _regulator_put > > [ 16.240453] Call Trace: > > [ 16.240572] <TASK> > > [ 16.240676] regulator_put+0x26/0x40 > > [ 16.240853] regulator_bulk_free+0x26/0x50 > > [ 16.241050] release_nodes+0x3f/0x70 > > [ 16.241225] devres_release_group+0x147/0x1c0 > > [ 16.241441] ? bmi160_core_probe+0x175/0x3a0 [bmi160_core] > > Haven't I given you a tag? > > -- > With Best Regards, > Andy Shevchenko Hi Any, Thank you for reviewing the patch. I appreciate it. I thought I would need another tag since this patch is a v2. Sorry for this back and forth. Have a great one. Thanks, - Tong
On Mon, Mar 21, 2022 at 5:53 PM Tong Zhang <ztong0001@gmail.com> wrote: > On Mon, Mar 21, 2022 at 1:28 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > On Sun, Mar 20, 2022 at 8:44 AM Tong Zhang <ztong0001@gmail.com> wrote: ... > > Haven't I given you a tag? > Hi Any, Thank you for reviewing the patch. I appreciate it. > I thought I would need another tag since this patch is a v2. It depends on the nature of the changes you made. As far as I read the code the changes you made are in addition to what I have tagged and I see nothing that prevents you from keeping the tag. > Sorry for this back and forth. Have a great one. NP.
On Mon, 21 Mar 2022 18:22:10 +0200 Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Mon, Mar 21, 2022 at 5:53 PM Tong Zhang <ztong0001@gmail.com> wrote: > > On Mon, Mar 21, 2022 at 1:28 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > On Sun, Mar 20, 2022 at 8:44 AM Tong Zhang <ztong0001@gmail.com> wrote: > > ... > > > > Haven't I given you a tag? > > > Hi Any, Thank you for reviewing the patch. I appreciate it. > > I thought I would need another tag since this patch is a v2. > > It depends on the nature of the changes you made. As far as I read the > code the changes you made are in addition to what I have tagged and I > see nothing that prevents you from keeping the tag. > > > Sorry for this back and forth. Have a great one. > > NP. > Applied to the fixes-togreg branch of iio.git but I won't push it out until I've rebased that on rc1 once available. Thanks, Jonathan
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c index 824b5124a5f5..01336105792e 100644 --- a/drivers/iio/imu/bmi160/bmi160_core.c +++ b/drivers/iio/imu/bmi160/bmi160_core.c @@ -730,7 +730,7 @@ static int bmi160_chip_init(struct bmi160_data *data, bool use_spi) ret = regmap_write(data->regmap, BMI160_REG_CMD, BMI160_CMD_SOFTRESET); if (ret) - return ret; + goto disable_regulator; usleep_range(BMI160_SOFTRESET_USLEEP, BMI160_SOFTRESET_USLEEP + 1); @@ -741,29 +741,37 @@ static int bmi160_chip_init(struct bmi160_data *data, bool use_spi) if (use_spi) { ret = regmap_read(data->regmap, BMI160_REG_DUMMY, &val); if (ret) - return ret; + goto disable_regulator; } ret = regmap_read(data->regmap, BMI160_REG_CHIP_ID, &val); if (ret) { dev_err(dev, "Error reading chip id\n"); - return ret; + goto disable_regulator; } if (val != BMI160_CHIP_ID_VAL) { dev_err(dev, "Wrong chip id, got %x expected %x\n", val, BMI160_CHIP_ID_VAL); - return -ENODEV; + ret = -ENODEV; + goto disable_regulator; } ret = bmi160_set_mode(data, BMI160_ACCEL, true); if (ret) - return ret; + goto disable_regulator; ret = bmi160_set_mode(data, BMI160_GYRO, true); if (ret) - return ret; + goto disable_accel; return 0; + +disable_accel: + bmi160_set_mode(data, BMI160_ACCEL, false); + +disable_regulator: + regulator_bulk_disable(ARRAY_SIZE(data->supplies), data->supplies); + return ret; } static int bmi160_data_rdy_trigger_set_state(struct iio_trigger *trig,
Regulator should be disabled in error path as mentioned in _regulator_put(). Also disable accel if gyro cannot be enabled. [ 16.233604] WARNING: CPU: 0 PID: 2177 at drivers/regulator/core.c:2257 _regulator_put [ 16.240453] Call Trace: [ 16.240572] <TASK> [ 16.240676] regulator_put+0x26/0x40 [ 16.240853] regulator_bulk_free+0x26/0x50 [ 16.241050] release_nodes+0x3f/0x70 [ 16.241225] devres_release_group+0x147/0x1c0 [ 16.241441] ? bmi160_core_probe+0x175/0x3a0 [bmi160_core] Fixes: 5dea3fb066f0 ("iio: imu: bmi160: added regulator support") Signed-off-by: Tong Zhang <ztong0001@gmail.com> --- v2: also disable accel when gyro fail to enable drivers/iio/imu/bmi160/bmi160_core.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)