From patchwork Wed Jun 14 05:52: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: 9785457 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 22622602D9 for ; Wed, 14 Jun 2017 05:56:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 290712853F for ; Wed, 14 Jun 2017 05:56:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DDB82858D; Wed, 14 Jun 2017 05:56:56 +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 9F0B72853F for ; Wed, 14 Jun 2017 05:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400AbdFNFxr (ORCPT ); Wed, 14 Jun 2017 01:53:47 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:44204 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389AbdFNFxo (ORCPT ); Wed, 14 Jun 2017 01:53:44 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 64F8560953; Wed, 14 Jun 2017 05:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497419623; bh=Hqy3NSllUIapPCZO7SdwTp4dvN2FxEwhDPwuBXRl5rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bj3p+NUTZRSrk2W10L7SB7ohDyIA/p4Wmx0g9WJneghlCCkuo5oc6RgxTCyB0pnHz oCbaLBk0Ste+yeSKcfFg8nLZlx3WllBF3zZ/xBy1kZylpt7MBlnvGJUUfImYNl4S+8 kuaVg9PaubgORrcR6Ly6jqPh3aQM3Zy23LIv+4Aw= Received: from absahu-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 25B89608CF; Wed, 14 Jun 2017 05:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497419618; bh=Hqy3NSllUIapPCZO7SdwTp4dvN2FxEwhDPwuBXRl5rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=INiGheTaoXpijH/crpMFt5EZDUmxvfyWfAQvLXXDOFaFLJDJNQsnfcKz1ZDbxKJbK 1efQAg0f9TgFtOdFJC4GofQrdvJXjIKU6+SsRTyBbw7CsOhrfCcnoRzrogDKvrJaNg mBg2MizBuoqS26bJKIdUa4IQPAjtpw9SfE/1ZROE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 25B89608CF 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 08/18] spi: qup: Handle v1 dma completion differently Date: Wed, 14 Jun 2017 11:22:21 +0530 Message-Id: <1497419551-21834-9-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-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Do not assign i/o completion callbacks while running on v1 of QUP. Signed-off-by: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 7c22ee4..0f6a4c7 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -334,6 +334,7 @@ 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); + dma_async_tx_callback done = qup->qup_v1 ? NULL : spi_qup_dma_done; int ret; /* before issuing the descriptors, set the QUP to run */ @@ -346,7 +347,7 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, if (xfer->rx_buf) { ret = spi_qup_prep_sg(master, xfer, DMA_DEV_TO_MEM, - spi_qup_dma_done, &qup->rxc); + done, &qup->rxc); if (ret) return ret; @@ -355,7 +356,7 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, if (xfer->tx_buf) { ret = spi_qup_prep_sg(master, xfer, DMA_MEM_TO_DEV, - spi_qup_dma_done, &qup->txc); + done, &qup->txc); if (ret) return ret;