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: 11617471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E72014E3 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 5D93420738 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 Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- 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; } From patchwork Mon Jun 22 11:05:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11617477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 623B6913 for ; Mon, 22 Jun 2020 11:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 417E520716 for ; Mon, 22 Jun 2020 11:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823974; bh=QQnQ9zfEcXDa9cXwi6ru5QW1TtdjN++/N32/Obd/rQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wGd06l6pv8PvYSyAdW1XKoyUNXph3bC3ssad2+n3U1xDLIwcFBaHjYmf4SwbIt28x 1RyR9NYZZyjfAnKgvsqcihxQerximj0UE0/z1QoBxC65kIr+OLJdJeq3NMy7mZWrIx HsMsYltO/xxZe8u82kzi/qH/buu3Y8lnsqDvTXWM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727848AbgFVLGN (ORCPT ); Mon, 22 Jun 2020 07:06:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:60650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbgFVLFy (ORCPT ); Mon, 22 Jun 2020 07:05:54 -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 22E2420739; Mon, 22 Jun 2020 11:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823954; bh=QQnQ9zfEcXDa9cXwi6ru5QW1TtdjN++/N32/Obd/rQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=px5YzpC8V4KoR1DVwMVkwX+Xo4bq/spjwdC07AiMwXOT7pF5+8KcoqWYU2SLyvN51 a2rbN5S9ser4O5oYkpW3miDhcSQ5pFmxur/cWj3Puh/McZKRI3Ty5KYqFNs1L9HlHx 7hhAftiGvHoz+HqQw0o4P2Fr3GMgFyrFbjDkQcpQ= 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 2/4] spi: spi-fsl-dspi: Fix lockup if device is shutdown during SPI transfer Date: Mon, 22 Jun 2020 13:05:41 +0200 Message-Id: <20200622110543.5035-2-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622110543.5035-1-krzk@kernel.org> References: <20200622110543.5035-1-krzk@kernel.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org During shutdown, 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 shutdown reverse-matches the probe function, where SPI controller is registered at the end. Fixes: dc234825997e ("spi: spi-fsl-dspi: Adding shutdown hook") Cc: Reported-by: Vladimir Oltean Signed-off-by: Krzysztof Kozlowski Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- kexec() not tested, only system shutdown. Changes since v3: 1. New patch. --- drivers/spi/spi-fsl-dspi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index ec0fd0d366eb..ec7919d9c0d9 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1452,20 +1452,7 @@ static int dspi_remove(struct platform_device *pdev) static void dspi_shutdown(struct platform_device *pdev) { - struct spi_controller *ctlr = platform_get_drvdata(pdev); - struct fsl_dspi *dspi = spi_controller_get_devdata(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); + dspi_remove(pdev); } static struct platform_driver fsl_dspi_driver = { From patchwork Mon Jun 22 11:05:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11617475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C525913 for ; Mon, 22 Jun 2020 11:06:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 354A920675 for ; Mon, 22 Jun 2020 11:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823973; bh=k4YaPFvd0VFDKKSdlVgx9jqCePKS4wcuhXJBp7AdX4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fKLms/Ls8GdFlAVoNVJI/FtF/XotFPS2T4t1fbxgtmG4Gkp0OePlxCB6a6XSKVdc/ G8RG0gNPvSwhxU+VATP/jVqLO2Tb0Gue2vJTWjhJYnTogs1QF4SEneFsvIWm8r/VDe ImSshU3C69aJw2NPB+d5gAT584/rrn+0nTtwX9ls= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727892AbgFVLF7 (ORCPT ); Mon, 22 Jun 2020 07:05:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:60746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727810AbgFVLF5 (ORCPT ); Mon, 22 Jun 2020 07:05:57 -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 C500020706; Mon, 22 Jun 2020 11:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823957; bh=k4YaPFvd0VFDKKSdlVgx9jqCePKS4wcuhXJBp7AdX4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yfj2T0OuKBLR2ljg9VV2maVTf7QaH2Psa9Un9w3UTIu1lxHRQM6zdFx8K84XLf/uJ X7o0Rlel1o4l1ef8XN0QWJk8gm6JKFoIjce9MTsBKUkRTNrnOo+Spy4ZrTfGHX7FV5 gIuFsCWopRJMoUthxi4H3PZMUZqJzu61hjF9pr0I= 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 3/4] spi: spi-fsl-dspi: Fix external abort on interrupt in resume or exit paths Date: Mon, 22 Jun 2020 13:05:42 +0200 Message-Id: <20200622110543.5035-3-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622110543.5035-1-krzk@kernel.org> References: <20200622110543.5035-1-krzk@kernel.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org If shared interrupt comes late, during probe error path or device remove (could be triggered with CONFIG_DEBUG_SHIRQ), the interrupt handler dspi_interrupt() will access registers with the clock being disabled. This leads to external abort on non-linefetch on Toradex Colibri VF50 module (with Vybrid VF5xx): $ echo 4002d000.spi > /sys/devices/platform/soc/40000000.bus/4002d000.spi/driver/unbind Unhandled fault: external abort on non-linefetch (0x1008) at 0x8887f02c Internal error: : 1008 [#1] ARM Hardware name: Freescale Vybrid VF5xx/VF6xx (Device Tree) Backtrace: (regmap_mmio_read32le) (regmap_mmio_read) (_regmap_bus_reg_read) (_regmap_read) (regmap_read) (dspi_interrupt) (free_irq) (devm_irq_release) (release_nodes) (devres_release_all) (device_release_driver_internal) The resource-managed framework should not be used for shared interrupt handling, because the interrupt handler might be called after releasing other resources and disabling clocks. Similar bug could happen during suspend - the shared interrupt handler could be invoked after suspending the device. Each device sharing this interrupt line should disable the IRQ during suspend so handler will be invoked only in following cases: 1. None suspended, 2. All devices resumed. Fixes: 349ad66c0ab0 ("spi:Add Freescale DSPI driver for Vybrid VF610 platform") Cc: Signed-off-by: Krzysztof Kozlowski Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- Changes since v3: 1. Use simpler if (dspi->irq). Changes since v2: 1. Go back to v1 and use non-devm interface, 2. Fix also suspend/resume paths. Changes since v1: 1. Disable the IRQ instead of using non-devm interface. --- drivers/spi/spi-fsl-dspi.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index ec7919d9c0d9..e0b30e4b1b69 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1109,6 +1109,8 @@ static int dspi_suspend(struct device *dev) struct spi_controller *ctlr = dev_get_drvdata(dev); struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr); + if (dspi->irq) + disable_irq(dspi->irq); spi_controller_suspend(ctlr); clk_disable_unprepare(dspi->clk); @@ -1129,6 +1131,8 @@ static int dspi_resume(struct device *dev) if (ret) return ret; spi_controller_resume(ctlr); + if (dspi->irq) + enable_irq(dspi->irq); return 0; } @@ -1385,8 +1389,8 @@ static int dspi_probe(struct platform_device *pdev) goto poll_mode; } - ret = devm_request_irq(&pdev->dev, dspi->irq, dspi_interrupt, - IRQF_SHARED, pdev->name, dspi); + ret = request_threaded_irq(dspi->irq, dspi_interrupt, NULL, + IRQF_SHARED, pdev->name, dspi); if (ret < 0) { dev_err(&pdev->dev, "Unable to attach DSPI interrupt\n"); goto out_clk_put; @@ -1400,7 +1404,7 @@ static int dspi_probe(struct platform_device *pdev) ret = dspi_request_dma(dspi, res->start); if (ret < 0) { dev_err(&pdev->dev, "can't get dma channels\n"); - goto out_clk_put; + goto out_free_irq; } } @@ -1415,11 +1419,14 @@ static int dspi_probe(struct platform_device *pdev) ret = spi_register_controller(ctlr); if (ret != 0) { dev_err(&pdev->dev, "Problem registering DSPI ctlr\n"); - goto out_clk_put; + goto out_free_irq; } return ret; +out_free_irq: + if (dspi->irq) + free_irq(dspi->irq, dspi); out_clk_put: clk_disable_unprepare(dspi->clk); out_ctlr_put: @@ -1445,6 +1452,8 @@ static int dspi_remove(struct platform_device *pdev) regmap_update_bits(dspi->regmap, SPI_MCR, SPI_MCR_HALT, SPI_MCR_HALT); dspi_release_dma(dspi); + if (dspi->irq) + free_irq(dspi->irq, dspi); clk_disable_unprepare(dspi->clk); return 0; From patchwork Mon Jun 22 11:05:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11617473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23005913 for ; Mon, 22 Jun 2020 11:06:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B27420578 for ; Mon, 22 Jun 2020 11:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823971; bh=bfVZtAFU8NdMRRNSEVZYVNoiKI0ceYpx6CxgFvwkv3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tlw8p4IMBiTJMJgB9l5i7SxDTYpra6tRK6sIKHS8vDPS25g1uzlhK1XM+0UPN1Z5m QH0FinhfeO1Mig/X9jfQpPlPPWsiIS7hBELs6TSOcJo8ROd3Mrt27QcxFJy+QY0x81 1QKsSP4LdK3c5Y/dSLlq62sFf+OkNavou24hHWGk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727929AbgFVLGB (ORCPT ); Mon, 22 Jun 2020 07:06:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:60808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727048AbgFVLGA (ORCPT ); Mon, 22 Jun 2020 07:06:00 -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 7FA7C20767; Mon, 22 Jun 2020 11:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592823960; bh=bfVZtAFU8NdMRRNSEVZYVNoiKI0ceYpx6CxgFvwkv3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VuFBEsCGCO32GnoZZXedi+W8XKo3fucdlXJrWtbSMRxhxS2ZXsh6vO3KitDLZtt3q vrliGSvpcYHocYrBfFQb3lz++9bVCLJb9QaIhJ2dDC86wS8nMPy6BiW7Au39Gf8FPL nDH7Ko+oj8aUZ0h823e/HyllJ3ITvDrncJPz4vT8= 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 Subject: [PATCH v4 4/4] spi: spi-fsl-dspi: Initialize completion before possible interrupt Date: Mon, 22 Jun 2020 13:05:43 +0200 Message-Id: <20200622110543.5035-4-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622110543.5035-1-krzk@kernel.org> References: <20200622110543.5035-1-krzk@kernel.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The interrupt handler calls completion and is IRQ requested before the completion is initialized. Logically it should be the other way. Signed-off-by: Krzysztof Kozlowski --- Changes since v2: 1. None Changes since v1: 1. Rework the commit msg. --- drivers/spi/spi-fsl-dspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index e0b30e4b1b69..91c6affe139c 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1389,6 +1389,8 @@ static int dspi_probe(struct platform_device *pdev) goto poll_mode; } + init_completion(&dspi->xfer_done); + ret = request_threaded_irq(dspi->irq, dspi_interrupt, NULL, IRQF_SHARED, pdev->name, dspi); if (ret < 0) { @@ -1396,8 +1398,6 @@ static int dspi_probe(struct platform_device *pdev) goto out_clk_put; } - init_completion(&dspi->xfer_done); - poll_mode: if (dspi->devtype_data->trans_mode == DSPI_DMA_MODE) {