From patchwork Mon Jun 22 11:05:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 214383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F023C433DF for ; Mon, 22 Jun 2020 11:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56B5320675 for ; Mon, 22 Jun 2020 11:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823956; bh=hhV13ohOHbP68epAhZTfZpOMEse5XOCpdTxhwKMk8nU=; h=From:To:Cc:Subject:Date:List-ID:From; b=wp18biJxa6GHNf5CwRGuG/4ryefSLZliO/IT7dK1JLB61BNbiCvOiKWys4VJGIf78 LlUq8/jQvu/V5m6i1vdx3p6z+GcKOVLuGjBPvZ4cmB3cfVY3N1I8v2ME78Ul5IGmpI 8j1FXl5aSeqXV9UnshJuY4jTxzU/RSjMAIZ4nxWc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727001AbgFVLFw (ORCPT ); Mon, 22 Jun 2020 07:05:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:60614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727022AbgFVLFw (ORCPT ); Mon, 22 Jun 2020 07:05:52 -0400 Received: from kozik-lap.mshome.net (unknown [194.230.155.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C045820738; Mon, 22 Jun 2020 11:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823951; bh=hhV13ohOHbP68epAhZTfZpOMEse5XOCpdTxhwKMk8nU=; h=From:To:Cc:Subject:Date:From; b=qBAy+YwdUrlFfbPpD1Jo/MceAHC9AJNyEKwyZ/dIP/b7k7Yq12+5dI6/KCAfbyQbB WcoBrHazRY0CcVZTT5itt2ILWdbfXNcwINo0OcTnV3HrBIVzYeBn0ke27uynDqGDey DrKHYLyK/3F0ZMp5BIiFYHrFyU1G3/e15S8v79IU= From: Krzysztof Kozlowski To: Mark Brown , Peng Ma , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vladimir Oltean , Wolfram Sang , Pengutronix Kernel Team , Krzysztof Kozlowski , stable@vger.kernel.org Subject: [PATCH v4 1/4] spi: spi-fsl-dspi: Fix lockup if device is removed during SPI transfer Date: Mon, 22 Jun 2020 13:05:40 +0200 Message-Id: <20200622110543.5035-1-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org During device removal, the driver should unregister the SPI controller and stop the hardware. Otherwise the dspi_transfer_one_message() could wait on completion infinitely. Additionally, calling spi_unregister_controller() first in device removal reverse-matches the probe function, where SPI controller is registered at the end. Fixes: 05209f457069 ("spi: fsl-dspi: add missing clk_disable_unprepare() in dspi_remove()") Cc: Reported-by: Vladimir Oltean Signed-off-by: Krzysztof Kozlowski --- Changes since v3: 1. New patch. --- drivers/spi/spi-fsl-dspi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 58190c94561f..ec0fd0d366eb 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1434,9 +1434,18 @@ static int dspi_remove(struct platform_device *pdev) struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr); /* Disconnect from the SPI framework */ + spi_unregister_controller(dspi->ctlr); + + /* Disable RX and TX */ + regmap_update_bits(dspi->regmap, SPI_MCR, + SPI_MCR_DIS_TXF | SPI_MCR_DIS_RXF, + SPI_MCR_DIS_TXF | SPI_MCR_DIS_RXF); + + /* Stop Running */ + regmap_update_bits(dspi->regmap, SPI_MCR, SPI_MCR_HALT, SPI_MCR_HALT); + dspi_release_dma(dspi); clk_disable_unprepare(dspi->clk); - spi_unregister_controller(dspi->ctlr); return 0; }