spi: introduce master->handle_err() callback
Subsystems (2)
PATCH 1/2 spi: introduce master->handle_err() callback
This callback would be useful to handle an error that occurs in the generic implementation of transfer_one_message(). The good candidate for this is to drain FIFO and / or to terminate DMA transfers when timeout happened.
--- drivers/spi/spi.c | 3 +++ include/linux/spi/spi.h | 4 ++++ 2 files changed, 7 insertions(+)
drivers/spi/spi.c +3 -0
@@ -851,6 +851,9 @@ out:if (msg->status == -EINPROGRESS ) msg->status = ret; +if (msg->status) + master->handle_err (master, msg); +spi_finalize_current_message (master);return ret;
include/linux/spi/spi.h +4 -0
@@ -294,6 +294,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)* transfer_one_message are mutually exclusive; when both * are set, the generic subsystem does not call your * transfer_one callback. +* @handle_err: the subsystem calls the driver to handle and error that occurs +* in the generic implementation of transfer_one_message(). * @unprepare_message: undo any work done by prepare_message(). * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS * number. Any individual value may be -ENOENT for CS lines that
@@ -448,6 +450,8 @@ struct spi_master {void (*set_cs)(struct spi_device *spi,bool enable);int (*transfer_one)(struct spi_master *master,struct spi_device *spi,struct spi_transfer *transfer); +void (*handle_err)(struct spi_master *master, +struct spi_message *message);/* gpio chip select */ int *cs_gpios;
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425051256-30890-1-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/[email protected]
PATCH 2/2 spi/rockchip: do an error handling in proper time
There was handle_err() callback introduced that is dedicated for error handling. The patch moves error handling to this callback.
--- drivers/spi/spi-rockchip.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/spi/spi-rockchip.c +11 -4
@@ -302,8 +302,8 @@ static int rockchip_spi_prepare_message(struct spi_master *master,return 0 ; } -static int rockchip_spi_unprepare_message (struct spi_master *master, -struct spi_message *msg) +static void rockchip_spi_handle_err (struct spi_master *master, +struct spi_message *msg) {unsigned long flags;struct rockchip_spi *rs =spi_master_get_devdata (master);
@@ -313,8 +313,8 @@ static int rockchip_spi_unprepare_message(struct spi_master *master,/* * For DMA mode, we need terminate DMA channel and flush * fifo for the next transfer if DMA thansfer timeout. -* unprepare_message() was called by core if transfer complete -* or timeout. Maybe it is reasonable for error handling here. +* handle_err() was called by core if transfer failed. +* Maybe it is reasonable for error handling here. */ if (rs->use_dma) {if (rs->state &RXBUSY ) {
@@ -327,6 +327,12 @@ static int rockchip_spi_unprepare_message(struct spi_master *master, }spin_unlock_irqrestore (&rs->lock, flags); +} + +static int rockchip_spi_unprepare_message (struct spi_master *master, +struct spi_message *msg) +{ +struct rockchip_spi *rs =spi_master_get_devdata (master);spi_enable_chip (rs,0 );
@@ -688,6 +694,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) master->prepare_message = rockchip_spi_prepare_message; master->unprepare_message = rockchip_spi_unprepare_message; master->transfer_one = rockchip_spi_transfer_one; + master->handle_err = rockchip_spi_handle_err; rs->dma_tx.ch =dma_request_slave_channel (rs->dev,"tx" );if (!rs->dma_tx.ch)
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
AppliedQuoted 3 lines · Andy Shevchenko
This callback would be useful to handle an error that occurs in the generic implementation of
transfer_one_message(). The good candidate for this is to drain FIFO and / or to terminate DMA transfers when timeout happened.
Applied both, thanks.