Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 6 Feb 2020 11:26:51 +0000
From:   Jonathan Cameron <jic23@kernel.org>
To:     Guido =?UTF-8?B?R8O8bnRoZXI=?= <agx@sigxcpu.org>
Cc:     Tomas Novotny <tomas@novotny.cz>, Hartmut Knaack <knaack.h@gmx.de>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
        "Angus Ainslie (Purism)" <angus@akkea.ca>,
        Marco Felsch <m.felsch@pengutronix.de>,
        Thomas Gleixner <tglx@linutronix.de>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 2/2] iio: vncl4000: Enable runtime pm for
 vcnl4200/4040
Message-ID: <20200206112651.2b85e3a8@archlinux>
In-Reply-To: <60fa4c2a739448778ae56fe3f2fdb10302055c59.1580721204.git.agx@sigxcpu.org>
References: <cover.1580721204.git.agx@sigxcpu.org>
        <60fa4c2a739448778ae56fe3f2fdb10302055c59.1580721204.git.agx@sigxcpu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon,  3 Feb 2020 10:17:02 +0100
Guido G=C3=BCnther <agx@sigxcpu.org> wrote:

> This is modelled after the vcnl4035 driver. For the vcnl40{0,1,2}0
> we don't do anything since they use on demand measurement.
>=20
> Signed-off-by: Guido G=C3=BCnther <agx@sigxcpu.org>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.

I won't push this out as a non rebasing branch for a week or so yet,
hence plenty of time for others to comment even though I have it queued
up!

Jonathan

