Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754355AbdFNFxg (ORCPT ); Wed, 14 Jun 2017 01:53:36 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42904 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754322AbdFNFxc (ORCPT ); Wed, 14 Jun 2017 01:53:32 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5FB58607C5 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/18] spi: qup: Place the QUP in run mode before DMA transactions Date: Wed, 14 Jun 2017 11:22:18 +0530 Message-Id: <1497419551-21834-6-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497419551-21834-1-git-send-email-varada@codeaurora.org> References: <1497419551-21834-1-git-send-email-varada@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1682 Lines: 53 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; -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation