From patchwork Tue Jun 27 09:45:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9811227 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 5D51160351 for ; Tue, 27 Jun 2017 09:49:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CD802860C for ; Tue, 27 Jun 2017 09:49:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2191028614; Tue, 27 Jun 2017 09:49:46 +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_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 98E242860C for ; Tue, 27 Jun 2017 09:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752137AbdF0JtT (ORCPT ); Tue, 27 Jun 2017 05:49:19 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:51244 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752677AbdF0JqE (ORCPT ); Tue, 27 Jun 2017 05:46:04 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 17DD760877; Tue, 27 Jun 2017 09:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498556758; bh=YFbMqA/otSo64OzCRpEbjPqL9PE7zqHB8ZtW2Y7DEIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVvsGEj89+94ytMNOFqN5TNhFTv8agVr8kuNGJYuaSDMImFzqJBNJTC1X5wzMGL3E E7IB5OwuACmYqyH4x+BOoKgm29fOhbcO3eHFRAnhwMTfXWdArYbf5+4W8oh1J3fe7x k9AyoKP/VEPW+HbKMshLcNC44JFhbmJGvkuoY1Cg= Received: from varda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: varada@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 210A56074C; Tue, 27 Jun 2017 09:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498556757; bh=YFbMqA/otSo64OzCRpEbjPqL9PE7zqHB8ZtW2Y7DEIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P0meH1BCf4KHWqe3r8zLW7S7kiIcPNtCT+Zz9IqqlBd+kqY5MZdzDxUVnTsX9bl5v Nhx0RPituNEoITFvZD3mnd0Cuk1FEzet0tJqg/7x74FG/CRsywtIMmEU0/ppuhedRC DYTZXJKX3XSTvo8HrSMZb9VogO1f42sOJjdm4l28= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 210A56074C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=varada@codeaurora.org From: Varadarajan Narayanan To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, david.brown@linaro.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Cc: Varadarajan Narayanan Subject: [PATCH v4 04/14] spi: qup: Add completion timeout Date: Tue, 27 Jun 2017 15:15:21 +0530 Message-Id: <1498556731-13087-5-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498556731-13087-1-git-send-email-varada@codeaurora.org> References: <1498556731-13087-1-git-send-email-varada@codeaurora.org> 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 Add i/o completion timeout for DMA and PIO modes. Signed-off-by: Andy Gross Signed-off-by: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 59e799f..d3ccf53 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -330,7 +330,8 @@ static void spi_qup_dma_terminate(struct spi_master *master, dmaengine_terminate_all(master->dma_rx); } -static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer) +static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, + unsigned long timeout) { struct spi_qup *qup = spi_master_get_devdata(master); int ret; @@ -353,10 +354,17 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer) dma_async_issue_pending(master->dma_tx); } + if (xfer->rx_buf && !wait_for_completion_timeout(&qup->rxc, timeout)) + return -ETIMEDOUT; + + if (xfer->tx_buf && !wait_for_completion_timeout(&qup->txc, timeout)) + return -ETIMEDOUT; + return 0; } -static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer) +static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer, + unsigned long timeout) { struct spi_qup *qup = spi_master_get_devdata(master); int ret; @@ -375,6 +383,9 @@ static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer) spi_qup_fifo_write(qup, xfer); + if (!wait_for_completion_timeout(&qup->done, timeout)) + return -ETIMEDOUT; + return 0; } @@ -618,7 +629,6 @@ static int spi_qup_transfer_one(struct spi_master *master, timeout = DIV_ROUND_UP(xfer->len * 8, timeout); timeout = 100 * msecs_to_jiffies(timeout); - spin_lock_irqsave(&controller->lock, flags); controller->xfer = xfer; controller->error = 0; @@ -629,10 +639,10 @@ static int spi_qup_transfer_one(struct spi_master *master, if (spi_qup_is_dma_xfer(controller->mode)) { reinit_completion(&controller->rxc); reinit_completion(&controller->txc); - ret = spi_qup_do_dma(master, xfer); + ret = spi_qup_do_dma(master, xfer, timeout); } else { reinit_completion(&controller->done); - ret = spi_qup_do_pio(master, xfer); + ret = spi_qup_do_pio(master, xfer, timeout); } if (ret)