From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E869AC433F5 for ; Tue, 1 Mar 2022 20:21:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238185AbiCAUWJ (ORCPT ); Tue, 1 Mar 2022 15:22:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234638AbiCAUWB (ORCPT ); Tue, 1 Mar 2022 15:22:01 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 933F18F9B0; Tue, 1 Mar 2022 12:19:14 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 894D2B81D3E; Tue, 1 Mar 2022 20:18:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E384C340F1; Tue, 1 Mar 2022 20:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646165934; bh=SR4RH4k8tOzLxCwm6G9PkuTC3aqNtihuYpxsO+LqONo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kR3LR/+vAIK0pzb9hP5h7M3WFfDqTi1kP5GJh/0CvYL/xY0+hKfyAz/Q8dW9Joesm 0Yd3D/jegwkSnNIuRwO16dOnemRmeCSgK2ix9G3qXwe5tLyz9o9DDsJqg/V39jP/5H DIdYLdCpkCwH2clIHbHG/dZO2ixFO4pC485MSOsIX0mhJkX2RgfWlX2Vbclz/eENpW NZAUf3z04+JZxVRxP0Idknii2tx3TU4/b5m/32IGkawiXh8K+DiHGggXT+c/IN0Lh6 0rlIiWBMnovxZSO4jmsk7oET26szJcK7KP0xNzflryT48QqtYPu/xhxKjkQtlMrNQt pRKyduUGQP7Bw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jon Lin , Mark Brown , Sasha Levin , heiko@sntech.de, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 04/14] spi: rockchip: terminate dma transmission when slave abort Date: Tue, 1 Mar 2022 15:18:16 -0500 Message-Id: <20220301201833.18841-4-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301201833.18841-1-sashal@kernel.org> References: <20220301201833.18841-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Jon Lin [ Upstream commit 80808768e41324d2e23de89972b5406c1020e6e4 ] After slave abort, all DMA should be stopped, or it will affect the next transmission and maybe abort again. Signed-off-by: Jon Lin Link: https://lore.kernel.org/r/20220216014028.8123-3-jon.lin@rock-chips.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-rockchip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index a594310754111..a9f97023d5a00 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -567,6 +567,12 @@ static int rockchip_spi_slave_abort(struct spi_controller *ctlr) { struct rockchip_spi *rs = spi_controller_get_devdata(ctlr); + if (atomic_read(&rs->state) & RXDMA) + dmaengine_terminate_sync(ctlr->dma_rx); + if (atomic_read(&rs->state) & TXDMA) + dmaengine_terminate_sync(ctlr->dma_tx); + atomic_set(&rs->state, 0); + spi_enable_chip(rs, false); rs->slave_abort = true; complete(&ctlr->xfer_completion); -- 2.34.1