> ---
>  drivers/iio/light/vcnl4000.c | 129 +++++++++++++++++++++++++++++++----
>  1 file changed, 117 insertions(+), 12 deletions(-)
>=20
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index 8f198383626b..3b71c7d538af 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -22,6 +22,7 @@
>  #include <linux/i2c.h>
>  #include <linux/err.h>
>  #include <linux/delay.h>
> +#include <linux/pm_runtime.h>
> =20
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
> @@ -57,6 +58,8 @@
>  #define VCNL4000_AL_OD		BIT(4) /* start on-demand ALS measurement */
>  #define VCNL4000_PS_OD		BIT(3) /* start on-demand proximity measurement =
*/
> =20
> +#define VCNL4000_SLEEP_DELAY_MS	2000 /* before we enter pm_runtime_suspe=
nd */
> +
>  enum vcnl4000_device_ids {
>  	VCNL4000,
>  	VCNL4010,
> @@ -87,6 +90,7 @@ struct vcnl4000_chip_spec {
>  	int (*init)(struct vcnl4000_data *data);
>  	int (*measure_light)(struct vcnl4000_data *data, int *val);
>  	int (*measure_proximity)(struct vcnl4000_data *data, int *val);
> +	int (*set_power_state)(struct vcnl4000_data *data, bool on);
>  };
> =20
>  static const struct i2c_device_id vcnl4000_id[] =3D {
> @@ -99,6 +103,12 @@ static const struct i2c_device_id vcnl4000_id[] =3D {
>  };
>  MODULE_DEVICE_TABLE(i2c, vcnl4000_id);
> =20
> +static int vcnl4000_set_power_state(struct vcnl4000_data *data, bool on)
> +{
> +	/* no suspend op */
> +	return 0;
> +}
> +
>  static int vcnl4000_init(struct vcnl4000_data *data)
>  {
>  	int ret, prod_id;
> @@ -127,9 +137,31 @@ static int vcnl4000_init(struct vcnl4000_data *data)
>  	data->al_scale =3D 250000;
>  	mutex_init(&data->vcnl4000_lock);
> =20
> -	return 0;
> +	return data->chip_spec->set_power_state(data, true);
>  };
> =20
> +static int vcnl4200_set_power_state(struct vcnl4000_data *data, bool on)
> +{
> +	u16 val =3D on ? 0 /* power on */ : 1 /* shut down */;
> +	int ret;
> +
> +	ret =3D i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, val);
> +	if (ret < 0)
> +		return ret;
> +
> +	return i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, val);
> +	if (ret < 0)
> +		return ret;
> +
> +	if (on) {
> +		/* Wait at least one integration cycle before fetching data */
> +		data->vcnl4200_al.last_measurement =3D ktime_get();
> +		data->vcnl4200_ps.last_measurement =3D ktime_get();
> +	}
> +
> +	return 0;
> +}
> +
>  static int vcnl4200_init(struct vcnl4000_data *data)
>  {
>  	int ret, id;
> @@ -155,14 +187,6 @@ static int vcnl4200_init(struct vcnl4000_data *data)
> =20
>  	data->rev =3D (ret >> 8) & 0xf;
> =20
> -	/* Set defaults and enable both channels */
> -	ret =3D i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, 0);
> -	if (ret < 0)
> -		return ret;
> -	ret =3D i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 0);
> -	if (ret < 0)
> -		return ret;
> -
>  	data->vcnl4200_al.reg =3D VCNL4200_AL_DATA;
>  	data->vcnl4200_ps.reg =3D VCNL4200_PS_DATA;
>  	switch (id) {
> @@ -180,11 +204,13 @@ static int vcnl4200_init(struct vcnl4000_data *data)
>  		data->al_scale =3D 120000;
>  		break;
>  	}
> -	data->vcnl4200_al.last_measurement =3D ktime_set(0, 0);
> -	data->vcnl4200_ps.last_measurement =3D ktime_set(0, 0);
>  	mutex_init(&data->vcnl4200_al.lock);
>  	mutex_init(&data->vcnl4200_ps.lock);
> =20
> +	ret =3D data->chip_spec->set_power_state(data, true);
> +	if (ret < 0)
> +		return ret;
> +
>  	return 0;
>  };
> =20
> @@ -291,24 +317,28 @@ static const struct vcnl4000_chip_spec vcnl4000_chi=
p_spec_cfg[] =3D {
>  		.init =3D vcnl4000_init,
>  		.measure_light =3D vcnl4000_measure_light,
>  		.measure_proximity =3D vcnl4000_measure_proximity,
> +		.set_power_state =3D vcnl4000_set_power_state,
>  	},
>  	[VCNL4010] =3D {
>  		.prod =3D "VCNL4010/4020",
>  		.init =3D vcnl4000_init,
>  		.measure_light =3D vcnl4000_measure_light,
>  		.measure_proximity =3D vcnl4000_measure_proximity,
> +		.set_power_state =3D vcnl4000_set_power_state,
>  	},
>  	[VCNL4040] =3D {
>  		.prod =3D "VCNL4040",
>  		.init =3D vcnl4200_init,
>  		.measure_light =3D vcnl4200_measure_light,
>  		.measure_proximity =3D vcnl4200_measure_proximity,
> +		.set_power_state =3D vcnl4200_set_power_state,
>  	},
>  	[VCNL4200] =3D {
>  		.prod =3D "VCNL4200",
>  		.init =3D vcnl4200_init,
>  		.measure_light =3D vcnl4200_measure_light,
>  		.measure_proximity =3D vcnl4200_measure_proximity,
> +		.set_power_state =3D vcnl4200_set_power_state,
>  	},
>  };
> =20
> @@ -323,6 +353,23 @@ static const struct iio_chan_spec vcnl4000_channels[=
] =3D {
>  	}
>  };
> =20
> +static int vcnl4000_set_pm_runtime_state(struct vcnl4000_data *data, boo=
l on)
> +{
> +	struct device *dev =3D &data->client->dev;
> +	int ret;
> +
> +	if (on) {
> +		ret =3D pm_runtime_get_sync(dev);
> +		if (ret < 0)
> +			pm_runtime_put_noidle(dev);
> +	} else {
> +		pm_runtime_mark_last_busy(dev);
> +		ret =3D pm_runtime_put_autosuspend(dev);
> +	}
> +
> +	return ret;
> +}
> +
>  static int vcnl4000_read_raw(struct iio_dev *indio_dev,
>  				struct iio_chan_spec const *chan,
>  				int *val, int *val2, long mask)
> @@ -332,6 +379,10 @@ static int vcnl4000_read_raw(struct iio_dev *indio_d=
ev,
> =20
>  	switch (mask) {
>  	case IIO_CHAN_INFO_RAW:
> +		ret =3D vcnl4000_set_pm_runtime_state(data, true);
> +		if  (ret < 0)
> +			return ret;
> +
>  		switch (chan->type) {
>  		case IIO_LIGHT:
>  			ret =3D data->chip_spec->measure_light(data, val);
> @@ -346,6 +397,7 @@ static int vcnl4000_read_raw(struct iio_dev *indio_de=
v,
>  		default:
>  			ret =3D -EINVAL;
>  		}
> +		vcnl4000_set_pm_runtime_state(data, false);
>  		return ret;
>  	case IIO_CHAN_INFO_SCALE:
>  		if (chan->type !=3D IIO_LIGHT)
> @@ -394,7 +446,22 @@ static int vcnl4000_probe(struct i2c_client *client,
>  	indio_dev->name =3D VCNL4000_DRV_NAME;
>  	indio_dev->modes =3D INDIO_DIRECT_MODE;
> =20
> -	return devm_iio_device_register(&client->dev, indio_dev);
> +	ret =3D pm_runtime_set_active(&client->dev);
> +	if (ret < 0)
> +		goto fail_poweroff;
> +
> +	ret =3D iio_device_register(indio_dev);
> +	if (ret < 0)
> +		goto fail_poweroff;
> +
> +	pm_runtime_enable(&client->dev);
> +	pm_runtime_set_autosuspend_delay(&client->dev, VCNL4000_SLEEP_DELAY_MS);
> +	pm_runtime_use_autosuspend(&client->dev);
> +
> +	return 0;
> +fail_poweroff:
> +	data->chip_spec->set_power_state(data, false);
> +	return ret;
>  }
> =20
>  static const struct of_device_id vcnl_4000_of_match[] =3D {
> @@ -422,13 +489,51 @@ static const struct of_device_id vcnl_4000_of_match=
[] =3D {
>  };
>  MODULE_DEVICE_TABLE(of, vcnl_4000_of_match);
> =20
> +static int vcnl4000_remove(struct i2c_client *client)
> +{
> +	struct iio_dev *indio_dev =3D i2c_get_clientdata(client);
> +	struct vcnl4000_data *data =3D iio_priv(indio_dev);
> +
> +	pm_runtime_dont_use_autosuspend(&client->dev);
> +	pm_runtime_disable(&client->dev);
> +	iio_device_unregister(indio_dev);
> +	pm_runtime_set_suspended(&client->dev);
> +
> +	return data->chip_spec->set_power_state(data, false);
> +}
> +
> +static int __maybe_unused vcnl4000_runtime_suspend(struct device *dev)
> +{
> +	struct iio_dev *indio_dev =3D i2c_get_clientdata(to_i2c_client(dev));
> +	struct vcnl4000_data *data =3D iio_priv(indio_dev);
> +
> +	return data->chip_spec->set_power_state(data, false);
> +}
> +
> +static int __maybe_unused vcnl4000_runtime_resume(struct device *dev)
> +{
> +	struct iio_dev *indio_dev =3D i2c_get_clientdata(to_i2c_client(dev));
> +	struct vcnl4000_data *data =3D iio_priv(indio_dev);
> +
> +	return data->chip_spec->set_power_state(data, true);
> +}
> +
> +static const struct dev_pm_ops vcnl4000_pm_ops =3D {
> +	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> +				pm_runtime_force_resume)
> +	SET_RUNTIME_PM_OPS(vcnl4000_runtime_suspend,
> +			   vcnl4000_runtime_resume, NULL)
> +};
> +
>  static struct i2c_driver vcnl4000_driver =3D {
>  	.driver =3D {
>  		.name   =3D VCNL4000_DRV_NAME,
> +		.pm	=3D &vcnl4000_pm_ops,
>  		.of_match_table =3D vcnl_4000_of_match,
>  	},
>  	.probe  =3D vcnl4000_probe,
>  	.id_table =3D vcnl4000_id,
> +	.remove	=3D vcnl4000_remove,
>  };
> =20
>  module_i2c_driver(vcnl4000_driver);