From patchwork Fri Jul 1 12:32:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9209837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF1AE607D8 for ; Fri, 1 Jul 2016 12:33:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFE7B286AA for ; Fri, 1 Jul 2016 12:33:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4746286AC; Fri, 1 Jul 2016 12:33:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78617286AA for ; Fri, 1 Jul 2016 12:33:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752457AbcGAMdH (ORCPT ); Fri, 1 Jul 2016 08:33:07 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32915 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbcGAMdF (ORCPT ); Fri, 1 Jul 2016 08:33:05 -0400 Received: by mail-wm0-f68.google.com with SMTP id r201so4998213wme.0; Fri, 01 Jul 2016 05:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nIAZOKBI3t37j99tA/Rw0VBFukTebL42dU3YO4YGumE=; b=lfO+geCyPyNLpXFuc0qvjlTtolyns2PzfJvoLqsBI9prNBiObHiHciRTqnmDb4E1vp k3Z/PQr4HeVXCbqqNsIHJ7Pnq6FPw6MoOhmtporhq9C0rWBuY6HOt5YAYcDka5QTnsMY BV89dnHOfpeB1xFdBOWIu7GfP/A0Lc3aMfpEeZ3vbiDoYu+EBtRtoHPDFBIzYkRW03Qz iTEl2/czySTEHqUVfPy3WOhTWzD7dHIANKSaSimQW63u77fXoKbKG7+Rb9fdV3xqtun8 0iGFWkHzMS8Gt312RJrY/lSWYk0fzVl+9dZup50guGWEgc9iGDLNpdwsFmYBL9kM1w7L OGkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nIAZOKBI3t37j99tA/Rw0VBFukTebL42dU3YO4YGumE=; b=KIWyRVjrpn4+kmNSTJl6+SRtbzAM1nsmVUDrL4se4D7GeJS0sk4j2xPq2+oRwiRrjH h6U0xv0gZKLX1ICqrDewwlcUyzl33Nkt6MgRYL1JNKYMAHhrk5Vc8BX9blVc+UlTOr/w 3evrhfWqB4Ezps3sK+NKfu/j+FcdBz3c1EiCpv9PaIlHtUEU+NbgtVzhAUqn6uXlYY4f yuAz1x5wJn5HOPCE0w//dQLYcGMqgyOebCYMPuYASZlYtsz2/YLlx4WEACPiT91RrXQ5 HVe+1fsAKovzq39Im/6LZRucHwVjtJMtDijfPzfS/b0p7EJ5PZSeJlZ4L+bJtBxNJoAj y27w== X-Gm-Message-State: ALyK8tL4nXQIX6DgLrxcZqKrAHXueX/tKOVZjps4DP7pIQoRbHbPhtgfSwdjSxk1TkPG9A== X-Received: by 10.28.10.196 with SMTP id 187mr20813349wmk.48.1467376382480; Fri, 01 Jul 2016 05:33:02 -0700 (PDT) Received: from chgm-pc.bachmann.at ([185.67.228.2]) by smtp.gmail.com with ESMTPSA id f140sm3709180wmf.22.2016.07.01.05.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 05:33:00 -0700 (PDT) From: Christian Gmeiner To: linux-spi@vger.kernel.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, Christian Gmeiner Subject: [PATCH] spi: imx: wait_for_completion_timeout(..) for PIO transfers Date: Fri, 1 Jul 2016 14:32:58 +0200 Message-Id: <1467376378-21535-1-git-send-email-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20160621185100.GD28202@sirena.org.uk> References: <20160621185100.GD28202@sirena.org.uk> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In some rare cases I see the following 'task blocked' information. It looks like the PIO transfer has some problems and never succeeds. Make use of wait_for_completion_timeout(..) to detect this case and return -ETIMEDOUT. v2: remove backtrace from commit message Signed-off-by: Christian Gmeiner --- drivers/spi/spi-imx.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 50769078..d2b96b1 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1050,6 +1050,8 @@ static int spi_imx_pio_transfer(struct spi_device *spi, struct spi_transfer *transfer) { struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); + unsigned long transfer_timeout; + unsigned long timeout; spi_imx->tx_buf = transfer->tx_buf; spi_imx->rx_buf = transfer->rx_buf; @@ -1062,7 +1064,15 @@ static int spi_imx_pio_transfer(struct spi_device *spi, spi_imx->devtype_data->intctrl(spi_imx, MXC_INT_TE); - wait_for_completion(&spi_imx->xfer_done); + transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len); + + timeout = wait_for_completion_timeout(&spi_imx->xfer_done, + transfer_timeout); + if (!timeout) { + dev_err(&spi->dev, "I/O Error in PIO\n"); + spi_imx->devtype_data->reset(spi_imx); + return -ETIMEDOUT; + } return transfer->len; }