From patchwork Fri Jun 16 08:58:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9790863 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 C29666038E for ; Fri, 16 Jun 2017 08:59:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6C2B280B0 for ; Fri, 16 Jun 2017 08:59:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB7E428646; Fri, 16 Jun 2017 08:59:32 +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 55BA6280B0 for ; Fri, 16 Jun 2017 08:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbdFPI7a (ORCPT ); Fri, 16 Jun 2017 04:59:30 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45406 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753246AbdFPI72 (ORCPT ); Fri, 16 Jun 2017 04:59:28 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3C9A060D50; Fri, 16 Jun 2017 08:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603567; bh=bxZZlMJurN3EJO6mf2h3ZiWfrQlVYjhEczjLE7btCQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIJPBfP9Wn7SIItBU1aFsscIuv/xq0o74WAN5xXQxkyIlZ01cVlw0vJy7l7DoMTix A5n0pnbKv6p7sdyaBKHaEZgYZyIE5cMCutiTZTAMNdTtFel0GSg0hZL+o0QCpNUoMZ Zxym+gMl0ZaxVTb5Bc5o4I+aSQZJ59w0zVoVjujA= 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 4961B60D50; Fri, 16 Jun 2017 08:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603566; bh=bxZZlMJurN3EJO6mf2h3ZiWfrQlVYjhEczjLE7btCQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jwq5tQcC4v+PCpneywwIA3p4K4CPv7edvLViDsdtm+1u8CF0n5RfcQcSJuf7SmPKN zcctNYT2Pugfdb4x5ZznZ/FzEhusWpTrUdkOLpgDymAv20Gte3bQENsgkWAMoiNJ6Z TOVIb3tvMdVGWnbdFeBxZirYjHxUS/CeNczJSFPg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4961B60D50 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 04/15] spi: qup: Add completion timeout for fifo/block mode Date: Fri, 16 Jun 2017 14:28:47 +0530 Message-Id: <1497603538-12750-5-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497603538-12750-1-git-send-email-varada@codeaurora.org> References: <1497603538-12750-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 Signed-off-by: Andy Gross Signed-off-by: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 272e48e..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; @@ -362,7 +363,8 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer) 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; @@ -381,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; } @@ -624,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; @@ -635,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)