From patchwork Mon Jul 24 07:47:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9858895 X-Patchwork-Delegate: agross@codeaurora.org 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 303D8600F5 for ; Mon, 24 Jul 2017 07:48:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 220FC2817F for ; Mon, 24 Jul 2017 07:48:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16E9828562; Mon, 24 Jul 2017 07:48:09 +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=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 B4EBD2817F for ; Mon, 24 Jul 2017 07:48:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751999AbdGXHsC (ORCPT ); Mon, 24 Jul 2017 03:48:02 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59050 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752357AbdGXHrx (ORCPT ); Mon, 24 Jul 2017 03:47:53 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 070D060A3B; Mon, 24 Jul 2017 07:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1500882472; bh=iw1OEQBcS01WtAz/NRrBroGa4sd9UQNUqE1GbUjVpJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUliBO8yNDDYg8vDOY7HdHo3m13wTL+tgSer9f76Ccx5FZbUOGIfB0Lud1/6uXK9j uHJiQqhp5btiMmjs3RBFztUnh18yXyvqtx3wr5YHDB0vfyaWvZw4JCsb5+Qa/1d7vj uYqfjtGa3lEgWZCo4MEVkQdOig5VH+ViREQucAEo= 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 DF7766084D; Mon, 24 Jul 2017 07:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1500882471; bh=iw1OEQBcS01WtAz/NRrBroGa4sd9UQNUqE1GbUjVpJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I1wtEEW6lqkea7nXDGRoxlFSOLZbTYW79Vk1cXH3xo0R8WYw2cwqu7QyNr69yu/rS QoZHIkVCpjuDx0cexCQuC5NRslLMVwcel7cqSbLrIU1LeAKiuCh/bNRGiecNpHljkp pfegMLWW6fZz5+lr8mPKzAj4FqnrEO6G9C8xoU6s= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DF7766084D 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 v5 03/14] spi: qup: Add completion timeout Date: Mon, 24 Jul 2017 13:17:14 +0530 Message-Id: <1500882445-29008-4-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500882445-29008-1-git-send-email-varada@codeaurora.org> References: <1500882445-29008-1-git-send-email-varada@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index abe799b..92922b6 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -331,7 +331,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) { dma_async_tx_callback rx_done = NULL, tx_done = NULL; int ret; @@ -357,10 +358,17 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer) dma_async_issue_pending(master->dma_tx); } + if (rx_done && !wait_for_completion_timeout(&qup->done, timeout)) + return -ETIMEDOUT; + + if (tx_done && !wait_for_completion_timeout(&qup->done, 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; @@ -379,6 +387,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; } @@ -632,9 +643,9 @@ static int spi_qup_transfer_one(struct spi_master *master, spin_unlock_irqrestore(&controller->lock, flags); if (spi_qup_is_dma_xfer(controller->mode)) - ret = spi_qup_do_dma(master, xfer); + ret = spi_qup_do_dma(master, xfer, timeout); else - ret = spi_qup_do_pio(master, xfer); + ret = spi_qup_do_pio(master, xfer, timeout); if (ret) goto exit;