From patchwork Fri Jun 16 08:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9790933 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 4A9CD60326 for ; Fri, 16 Jun 2017 09:02:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F256284F6 for ; Fri, 16 Jun 2017 09:02:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3395028520; Fri, 16 Jun 2017 09:02:30 +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 B6338284F6 for ; Fri, 16 Jun 2017 09:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187AbdFPI7e (ORCPT ); Fri, 16 Jun 2017 04:59:34 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45474 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbdFPI7b (ORCPT ); Fri, 16 Jun 2017 04:59:31 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id CE62760D5D; Fri, 16 Jun 2017 08:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603570; bh=uJfI+vLI5Le/VnIPLy1byjBACnS3Mb4PSvzM0uVrBgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nTxBCQrfiqlVynJ7pJNhj/7BNuzp6MkvpM0hDIPd49zz/dNbJko/gr2THCTnbGrqV eTlOXBXzcnC+HeTDuePfsgs3pCIrj/eS30i9lTasjig/mnTsv6gbIHY9/TIA3DC/ao 7E3s7zHz3pCGemUiPLPl7YO3c7T0Sf2RKctQ8aYo= 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 052DF60B69; Fri, 16 Jun 2017 08:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603570; bh=uJfI+vLI5Le/VnIPLy1byjBACnS3Mb4PSvzM0uVrBgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nTxBCQrfiqlVynJ7pJNhj/7BNuzp6MkvpM0hDIPd49zz/dNbJko/gr2THCTnbGrqV eTlOXBXzcnC+HeTDuePfsgs3pCIrj/eS30i9lTasjig/mnTsv6gbIHY9/TIA3DC/ao 7E3s7zHz3pCGemUiPLPl7YO3c7T0Sf2RKctQ8aYo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 052DF60B69 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 05/15] spi: qup: Place the QUP in run mode before DMA transactions Date: Fri, 16 Jun 2017 14:28:48 +0530 Message-Id: <1497603538-12750-6-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: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index d3ccf53..363bd43 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -336,6 +336,14 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, struct spi_qup *qup = spi_master_get_devdata(master); int ret; + /* before issuing the descriptors, set the QUP to run */ + ret = spi_qup_set_state(qup, QUP_STATE_RUN); + if (ret) { + dev_warn(qup->dev, "%s(%d): cannot set RUN state\n", + __func__, __LINE__); + return ret; + } + if (xfer->rx_buf) { ret = spi_qup_prep_sg(master, xfer, DMA_DEV_TO_MEM, spi_qup_dma_done, &qup->rxc); @@ -371,18 +379,24 @@ static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer, ret = spi_qup_set_state(qup, QUP_STATE_RUN); if (ret) { - dev_warn(qup->dev, "cannot set RUN state\n"); + dev_warn(qup->dev, "%s(%d): cannot set RUN state\n"); return ret; } ret = spi_qup_set_state(qup, QUP_STATE_PAUSE); if (ret) { - dev_warn(qup->dev, "cannot set PAUSE state\n"); + dev_warn(qup->dev, "%s(%d): cannot set PAUSE state\n"); return ret; } spi_qup_fifo_write(qup, xfer); + ret = spi_qup_set_state(qup, QUP_STATE_RUN); + if (ret) { + dev_warn(qup->dev, "%s(%d): cannot set RUN state\n"); + return ret; + } + if (!wait_for_completion_timeout(&qup->done, timeout)) return -ETIMEDOUT;