Re: [PATCH v2] gpiolib: Preserve desc->flags when setting state

From: Linus Walleij
Date: Fri Jul 05 2019 - 17:56:06 EST


Hi Chris,

thanks for your patch!

On Thu, Jul 4, 2019 at 6:21 AM Chris Packham
<chris.packham@xxxxxxxxxxxxxxxxxxx> wrote:

> desc->flags may already have values set by of_gpiochip_add() so make
> sure that this isn't undone when setting the initial direction.
>
> Fixes: 3edfb7bd76bd1cba ("gpiolib: Show correct direction from the beginning")
> Signed-off-by: Chris Packham <chris.packham@xxxxxxxxxxxxxxxxxxx>
> ---
>
> Notes:
> Changes in v2:
> - add braces to avoid ambiguious else warning

This is almost the solution!

> - if (chip->get_direction && gpiochip_line_is_valid(chip, i))
> - desc->flags = !chip->get_direction(chip, i) ?
> - (1 << FLAG_IS_OUT) : 0;
> - else
> - desc->flags = !chip->direction_input ?
> - (1 << FLAG_IS_OUT) : 0;
> + if (chip->get_direction && gpiochip_line_is_valid(chip, i)) {
> + if (!chip->get_direction(chip, i))
> + set_bit(FLAG_IS_OUT, &desc->flags);

You need to clear_bit() in the reverse case. We just learned we can't
assume anything about the flags here, like just assign them.

> + } else {
> + if (!chip->direction_input)
> + set_bit(FLAG_IS_OUT, &desc->flags);

Same here.

Yours,
Linus Walleij