Skip to content

Commit 07d33c2

Browse files
dlechbroonie
authored andcommitted
spi: axi-spi-engine: add watchdog timer
If there is an issue with the AXI SPI Engine hardware a scheduled transfer might never be completed and spi_sync() will block forever. This due to the uninterruptible wait for completion waiting for the spi_finalize_current_message() that never comes. Add a watchdog timer that will abort a transfer 5 seconds after it has been started. This will potentially leave the hardware in a broken state but it allows software to recover and allow to better diagnose the underlying issue. Co-developed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: David Lechner <dlechner@baylibre.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Nuno Sa <nuno.sa@analog.com> Link: https://lore.kernel.org/r/20231204-axi-spi-engine-series-2-v1-9-063672323fce@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0db60d8 commit 07d33c2

1 file changed

Lines changed: 26 additions & 3 deletions

File tree

drivers/spi/spi-axi-spi-engine.c

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/module.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/spi/spi.h>
16+
#include <linux/timer.h>
1617

1718
#define SPI_ENGINE_VERSION_MAJOR(x) ((x >> 16) & 0xff)
1819
#define SPI_ENGINE_VERSION_MINOR(x) ((x >> 8) & 0xff)
@@ -114,6 +115,8 @@ struct spi_engine {
114115

115116
void __iomem *base;
116117
struct ida sync_ida;
118+
struct timer_list watchdog_timer;
119+
struct spi_controller *controller;
117120

118121
unsigned int int_enable;
119122
};
@@ -488,9 +491,11 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
488491
struct spi_engine_message_state *st = msg->state;
489492

490493
if (completed_id == st->sync_id) {
491-
msg->status = 0;
492-
msg->actual_length = msg->frame_length;
493-
spi_finalize_current_message(host);
494+
if (timer_delete_sync(&spi_engine->watchdog_timer)) {
495+
msg->status = 0;
496+
msg->actual_length = msg->frame_length;
497+
spi_finalize_current_message(host);
498+
}
494499
disable_int |= SPI_ENGINE_INT_SYNC;
495500
}
496501
}
@@ -573,6 +578,8 @@ static int spi_engine_transfer_one_message(struct spi_controller *host,
573578
unsigned int int_enable = 0;
574579
unsigned long flags;
575580

581+
mod_timer(&spi_engine->watchdog_timer, jiffies + msecs_to_jiffies(5000));
582+
576583
spin_lock_irqsave(&spi_engine->lock, flags);
577584

578585
if (spi_engine_write_cmd_fifo(spi_engine, msg))
@@ -596,6 +603,20 @@ static int spi_engine_transfer_one_message(struct spi_controller *host,
596603
return 0;
597604
}
598605

606+
static void spi_engine_timeout(struct timer_list *timer)
607+
{
608+
struct spi_engine *spi_engine = from_timer(spi_engine, timer, watchdog_timer);
609+
struct spi_controller *host = spi_engine->controller;
610+
611+
if (WARN_ON(!host->cur_msg))
612+
return;
613+
614+
dev_err(&host->dev,
615+
"Timeout occurred while waiting for transfer to complete. Hardware is probably broken.\n");
616+
host->cur_msg->status = -ETIMEDOUT;
617+
spi_finalize_current_message(host);
618+
}
619+
599620
static void spi_engine_release_hw(void *p)
600621
{
601622
struct spi_engine *spi_engine = p;
@@ -625,6 +646,8 @@ static int spi_engine_probe(struct platform_device *pdev)
625646

626647
spin_lock_init(&spi_engine->lock);
627648
ida_init(&spi_engine->sync_ida);
649+
timer_setup(&spi_engine->watchdog_timer, spi_engine_timeout, TIMER_IRQSAFE);
650+
spi_engine->controller = host;
628651

629652
spi_engine->clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk");
630653
if (IS_ERR(spi_engine->clk))

0 commit comments

Comments
 (0)