From patchwork Mon Nov 5 12:06:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10668105 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BADC1751 for ; Mon, 5 Nov 2018 12:23:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECDD029518 for ; Mon, 5 Nov 2018 12:23:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEEEB29541; Mon, 5 Nov 2018 12:23:22 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7D83B29518 for ; Mon, 5 Nov 2018 12:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=jlAFSPWVL5p5KX8m0r4MoU6WfRIUzIBcMXDlOuG8gdI=; b=AkI g53oUTrQ/6VqlzqVp5Du4dPfwdG+gfcGINcOQWpTgIZ7fIwMRYJJMsf9DBN+rqnMYh5OZPgw0LeIU hXcahRJ54nAAhbCJe2BXxd9DO7rYE7H8qrSED4MJv0h5nEPcdM5HjvIkIEeDZ+H7voMgADsp3kZCi 6qjm88hwibPqbEfgxO0d3qHTOAP0oR0PXEdlLehNctpr18OKvpWq1kHYEDOJmLBtfKBQk6agzzSHc MlDr5CV5JMY1ZwFeR8VUGnrTPfvfpgleq84It6XLfZq8hRHAZp/lUf/+O7pXOVxXqvOMKNRgV4LiT PVZCytusjku6kEyChrwqJpcDMAelsnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJduZ-0007wb-9R; Mon, 05 Nov 2018 12:23:19 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJdu4-00070u-Bt; Mon, 05 Nov 2018 12:22:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XCg8vXnz6G9b9SE9qBunByaJNBBcizqSA1C7j26Rg9o=; b=d00u04yMP/5W8L0G/nQmEFUN8Z XieDw1EKAMKrQQh/m5GKwwKYI25pSSKszLbRC2nuDmCt+2V0lzginV10JA2NQrzUMjdaRWdsX7ark 4HbUDExJjyz0EDkymjIoHyhisy4M3mwMsZT3S4iG4KOr7nXIGw9hCQY/FgzsIXdaCkPXmyAGXTlq7 D/fC8IKlFiRPE6m7vlmLPUR76qj5h+TDFGlPkH/3s7jcwCuBekg+RvYqFtzsNP5w2YVVTLMGNSoXO LoDka7cbxjKzLIaorFqCTsM0/V+d8BOy7mmkQf+5Gbkvtk6StP5KrejqzvZe94gNUpkOwyMJuY8R3 Ne/1DmqA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJdeZ-0008KY-7u; Mon, 05 Nov 2018 12:06:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=XCg8vXnz6G9b9SE9qBunByaJNBBcizqSA1C7j26Rg9o=; b=PxWEjA/0iVM8 pzrgLV5kUrvuGX0IXRd6vxv+i5X/0xNoTrClwV+HVNn0CvV1rSmsrjuOPAzisJf67YjZjhEgL61q1 ZYK0EkX2viupaF1RSq+WBqM0RuMLUeGhK6CZLSZWljbGyoXr6z08u0MctchpoL3Fu6m8hJGBJp0+J Tp450=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gJdeV-0008Ny-82; Mon, 05 Nov 2018 12:06:43 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id F26821124D99; Mon, 5 Nov 2018 12:06:42 +0000 (GMT) From: Mark Brown To: Emil Renner Berthing Subject: Applied "spi: rockchip: disable spi on error" to the spi tree In-Reply-To: <20181031105711.19575-6-esmil@mailme.dk> Message-Id: <20181105120642.F26821124D99@debutante.sirena.org.uk> Date: Mon, 5 Nov 2018 12:06:42 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181105_120647_456643_9DEB35A7 X-CRM114-Status: GOOD ( 20.74 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Addy Ke , Heiko Stuebner , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: rockchip: disable spi on error has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From ce386100d99976442093ff57b5b24a9562c6cc27 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Wed, 31 Oct 2018 11:57:02 +0100 Subject: [PATCH] spi: rockchip: disable spi on error Successful transfers leave the spi disabled, so if we just make sure to disable the spi on error there should be no need to disable the spi from master->unprepare_message. This also flushes the tx and rx fifos, so no need to do that manually. Signed-off-by: Emil Renner Berthing Tested-by: Heiko Stuebner Signed-off-by: Mark Brown --- drivers/spi/spi-rockchip.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 1c813797f963..5729e6071729 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -210,12 +210,6 @@ static inline void spi_set_clk(struct rockchip_spi *rs, u16 div) writel_relaxed(div, rs->regs + ROCKCHIP_SPI_BAUDR); } -static inline void flush_fifo(struct rockchip_spi *rs) -{ - while (readl_relaxed(rs->regs + ROCKCHIP_SPI_RXFLR)) - readl_relaxed(rs->regs + ROCKCHIP_SPI_RXDR); -} - static inline void wait_for_idle(struct rockchip_spi *rs) { unsigned long timeout = jiffies + msecs_to_jiffies(5); @@ -304,29 +298,16 @@ static void rockchip_spi_handle_err(struct spi_master *master, { struct rockchip_spi *rs = spi_master_get_devdata(master); - /* - * For DMA mode, we need terminate DMA channel and flush - * fifo for the next transfer if DMA thansfer timeout. - * handle_err() was called by core if transfer failed. - * Maybe it is reasonable for error handling here. + /* stop running spi transfer + * this also flushes both rx and tx fifos */ + spi_enable_chip(rs, false); + if (atomic_read(&rs->state) & TXDMA) dmaengine_terminate_async(rs->dma_tx.ch); - if (atomic_read(&rs->state) & RXDMA) { + if (atomic_read(&rs->state) & RXDMA) dmaengine_terminate_async(rs->dma_rx.ch); - flush_fifo(rs); - } -} - -static int rockchip_spi_unprepare_message(struct spi_master *master, - struct spi_message *msg) -{ - struct rockchip_spi *rs = spi_master_get_devdata(master); - - spi_enable_chip(rs, false); - - return 0; } static void rockchip_spi_pio_writer(struct rockchip_spi *rs) @@ -705,7 +686,6 @@ static int rockchip_spi_probe(struct platform_device *pdev) master->set_cs = rockchip_spi_set_cs; master->prepare_message = rockchip_spi_prepare_message; - master->unprepare_message = rockchip_spi_unprepare_message; master->transfer_one = rockchip_spi_transfer_one; master->max_transfer_size = rockchip_spi_max_transfer_size; master->handle_err = rockchip_spi_handle_err;