Re: [PATCH v2 4/7] HID: i2c-hid: elan: fix reset suspend current leakage

Johan Hovold
2024-05-20T11:44:10Z

Hi Doug,

and sorry about the late reply. Was travelling last week.

On Fri, May 10, 2024 at 04:36:08PM -0700, Doug Anderson wrote:
> On Tue, May 7, 2024 at 7:48 AM Johan Hovold <johan+linaro@kernel.org> wrote:
> >
> > @@ -40,17 +41,17 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> > container_of(ops, struct i2c_hid_of_elan, ops);
> > int ret;
> >
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
>
> Could probably use a comment above it saying that this is important
> when we have "no_reset_on_power_off" and doesn't do anything bad when
> we don't so we can just do it unconditionally.

Possibly, but I'd prefer not to add comments for things like this, which
should be apparent from just looking at the code. And explicitly
asserting reset before deasserting it is not unusual in any way.

> > +
> > if (ihid_elan->vcc33) {
> > ret = regulator_enable(ihid_elan->vcc33);
> > if (ret)
> > - return ret;
> > + goto err_deassert_reset;
> > }
> >
> > ret = regulator_enable(ihid_elan->vccio);
> > - if (ret) {
> > - regulator_disable(ihid_elan->vcc33);
> > - return ret;
> > - }
> > + if (ret)
> > + goto err_disable_vcc33;
> >
> > if (ihid_elan->chip_data->post_power_delay_ms)
> > msleep(ihid_elan->chip_data->post_power_delay_ms);
> > @@ -60,6 +61,15 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> > msleep(ihid_elan->chip_data->post_gpio_reset_on_delay_ms);
> >
> > return 0;
> > +
> > +err_disable_vcc33:
> > + if (ihid_elan->vcc33)
> > + regulator_disable(ihid_elan->vcc33);
> > +err_deassert_reset:
> > + if (ihid_elan->no_reset_on_power_off)
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0);
>
> Small nit about the error label: it sounds as if when you go here you
> _will_ deassert reset when in actuality you might or might not
> (depending on no_reset_on_power_off).

Yes, this is similar to how err_disable_vcc33 may or may not disable the
optional regulator.

> Personally I prefer to label
> error jumps based on things I've done instead of things that the error
> jump needs to do, so you could call them "err_enabled_vcc33" and
> "err_asserted_reset"...

Naming labels after what they do is less error prone and also explicitly
recommended by the coding style.

> I don't feel that strongly about it, though, so if you love the label
> you have then no need to change it.

So I'd prefer keeping things this way.

> > @@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > struct i2c_hid_of_elan *ihid_elan =
> > container_of(ops, struct i2c_hid_of_elan, ops);
> >
> > - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > + /*
> > + * Do not assert reset when the hardware allows for it to remain
> > + * deasserted regardless of the state of the (shared) power supply to
> > + * avoid wasting power when the supply is left on.
> > + */
> > + if (!ihid_elan->no_reset_on_power_off)
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > +
> > if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
> > msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
>
> Shouldn't the above two lines be inside the "if
> (!ihid_elan->no_reset_on_power_off)" test? If you're not setting the
> reset GPIO then you don't need to do the delay, right?

Yes, I guess you're right. The off-delay is weird and not normally used,
but apparently it is needed by some panel-follower use case. AFAICT it's
not even related to the reset line, just a hack to add a delay before
the panel is reset by some other driver (see f2f43bf15d7a ("HID:
i2c-hid: elan: Add ili9882t timing")).

I think that's why I just looked the other way and left this little
oddity here unchanged.

> > @@ -79,6 +96,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > static int i2c_hid_of_elan_probe(struct i2c_client *client)
> > {
> > struct i2c_hid_of_elan *ihid_elan;
> > + int ret;
> >
> > ihid_elan = devm_kzalloc(&client->dev, sizeof(*ihid_elan), GFP_KERNEL);
> > if (!ihid_elan)
> > @@ -93,21 +111,38 @@ static int i2c_hid_of_elan_probe(struct i2c_client *client)
> > if (IS_ERR(ihid_elan->reset_gpio))
> > return PTR_ERR(ihid_elan->reset_gpio);
> >
> > + ihid_elan->no_reset_on_power_off = of_property_read_bool(client->dev.of_node,
> > + "no-reset-on-power-off");
>
> Personally, I'd rather you query for the property before you request
> the GPIO and then request the GPIO in the "powered off" state just to
> keep everything in the most consistent state possible.

No, I don't know what state the reset line is in before the driver
probes. So either I leave it unchanged as I did in v1 or I assert it
here unconditionally as I do in v2 (e.g. to avoid deasserting reset
before the supply is stable).

Johan