On Thu, Feb 20, 2020 at 7:11 AM Lukas Wunner <lukas@xxxxxxxxx> wrote: > On Wed, Feb 19, 2020 at 04:47:50PM +0100, Linus Walleij wrote: > > > + if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && > > > + ctlr->cs_gpiods[spi->chip_select]) > > > + tmp |= SPI_CS_HIGH; > > > > Should this be tmp ^= SPI_CS_HIGH? > > > > If the device tree node for cs-gpios is actually active high, which > > happens, then you probably want the opposite of what was > > requested, right? > > I don't quite follow. Using an XOR here would seem to be inconsistent > with what you added to of_spi_parse_dt(): In that function, you > *always* set SPI_CS_HIGH if gpio_descs are used. So if the polarity > is specified in the cs-gpios property, anything else is considered > irrelevant and ignored. It's not just cs-gpios though: if you look in drivers/gpio/gpiolib-of.c in the function of_gpio_flags_quirks() you see that the bool property spi-cs-high in the consumer node will take precedence over the cs-gpios property and that will also be handled transparently by gpiolib. (commit 6953c57ab1721 with fixes on top). But I guess that is what you mean. Yes as far as I can see this solves the problem of double-specifying (both in device tree and from userspace) that we want CS high, so after some thinking: Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx> > TBH the way commit f3186dd87669 abuses SPI_CS_HIGH seems clumsy to me. Clumsy programmer, that's me, yeah sometimes :/ > Would it not have been possible to just amend spi_set_cs() like this: > > - if (spi->mode & SPI_CS_HIGH) > + if (spi->mode & SPI_CS_HIGH || (ctlr->use_gpio_descriptors && > + ctlr->cs_gpiods && > + ctlr->cs_gpiods[spi->chip_select])) > enable = !enable; > > This would have avoided the regression fixed by my patch. There is way too much double inversion going on for sure (some of it dating back before any attempts to use gpiolib for polarity handling and I just feel partially responsible) but I just haven't figured out how to properly fix the problem. Maybe it was just stupid of me to try to move polarity inversion semantics over to gpiolib before fixing that though. Patches like the above are also welcome! Yours, Linus Walleij