From patchwork Mon Jun 2 13:38:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 4281901 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 138B59F326 for ; Mon, 2 Jun 2014 13:38:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6209E202A1 for ; Mon, 2 Jun 2014 13:38:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7321B203DC for ; Mon, 2 Jun 2014 13:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754826AbaFBNij (ORCPT ); Mon, 2 Jun 2014 09:38:39 -0400 Received: from wilson.telenet-ops.be ([195.130.132.42]:44430 "EHLO wilson.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754825AbaFBNid (ORCPT ); Mon, 2 Jun 2014 09:38:33 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [195.130.137.88]) by wilson.telenet-ops.be (Postfix) with ESMTP id E6346353ED for ; Mon, 2 Jun 2014 15:38:31 +0200 (CEST) Received: from ayla.of.borg ([84.193.72.141]) by michel.telenet-ops.be with bizsmtp id 9ReX1o01932ts5g06ReXfb; Mon, 02 Jun 2014 15:38:31 +0200 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1WrSRb-0007iz-JC; Mon, 02 Jun 2014 15:38:31 +0200 From: Geert Uytterhoeven To: Mark Brown Cc: Yoshihiro Shimoda , Magnus Damm , linux-spi@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 12/18] spi: rspi: Pass sg_tables instead of spi_tranfer to rspi_*_dma() Date: Mon, 2 Jun 2014 15:38:14 +0200 Message-Id: <1401716301-29612-13-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1401716301-29612-1-git-send-email-geert+renesas@glider.be> References: <1401716301-29612-1-git-send-email-geert+renesas@glider.be> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA routines only need access to the scatter-gather tables inside the spi_transfer structures, hence just pass those. Signed-off-by: Geert Uytterhoeven --- drivers/spi/spi-rspi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 3dea8adfdcf3..bfa5e7e5df5a 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -463,13 +463,13 @@ static void rspi_dma_complete(void *arg) wake_up_interruptible(&rspi->wait); } -static int rspi_send_dma(struct rspi_data *rspi, struct spi_transfer *t) +static int rspi_send_dma(struct rspi_data *rspi, struct sg_table *tx) { struct dma_async_tx_descriptor *desc; int ret; - desc = dmaengine_prep_slave_sg(rspi->master->dma_tx, t->tx_sg.sgl, - t->tx_sg.nents, DMA_TO_DEVICE, + desc = dmaengine_prep_slave_sg(rspi->master->dma_tx, tx->sgl, + tx->nents, DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc) return -EIO; @@ -530,21 +530,22 @@ static void qspi_receive_init(const struct rspi_data *rspi) rspi_write8(rspi, 0, QSPI_SPBFCR); } -static int rspi_send_receive_dma(struct rspi_data *rspi, struct spi_transfer *t) +static int rspi_send_receive_dma(struct rspi_data *rspi, struct sg_table *tx, + struct sg_table *rx) { struct dma_async_tx_descriptor *desc_tx, *desc_rx; int ret; /* prepare transmit transfer */ - desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx, t->tx_sg.sgl, - t->tx_sg.nents, DMA_TO_DEVICE, + desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx, tx->sgl, + tx->nents, DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) return -EIO; /* prepare receive transfer */ - desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx, t->rx_sg.sgl, - t->rx_sg.nents, DMA_FROM_DEVICE, + desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx, rx->sgl, + rx->nents, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_rx) return -EIO; @@ -616,9 +617,10 @@ static int rspi_transfer_one(struct spi_master *master, struct spi_device *spi, if (master->can_dma && __rspi_can_dma(rspi, xfer)) { if (xfer->rx_buf) - return rspi_send_receive_dma(rspi, xfer); + return rspi_send_receive_dma(rspi, &xfer->tx_sg, + &xfer->rx_sg); else - return rspi_send_dma(rspi, xfer); + return rspi_send_dma(rspi, &xfer->tx_sg); } ret = rspi_pio_transfer(rspi, xfer->tx_buf, xfer->rx_buf, xfer->len);