From patchwork Fri Jun 16 08:58:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9790915 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 436316038F for ; Fri, 16 Jun 2017 09:01:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37CFE284F6 for ; Fri, 16 Jun 2017 09:01:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C9EA28517; Fri, 16 Jun 2017 09:01:39 +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=unavailable 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 D06D3284F6 for ; Fri, 16 Jun 2017 09:01:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753077AbdFPJB1 (ORCPT ); Fri, 16 Jun 2017 05:01:27 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45950 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753362AbdFPI7u (ORCPT ); Fri, 16 Jun 2017 04:59:50 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0911D60B69; Fri, 16 Jun 2017 08:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603590; bh=jGcyRsGwmI8elmdALInOyphoFLuMJjIpu2fcn7gEKUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CPjjYaLopIuIMm1jmZ62HSiTTQk1+Sa0ThC+FL3zxgK1SIAoq84DQLuFQi1FI7YTm LjQYP38FBpJZtAGojgXUNX9h+IG+o0XfIOuiceowcVg8BCOY5ihA7dztz35hyJUkit K138PLK2O+Etl1iYL7yJziVyFQyjK19l6aQwoUhY= 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 E6B4E60B69; Fri, 16 Jun 2017 08:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497603589; bh=jGcyRsGwmI8elmdALInOyphoFLuMJjIpu2fcn7gEKUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JoXzwaUL5W6tXZMi5MedVx+1g/W7iRwHUFHuXdcgLvatJROI04/PelUAKt17lb2x7 Z5P9kKanEI9zTqzv6tFjx8yy95RwP2XJhvOxf7aRoRrblTDRwOX6mxvmYSrbgRlrf6 bXb4yzMqUnD82iKk8+1MG2ebyMxtIv9RMXwbDWDA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E6B4E60B69 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 , Matthew McClintock Subject: [PATCH 10/15] spi: qup: call io_config in mode specific function Date: Fri, 16 Jun 2017 14:28:53 +0530 Message-Id: <1497603538-12750-11-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 DMA transactions should only only need to call io_config only once, but block mode might call it several times to setup several transactions so it can handle reads/writes larger than the max size per transaction, so we move the call to the do_ functions. This is just refactoring, there should be no functional change Signed-off-by: Matthew McClintock Signed-off-by: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 47ee146..ac85969 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -158,6 +158,8 @@ struct spi_qup { struct dma_slave_config tx_conf; }; +static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer); + static inline bool spi_qup_is_flag_set(struct spi_qup *controller, u32 flag) { u32 opflag = readl_relaxed(controller->base + QUP_OPERATIONAL); @@ -416,12 +418,17 @@ 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_device *spi, struct spi_transfer *xfer, unsigned long timeout) { + struct spi_master *master = spi->master; struct spi_qup *qup = spi_master_get_devdata(master); int ret; + ret = spi_qup_io_config(spi, xfer); + if (ret) + return ret; + /* before issuing the descriptors, set the QUP to run */ ret = spi_qup_set_state(qup, QUP_STATE_RUN); if (ret) { @@ -457,12 +464,17 @@ 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_device *spi, struct spi_transfer *xfer, unsigned long timeout) { + struct spi_master *master = spi->master; struct spi_qup *qup = spi_master_get_devdata(master); int ret; + ret = spi_qup_io_config(spi, xfer); + if (ret) + return ret; + ret = spi_qup_set_state(qup, QUP_STATE_RUN); if (ret) { dev_warn(qup->dev, "%s(%d): cannot set RUN state\n"); @@ -741,18 +753,14 @@ static int spi_qup_transfer_one(struct spi_master *master, if (ret) return ret; - ret = spi_qup_io_config(spi, xfer); - if (ret) - return ret; - timeout = DIV_ROUND_UP(xfer->speed_hz, MSEC_PER_SEC); timeout = DIV_ROUND_UP(xfer->len * 8, timeout); timeout = 100 * msecs_to_jiffies(timeout); if (spi_qup_is_dma_xfer(controller->mode)) - ret = spi_qup_do_dma(master, xfer, timeout); + ret = spi_qup_do_dma(spi, xfer, timeout); else - ret = spi_qup_do_pio(master, xfer, timeout); + ret = spi_qup_do_pio(spi, xfer, timeout); if (ret) goto exit;