From d64e4d691f19180825035e480218596427e3f9d1 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Thu, 16 Sep 2021 11:36:26 +0200 Subject: mci-bcm2835: Don't block infinitely while waiting for a command completion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead abort with a timeout error. This prevents getting a hung barebox when a command doesn't complete. Signed-off-by: Uwe Kleine-König Link: https://lore.barebox.org/20210916093627.173566-1-u.kleine-koenig@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/mci/mci-bcm2835.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers') diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c index 0450f899c6..12f7cb6ea3 100644 --- a/drivers/mci/mci-bcm2835.c +++ b/drivers/mci/mci-bcm2835.c @@ -87,13 +87,17 @@ static u32 bcm2835_sdhci_read32(struct sdhci *sdhci, int reg) static u32 bcm2835_mci_wait_command_done(struct bcm2835_mci_host *host) { u32 interrupt = 0; + uint64_t start; + start = get_time_ns(); while (true) { interrupt = sdhci_read32(&host->sdhci, SDHCI_INT_STATUS); if (interrupt & SDHCI_INT_INDEX) return -EPERM; if (interrupt & SDHCI_INT_CMD_COMPLETE) break; + if (is_timeout(start, SECOND)) + return -ETIMEDOUT; } return 0; } -- cgit v1.2.3