spi: use specific last_cs instead of last_cs_enable
PATCH 1/1 spi: use specific last_cs instead of last_cs_enable
Commit d40f0b6f2e21 instroduced last_cs_enable to avoid setting chipselect if it's not necessary, but it also introduces a bug. The chipselect may not be set correctly on multi-device SPI busses. The reason is that we can't judge the chipselect by bool last_cs_enable, since chipselect may be modified after other devices were accessed.
So we should record the specific state of chipselect in case of confusion.
Signed-off-by Yun Zhou <[email protected]>
--- drivers/spi/spi.c | 4 ++-- include/linux/spi/spi.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/spi/spi.c +2 -2
@@ -936,13 +936,13 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)* Avoid calling into the driver (or doing delays) if the chip select * isn't actually changing from the last time this was called. */ -if (!force && (spi->controller->last_cs_enable == enable) && +if (!force && (spi->controller->last_cs == spi->chip_select) && (spi->controller->last_cs_mode_high == (spi->mode &SPI_CS_HIGH )))return ;trace_spi_set_cs (spi, activate); - spi->controller->last_cs_enable = enable; + spi->controller->last_cs = enable ? spi->chip_select :-1 ; spi->controller->last_cs_mode_high = spi->mode &SPI_CS_HIGH ; if ((spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) ||
include/linux/spi/spi.h +3 -2
@@ -373,7 +373,8 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch* @cur_msg_prepared: spi_prepare_message was called for the currently * in-flight message * @cur_msg_mapped: message has been mapped for DMA -* @last_cs_enable: was enable true on the last call to set_cs. +* @last_cs: the last chip_select that is recorded by set_cs, -1 on non chip +* selected * @last_cs_mode_high: was (mode & SPI_CS_HIGH) true on the last call to set_cs. * @xfer_completion: used by core transfer_one_message() * @busy: message pump is busy
@@ -611,7 +612,7 @@ struct spi_controller {bool auto_runtime_pm;bool cur_msg_prepared;bool cur_msg_mapped; -bool last_cs_enable; +char last_cs;bool last_cs_mode_high;bool fallback;struct completion xfer_completion;
Signature · 1 line
2.26.1