From patchwork Thu Mar 29 18:59:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Suloev X-Patchwork-Id: 10316209 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 F179C60383 for ; Thu, 29 Mar 2018 20:41:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4DF02A4F9 for ; Thu, 29 Mar 2018 20:41:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D908F2A4FC; Thu, 29 Mar 2018 20:41:44 +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 548832A4F9 for ; Thu, 29 Mar 2018 20:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752889AbeC2UlU (ORCPT ); Thu, 29 Mar 2018 16:41:20 -0400 Received: from fallback13.m.smailru.net ([94.100.179.30]:38490 "EHLO fallback.mail.ru" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752623AbeC2UeY (ORCPT ); Thu, 29 Mar 2018 16:34:24 -0400 X-Greylist: delayed 5685 seconds by postgrey-1.27 at vger.kernel.org; Thu, 29 Mar 2018 16:34:23 EDT DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=orpaltech.com; s=mailru; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=QjltLzvf9EF5CDPztnxzcjXWXuV8C81SS0r7JTmsfk8=; b=joGCZvhH/npAyAX6B52Dw5LVUDmspv8DuOPGP8vJ3c4WlWMWvo61+MHhFMUfYqfqxyWfmqN25M91ijDRwlKqMHo0QJ1Qfryk2SnfQ1tT/HgR/umxGC+Y5Eb8RSTT3wSK/tHKligXwkMsVUR7UY8PNf3i2rTNY9u2Xfe72CdJT8Q=; Received: from [10.161.25.37] (port=34956 helo=smtp60.i.mail.ru) by fallback13.m.smailru.net with esmtp (envelope-from ) id 1f1cls-00015l-7u; Thu, 29 Mar 2018 21:59:36 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=orpaltech.com; s=mailru; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=QjltLzvf9EF5CDPztnxzcjXWXuV8C81SS0r7JTmsfk8=; b=joGCZvhH/npAyAX6B52Dw5LVUDmspv8DuOPGP8vJ3c4WlWMWvo61+MHhFMUfYqfqxyWfmqN25M91ijDRwlKqMHo0QJ1Qfryk2SnfQ1tT/HgR/umxGC+Y5Eb8RSTT3wSK/tHKligXwkMsVUR7UY8PNf3i2rTNY9u2Xfe72CdJT8Q=; Received: by smtp60.i.mail.ru with esmtpa (envelope-from ) id 1f1cld-0005P6-OY; Thu, 29 Mar 2018 21:59:22 +0300 From: Sergey Suloev To: Mark Brown , Maxime Ripard , Chen-Yu Tsai Cc: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sergey Suloev Subject: [PATCH 4/6] spi: sun4i: use completion provided by SPI core driver Date: Thu, 29 Mar 2018 21:59:05 +0300 Message-Id: <20180329185907.27281-5-ssuloev@orpaltech.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180329185907.27281-1-ssuloev@orpaltech.com> References: <20180329185907.27281-1-ssuloev@orpaltech.com> X-7FA49CB5: 0D63561A33F958A5BCFC2B28FCD39CD6A67B693F76D0AEE7FAA6AC1F98F6358A725E5C173C3A84C3ADE50F0DA4A4E48CBF269F2BE9530C73157381330E1A1978C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-Mailru-Sender: C5364AD02485212F3ACDC11E67D84917A0EC09878A2918AC3D100BC6526AF6D5069BFC61DABEEB110841D3AAAB1726C63DDE9B364B0DF289264D2CD8C2503E8C22A194DADEED8EEDCA01A23BA9CD1BE7ED14614B50AE0675 X-Mras: OK X-7FA49CB5: 0D63561A33F958A557E1F21B1BEB3E48D32B66E9EA47512900E3179B64D66D5E462275124DF8B9C9A939490BDF5DFC32E5BFE6E7EFDEDCD789D4C264860C145E X-Mailru-Sender: A5480F10D64C9005631A4012884FA16352B0F6778DC341104E928854CB013B9F0ED2FDEC15CED1695FC78D3D9DFD682EC77752E0C033A69E3DF03E4AFE169B847187F6D0DA2124709F6F601AB1435FA63CDA0F3B3F5B9367 X-Mras: OK 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 As long as the completion already provided by the SPI core then there is no need to waste extra-memory on this. Also a waiting function was added to avoid code duplication. Signed-off-by: Sergey Suloev --- drivers/spi/spi-sun4i.c | 62 ++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c index 2d716f1..4f24e12 100644 --- a/drivers/spi/spi-sun4i.c +++ b/drivers/spi/spi-sun4i.c @@ -92,8 +92,6 @@ struct sun4i_spi { struct clk *hclk; struct clk *mclk; - struct completion done; - const u8 *tx_buf; u8 *rx_buf; int len; @@ -213,13 +211,36 @@ static size_t sun4i_spi_max_transfer_size(struct spi_device *spi) return SUN4I_FIFO_DEPTH; } +static int sun4i_spi_wait_for_transfer(struct spi_device *spi, + struct spi_transfer *tfr) +{ + struct spi_master *master = spi->master; + unsigned int start, end, tx_time; + unsigned int timeout; + + /* calc required timeout from given speed & len values */ + tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U); + start = jiffies; + timeout = wait_for_completion_timeout(&master->xfer_completion, + msecs_to_jiffies(tx_time)); + end = jiffies; + if (!timeout) { + dev_warn(&master->dev, + "%s: timeout transferring %u bytes@%iHz for %i(%i)ms", + dev_name(&spi->dev), tfr->len, tfr->speed_hz, + jiffies_to_msecs(end - start), tx_time); + return -ETIMEDOUT; + } + + return 0; +} + static int sun4i_spi_transfer_one(struct spi_master *master, struct spi_device *spi, struct spi_transfer *tfr) { struct sun4i_spi *sspi = spi_master_get_devdata(master); - unsigned int mclk_rate, div, timeout; - unsigned int start, end, tx_time; + unsigned int mclk_rate, div; unsigned int tx_len = 0; int ret = 0; u32 reg; @@ -228,7 +249,6 @@ static int sun4i_spi_transfer_one(struct spi_master *master, if (tfr->len > SUN4I_FIFO_DEPTH) return -EMSGSIZE; - reinit_completion(&sspi->done); sspi->tx_buf = tfr->tx_buf; sspi->rx_buf = tfr->rx_buf; sspi->len = tfr->len; @@ -328,22 +348,8 @@ static int sun4i_spi_transfer_one(struct spi_master *master, reg = sun4i_spi_read(sspi, SUN4I_CTL_REG); sun4i_spi_write(sspi, SUN4I_CTL_REG, reg | SUN4I_CTL_XCH); - tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U); - start = jiffies; - timeout = wait_for_completion_timeout(&sspi->done, - msecs_to_jiffies(tx_time)); - end = jiffies; - if (!timeout) { - dev_warn(&master->dev, - "%s: timeout transferring %u bytes@%iHz for %i(%i)ms", - dev_name(&spi->dev), tfr->len, tfr->speed_hz, - jiffies_to_msecs(end - start), tx_time); - ret = -ETIMEDOUT; - goto out; - } - + ret = sun4i_spi_wait_for_transfer(spi, tfr); -out: sun4i_spi_write(sspi, SUN4I_INT_CTL_REG, 0); return ret; @@ -351,14 +357,18 @@ out: static irqreturn_t sun4i_spi_handler(int irq, void *dev_id) { - struct sun4i_spi *sspi = dev_id; - u32 status = sun4i_spi_read(sspi, SUN4I_INT_STA_REG); + struct spi_master *master = dev_id; + struct sun4i_spi *sspi = spi_master_get_devdata(master); + u32 status; + + status = sun4i_spi_read(sspi, SUN4I_INT_STA_REG); /* Transfer complete */ if (status & SUN4I_INT_CTL_TC) { - sun4i_spi_write(sspi, SUN4I_INT_STA_REG, SUN4I_INT_CTL_TC); + sun4i_spi_write(sspi, SUN4I_INT_STA_REG, + SUN4I_INT_CTL_TC); sun4i_spi_drain_fifo(sspi, SUN4I_FIFO_DEPTH); - complete(&sspi->done); + spi_finalize_current_transfer(master); return IRQ_HANDLED; } @@ -447,7 +457,7 @@ static int sun4i_spi_probe(struct platform_device *pdev) } ret = devm_request_irq(&pdev->dev, irq, sun4i_spi_handler, - 0, dev_name(&pdev->dev), sspi); + 0, dev_name(&pdev->dev), master); if (ret) { dev_err(&pdev->dev, "Cannot request IRQ\n"); goto err_free_master; @@ -467,8 +477,6 @@ static int sun4i_spi_probe(struct platform_device *pdev) goto err_free_master; } - init_completion(&sspi->done); - /* * This wake-up/shutdown pattern is to be able to have the * device woken up, even if runtime_pm is disabled