From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AD703939DD; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=T0n69OJ/BaBdwcnsmH1RsgYQ3LsEisF4vomfJrHmVEKgWiGht8pQmDjpQLJ4EhpregeVHITy8irUtfVp1acYvSmqeKUt0UQXtZ/0jA6ZN3WpEUhHoO5OJjROBHjbHGaXrz73ej9+eX/RWK+y5YVex1GUITKYoFQ38GXlnMJqbqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=3DbsYkN4pf5ND1z8L30fphcMVgrd1sOFsBKrJWKj7TY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aXbMa7GuAT2jsod0TWGLqTVvhvkacu8Ml5CI8CEVGZwp3UnuaA7t2ACfEISqDmv+giSzsSbdk8W80Gzr5VPvhQaaaoKy9viiGd5FAdl0H7XxUv+77XZ5/1rr7qsMRBj1ThqkVoygLfWfP3RYqmhrBsR4iNpX2/i22wBlOSi/38M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WYXLZuoQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WYXLZuoQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D9B9C2BCB0; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=3DbsYkN4pf5ND1z8L30fphcMVgrd1sOFsBKrJWKj7TY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WYXLZuoQ8oFwwg7QCVCsTgjZ+oF7k4znxYvh4mcT3ituf4jUt6lOBmrtFIwxBMVHV +S4d4bkYsE8nK9KkaN7KV2Bzunj3zsgDkyRK50RkaNG9EAGdrVF1X6Vea02xxPaMmq ZWbI1aE3JWof1OmZAGy0BX0RB1PzIxNSUGx2O0TLuTobOAftUxE0S4pBQqGXlhli0u ddF9jdySAeKu8i749/x8Y88QzAuzfWGjn8vMeRX+e4YnrYDHr0/KjDsHbCEbKkyWLc Lp4ZMGXDzbpvH77kts6wta6cmJTcrjQL4HD77J8ugRZ0+p/vlCqVqBL4wSyiRr6k4X TDib8HQ5kS1RQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8R-00000001d6h-43PZ; Thu, 09 Apr 2026 14:05:23 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 01/20] spi: amlogic-spisg: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:00 +0200 Message-ID: <20260409120419.388546-2-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: cef9991e04ae ("spi: Add Amlogic SPISG driver") Cc: stable@vger.kernel.org # 6.17: b8db95529979 Cc: stable@vger.kernel.org # 6.17 Cc: Sunny Luo Signed-off-by: Johan Hovold --- drivers/spi/spi-amlogic-spisg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spis= g.c index da8ec35115da..19c5eba412ef 100644 --- a/drivers/spi/spi-amlogic-spisg.c +++ b/drivers/spi/spi-amlogic-spisg.c @@ -800,7 +800,7 @@ static int aml_spisg_probe(struct platform_device *pdev) goto out_clk; } =20 - ret =3D devm_spi_register_controller(dev, ctlr); + ret =3D spi_register_controller(ctlr); if (ret) { dev_err(&pdev->dev, "spi controller registration failed\n"); goto out_clk; @@ -823,6 +823,8 @@ static void aml_spisg_remove(struct platform_device *pd= ev) { struct spisg_device *spisg =3D platform_get_drvdata(pdev); =20 + spi_unregister_controller(spisg->controller); + if (!pm_runtime_suspended(&pdev->dev)) { pinctrl_pm_select_sleep_state(&spisg->pdev->dev); clk_disable_unprepare(spisg->core); --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AADEE3B9DA8; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=ibm+6Ig3J+bq3pS2ZRsJrg+VYXkB2pDmCKg2vad0EC7vj/p8LzG0LbIZ7LfjYdELMAHjTyPhw5SMKc07HU6jVj40FywZCaYp1neZJMzMcfjD/ur/5Y68/FASmWJhG+vzTJAgfDfy5UVmoofAwaQ0Wd+NORpFaS1jxXULvcka+YM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=MgRl1avgvjrR1PqONAQsOzEaMdp60oVXMeEFBN4iSIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=flAa7zXsewV7pO2sEYHM2i+W8Y/sNgMQFa1CNgRSxCan+KjleJ7vv60ezhkrOEyVgJOmBsPr2LVG2CrzwXHjl5thb5onUGo/s23Ap8mHubpLBaq6YNaeHqSooHJZ74GtSBHU4brjnJuqvm958OK0sQIuckqW0ob8SLBrbqOh5cQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Jfhep6DH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Jfhep6DH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53394C2BCB1; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=MgRl1avgvjrR1PqONAQsOzEaMdp60oVXMeEFBN4iSIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jfhep6DHDK03KfQn5Maub7OxZsfg1dZqY/dcaGetNLaTkqN3clE2n22phWTi2Ck5s d6pyDmhiqrgbMCy3UkO3Bq1t7zzlDlzNqHupIDPrZXi7P2wyki1dRyAs4Hi4xoeJ5j uvLIQLvYJnd+9v1Dozb3kqpydvv1HBj3qxnCZ7OrmPAF82BHIkoQX+mMxVXeBK9v0j eyZaGX9eoMycApixDnx8Rvn7cHOJ45XR/kC6JOj857IUFZxXVj8m+7pY0igkthNgnL iFDm1bA8HxSbRJvyRSGX+ydJ3P0csCR4KdqKHyilCOhsWnyS/RB3STUJuythSq9a9A hy2wmarVVskJw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8R-00000001d6j-45pc; Thu, 09 Apr 2026 14:05:23 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 02/20] spi: aspeed-smc: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:01 +0200 Message-ID: <20260409120419.388546-3-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: e3228ed92893 ("spi: spi-mem: Convert Aspeed SMC driver to spi-mem") Cc: stable@vger.kernel.org # 5.19 Cc: C=C3=A9dric Le Goater Signed-off-by: Johan Hovold --- drivers/spi/spi-aspeed-smc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 9c286e534bf0..c21323e07d3c 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -972,7 +972,7 @@ static int aspeed_spi_probe(struct platform_device *pde= v) return -ENOMEM; =20 aspi =3D spi_controller_get_devdata(ctlr); - platform_set_drvdata(pdev, aspi); + platform_set_drvdata(pdev, ctlr); aspi->data =3D data; aspi->dev =3D dev; =20 @@ -1021,7 +1021,7 @@ static int aspeed_spi_probe(struct platform_device *p= dev) return ret; } =20 - ret =3D devm_spi_register_controller(dev, ctlr); + ret =3D spi_register_controller(ctlr); if (ret) dev_err(&pdev->dev, "spi_register_controller failed\n"); =20 @@ -1030,7 +1030,10 @@ static int aspeed_spi_probe(struct platform_device *= pdev) =20 static void aspeed_spi_remove(struct platform_device *pdev) { - struct aspeed_spi *aspi =3D platform_get_drvdata(pdev); + struct spi_controller *ctlr =3D platform_get_drvdata(pdev); + struct aspeed_spi *aspi =3D spi_controller_get_devdata(ctlr); + + spi_unregister_controller(ctlr); =20 aspeed_spi_enable(aspi, false); } --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8252638F92D; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=eq9CHXjgZ17+/gq7K0q1xFHHX0Nzwzq8PygXATdkHA8H8aZVdPYUalisRmQr8PiI5g8+fnjvENRhlhGewFPhZiIpm2fE78bjaWFYZMO4jN6ZOmg5J55+T9ntKjAAk4LV0HPPOGkkfYecpmfgNa3ykNaYmrH+f806GlkI07UWKZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=RVFqjnP/PU0LHgzX4H58KUj2k9kDpc/ipVr52enEE+8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FlS4fefpWaPzG9y881LQ5aVLNlN2Safk/ykVjZRJ1pA0JGYQyPbq54a0HpCNU7oaFPYIZbScRYcZW2ZkhZEaPuZdskStQgZ9QPMCAtAXrvwizavilQDUn4nP3In95IAgGG+8+NnkFu62B3yLhtNngCWr45raRI05vlZRViksJHI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LA7QbDAR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LA7QbDAR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45B90C19424; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=RVFqjnP/PU0LHgzX4H58KUj2k9kDpc/ipVr52enEE+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LA7QbDAR/56z1i/SkU+X13ZaGZk60IoWSweEDVF4ax/8KQBGP38gNHU9MUuM52niS yc8VvMfUphjcUWiPYsMHKJ0gDC3X1JcEJCVhfVR2sHyJHOQRz+kQYheZLaUPH+qzm3 uEefPRdrpbX56arsK9JYtkyZlvBmg5V4n5hGaCbQdtuCdAP1zFK1hcWBAEO97tk3Qe lI0mfE0FMBGfBUVFFeFaB5HjPwLKboiYNu5/iPvMHPBLsPyr06nFTDTE6SqxxxBQzQ waxAbu8TZdCsywQreOZvuYf6Rm0+TCqcGl8mfSuQx88wuno8dV97THydYWzACfsrZO 6iVKiY5kayS4w== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8R-00000001d6l-48B0; Thu, 09 Apr 2026 14:05:23 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Radu Pirea Subject: [PATCH 03/20] spi: at91-usart: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:02 +0200 Message-ID: <20260409120419.388546-4-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling and releasing underlying resources like clocks and DMA during driver unbind. Fixes: e1892546ff66 ("spi: at91-usart: Add driver for at91-usart as SPI") Cc: stable@vger.kernel.org # 4.20 Cc: Radu Pirea Signed-off-by: Johan Hovold --- drivers/spi/spi-at91-usart.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c index 76eb3ba75ab1..79edc1cd13c0 100644 --- a/drivers/spi/spi-at91-usart.c +++ b/drivers/spi/spi-at91-usart.c @@ -556,7 +556,7 @@ static int at91_usart_spi_probe(struct platform_device = *pdev) spin_lock_init(&aus->lock); init_completion(&aus->xfer_completion); =20 - ret =3D devm_spi_register_controller(&pdev->dev, controller); + ret =3D spi_register_controller(controller); if (ret) goto at91_usart_fail_register_controller; =20 @@ -634,8 +634,14 @@ static void at91_usart_spi_remove(struct platform_devi= ce *pdev) struct spi_controller *ctlr =3D platform_get_drvdata(pdev); struct at91_usart_spi *aus =3D spi_controller_get_devdata(ctlr); =20 + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); + at91_usart_spi_release_dma(ctlr); clk_disable_unprepare(aus->clk); + + spi_controller_put(ctlr); } =20 static const struct dev_pm_ops at91_usart_spi_pm_ops =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAECF3B0AFC; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=WOY9v64BjOfrTKxckSOpf1AX/YmZzhwp5IyBOMs+L3BAwUSCZns8DlK2ixs6amJL8ZlNo0UwPs6HEWyV2lN9gqwSntGrrD8BK5MEVMptCotuhfWhc2NO+2aR4jjQ0V5iupfM02osfJPGgwLnLJwqA8ZuiNWJhUzi4HhwVZhKsxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=AzZOrde4AMVjVbEK+AIdwcR6ueHob3qjNZAqpCxP3c4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BUyEfCvZJabWJEXZ0nHPL45N+K/+Qap608YqO0AyYAEkBJYSXfcYn/diSpWJebSl11dyg9y+1uM/oJDBs/VfkqeFGpX2+kVK5CMt8nCWqx4pSROKezvx3qub7VhXw8/x3sYjQ5mwcQ+9OeBbgWPo9s4wfU8FD4W78tOofyR//+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gzt5oRbx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gzt5oRbx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50A3BC2BCB2; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=AzZOrde4AMVjVbEK+AIdwcR6ueHob3qjNZAqpCxP3c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gzt5oRbxamgpC+wzSeku4I4jGIn9D2mL0bDkhDLVeheMUVDg3fvAuJNIeBJijzxwl pgZ24x8MZDmqaViIrLQ9lPjYtu+vt59XGdD4SABCuKq1pxFnoKpB1qxFNLAlU95kaB vArALHtCrjoHAt4knON4Jr09M9YJwOzrTasiW6NintBalC296MXNaUfJ9akmUjR63h LdxPA6i+awfMoJN4aEuWMrV45DSv8gZj8ZVH/VGIqkKQgGfNrgO/YUv6oLIq9sn7wS Pja/MiNkfB1h3BTlMavX44Uy3TgP7GqgnsF5cvm0lJoHZlTCmTBWCE6rIReqZsx63C p/oXbcOt4Y09Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8R-00000001d6n-4AZR; Thu, 09 Apr 2026 14:05:23 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 04/20] spi: atmel: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:03 +0200 Message-ID: <20260409120419.388546-5-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 754ce4f29937 ("[PATCH] SPI: atmel_spi driver") Cc: stable@vger.kernel.org # 2.6.21 Signed-off-by: Johan Hovold --- drivers/spi/spi-atmel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 445d645585bf..42db85d7ff8e 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1654,7 +1654,7 @@ static int atmel_spi_probe(struct platform_device *pd= ev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); =20 - ret =3D devm_spi_register_controller(&pdev->dev, host); + ret =3D spi_register_controller(host); if (ret) goto out_free_dma; =20 @@ -1688,8 +1688,12 @@ static void atmel_spi_remove(struct platform_device = *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct atmel_spi *as =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + pm_runtime_get_sync(&pdev->dev); =20 + spi_unregister_controller(host); + /* reset the hardware and block queue progress */ if (as->use_dma) { atmel_spi_stop_dma(host); @@ -1716,6 +1720,8 @@ static void atmel_spi_remove(struct platform_device *= pdev) =20 pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + + spi_controller_put(host); } =20 static int atmel_spi_runtime_suspend(struct device *dev) --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 826773921C9; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=ZaebFLJ72bUxAVAk71U31AeGxMl9raIzxm24Aba5jdoJA6ThETRAav11kIii2sUsZ7w8OQCx5uOvh1WaSSsS2L/OtxNsw6B+Lb+z9Ikyak3+kXwIjfBYXnFG1HdY/FogLGaX45+YRidUNdbS5kISrXCHvzlIvT+PrqrKpqcAJGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=FWI3aj2nBi83Z6I2499LKZlL2TKzZRfUYxr46TX+xA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZrL+NoLAuSBcsXkp0pxmK8N8M1DIsNFhpJErqr84jjrBE1lAvBMwPifFq7Qvy7JmQcQ21S0/iaaviE+Q8hLeGHJjNyI6SOGFN3PzkyB2mBDDiGMikPn35atJSRT14rIMG4dAv0Mq/Es9Wx2HSuiEvZzNyZh5W/WBUL4uoRqo7eE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pt8ZJ95q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pt8ZJ95q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48876C2BC87; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=FWI3aj2nBi83Z6I2499LKZlL2TKzZRfUYxr46TX+xA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pt8ZJ95qvaGK1LGIs8QpqZ3rnUkxXI9cFR4ob3ttam0zlLk/WmY1eIaqqataEerXt TJLKzgKHi9giEuYcFtaU+6bR2Tn6S7gEO5zYT2aQvT37kVYQWabRJlwR3eS3KslmJN DVz2sKDVMpsUTCYMtzqxdKyp6+f9nrZIfI7qw2pnMYGuaQbULb2NJRZiTEBHvN0Bgh dfb+PzUhRxaZuKnzuYynkCm9I29t5Y8pEDen/RXRcPz6HHROfm5tEa0cI8Se8ftC/1 hSTjnjNu8lD4rFuqoOt2rg6a6Kfg3SCUsG16OnbXXJiUbB5rLWkmG0Y2wXTHVdIyDA 1tldECda1saeA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6p-00zQ; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Florian Fainelli Subject: [PATCH 05/20] spi: bcm63xx: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:04 +0200 Message-ID: <20260409120419.388546-6-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") Cc: stable@vger.kernel.org # 3.4 Cc: Florian Fainelli Signed-off-by: Johan Hovold --- drivers/spi/spi-bcm63xx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 47266bb23a33..40cd7efc4b54 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -602,7 +602,7 @@ static int bcm63xx_spi_probe(struct platform_device *pd= ev) goto out_clk_disable; =20 /* register and we are done */ - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret) { dev_err(dev, "spi register failed\n"); goto out_clk_disable; @@ -625,11 +625,17 @@ static void bcm63xx_spi_remove(struct platform_device= *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct bcm63xx_spi *bs =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + /* reset spi block */ bcm_spi_writeb(bs, 0, SPI_INT_MASK); =20 /* HW shutdown */ clk_disable_unprepare(bs->clk); + + spi_controller_put(host); } =20 static int bcm63xx_spi_suspend(struct device *dev) --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8B4C3B4E9D; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=YEXQtOkoZ4m20lbVKQMxoaN0wK3VcG8F/Af/8n7QfLTq4SsWbdZJDaZ36ZaWjZA3exqMSHGWqIiN/UhrA5KT09VFtmjmopeIN9N7joWJx46NQKvahY5zS9cW7hvTwas5iTz5PqnhTQfUmhKqq9S1nbu/YJeDhaEDRDWTiDQKejY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=TsKrseCE8mLUIQsrECcitJ2L+nu38MyChipfMhoSMOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pv5JSlYCBmBf+hAwSaAPEEQ5yR0Agp0znSvvaZ1KSSdSwZreaMjo3c/j1YFUS4/ni8ejAKTky+JlyR5cTZt4c1jj4pkh5K147EKUkXOaZT4SMeycubnr3CQZHibAhpV9BODBgD8YiOPOcZGWfGtOPQbrLMesRcjyw1Voi5AyW+0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QGaN0CQQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QGaN0CQQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55D19C2BCB3; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=TsKrseCE8mLUIQsrECcitJ2L+nu38MyChipfMhoSMOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QGaN0CQQXNwmdSD1KyQkWUponEIJFNeBZJUmhVp+bCLSNGyqna1yPS5c2NgzkgRid P+eOqk3iUt6pbo8zpltuvuqSXJvmP/bredOXvkWXztdUeZI3WpWolHpCYXf84f37E2 +hWg+7Gjlq9nBBDsTZyRAWfUkK1WPjD/tVupI6rzR5TZ0syY9CAGY2gQhQgt8I+MqV p9k5f/1qGz2E6HUgFTEsMjig2tgeNsEUQHpeMouaefdQUB3kEDJAeBuaNhApUciYPC PMRkSLvyWC4fGweKUIv/8dtbALKJ2fvR83tQUzsro+DfTuSjOI7eWnda0PgwydQVHU xrVEf28n+ppJw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6r-03Hy; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 06/20] spi: bcm63xx-hsspi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:05 +0200 Message-ID: <20260409120419.388546-7-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind to allow SPI drivers to do I/O during deregistration. Note that clocks were also disabled before the recent commit e532e21a246d ("spi: bcm63xx-hsspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 7d255695804f ("spi/bcm63xx-hsspi: use devm_register_master()") Cc: stable@vger.kernel.org # 3.14 Cc: Jonas Gorski Signed-off-by: Johan Hovold --- drivers/spi/spi-bcm63xx-hsspi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hssp= i.c index 266eabd3715b..e935e8ab9cfd 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -857,7 +857,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *= pdev) } =20 /* register and we are done */ - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret) goto out_sysgroup_disable; =20 @@ -880,9 +880,15 @@ static void bcm63xx_hsspi_remove(struct platform_devic= e *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct bcm63xx_hsspi *bs =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + /* reset the hardware and block queue progress */ __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG); sysfs_remove_group(&pdev->dev.kobj, &bcm63xx_hsspi_group); + + spi_controller_put(host); } =20 #ifdef CONFIG_PM_SLEEP --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82499385513; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=OdYL1w3DFf1wRu5pU01z4suZkSIF6nHqCW3y8MgITz5XdT0OWU/pWzPNge1hQGerdzxS0/sg+r9FNA0o+uUjbHfCbmdVjW9XK9mRn9dtZIuQy6ngv1LTX4UeJUa3XjZghutmz/JgER9KzBKeYKZ/w6j9cDOmOL2UjyYMi+Y9z68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=2UUcfPS4wrWwczKLD7aDbhUfuDJpVjl6srN25LJyhX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+uAELKHiMghJFiaYNY1m1q0QTQeMn5gOhdgoN+KsVKrh1qDjNfXfEjBpjjZIduu54+9TyqoP5SoZQJ4er90LPs3kh3WH+ghVOwdMvoc4W6AeiQwG3lYjFkpOwSTXxvZcEHs75GoC2mhw+gmY5k6e8eKIOZ934lnWcq+i7PNUIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hOa9ingH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hOa9ingH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B17EC2BC9E; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=2UUcfPS4wrWwczKLD7aDbhUfuDJpVjl6srN25LJyhX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hOa9ingH4y4gRiKiOLn2zm66hM+NbGYRQiRjpPURT5zXW46ljnxV9CSLdOUVNAjaY MP5t39gsMiNjcoJkHocXLr7ltMC5Mp4Xe1EyXaYeLQlkd9Ogjl4n+5i8u/KDKZiXdx YHBoTAwGOZMwrCxbf+MOOvOZbgwK/f1xBp/MjIOyJqIKiDmJM0zGSFATK7hgiSm/4q 3Fu6GNuc0z0SQOvOlK8PvtW7+CdiEKQWFRDl/8ZCEc+DRVUaPqSpixKujRaeG6wYOU aXlc6DmHDrk/Jmh2rqNEJMYcuX294MLtVatoVb7LQ+4MYDXy2eujVBlLnVWQiJeeqS jk9byTTR5XS5Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6t-05hf; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 07/20] spi: bcmbca-hsspi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:06 +0200 Message-ID: <20260409120419.388546-8-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind to allow SPI drivers to do I/O during deregistration. Note that clocks were also disabled before the recent commit e532e21a246d ("spi: bcm63xx-hsspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: a38a2233f23b ("spi: bcmbca-hsspi: Add driver for newer HSSPI control= ler") Cc: stable@vger.kernel.org # 6.3: deb269e0394f Cc: stable@vger.kernel.org # 6.3 Cc: William Zhang Signed-off-by: Johan Hovold --- drivers/spi/spi-bcmbca-hsspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcmbca-hsspi.c b/drivers/spi/spi-bcmbca-hsspi.c index 2e22345115fd..09c1472ae4fa 100644 --- a/drivers/spi/spi-bcmbca-hsspi.c +++ b/drivers/spi/spi-bcmbca-hsspi.c @@ -538,7 +538,7 @@ static int bcmbca_hsspi_probe(struct platform_device *p= dev) return dev_err_probe(dev, ret, "couldn't register sysfs group\n"); =20 /* register and we are done */ - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret) goto out_sysgroup_disable; =20 @@ -556,6 +556,8 @@ static void bcmbca_hsspi_remove(struct platform_device = *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct bcmbca_hsspi *bs =3D spi_controller_get_devdata(host); =20 + spi_unregister_controller(host); + /* reset the hardware and block queue progress */ __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG); sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group); --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E869A3C276B; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; cv=none; b=kEJMxZkgg+3xJaQvURgK7UyYx+x0m4ZTIuSh/X/LHXDFKMcVq2Z9OdR9R1fb6NeFf3WYSAjVBrHMP75faAD0cGX1cwSRC7jDFAobxz9xSYGW+5cgarVYxhK+cQIoOagpGBOBq5gY20EaNmaY847/OTgS60Ln/Ayq499J5LITra8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; c=relaxed/simple; bh=wuZDVHmIHpg4emeVoxEEiPHCm40raWJLH8pnoqP/UOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fq1StYSTPKidwTMdI23C21u8yj+e2Iknm9cessSUD+EBtw7JhBNWM6p2vqynsU0X1we24QjLtoah4Uq73SWsFNpx6wY07SlQ+8I4KuyXA8uIBGF5fEKMoQWNwmYZPaPpDQsDYk0FUmv0AT0vZOMzZ1JpjKyMSwoOHXU/K+kX9gE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T8v0G51I; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T8v0G51I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D041C4AF0D; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=wuZDVHmIHpg4emeVoxEEiPHCm40raWJLH8pnoqP/UOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8v0G51I+vDqXHFH+4ezmkSOD/xS+OMRnRhVguvb6Q5SdK37+C6klJl/Yq/LITzXV J/RrxJ98IScK1+p9Te8um78djbO6meKSxDtUl+88h2vDsE6b6teRRUFtKqfrYRyiOc F0W7sDHdso76fnUwssF+pLsBdQ75p9KSPMH4zAX2wgnSsWlryXBOFqQo/5rt+2XzWc zlmXowsUTpB5JTtH+GEC7PpaAyq2IDADj9/iAic9TKgmtvQ4pjR0MOv++wwugcnzC3 XMr7VN6T9k2f8b6kHoPFuZRlkTDNBAgTtoZwH2JLQXMsPzPmXdhuKe03uhh4x1Kzm3 osdaRcYSCc71w== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6v-084Q; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Jingoo Han Subject: [PATCH 08/20] spi: octeon: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:07 +0200 Message-ID: <20260409120419.388546-9-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling it to avoid hanging or leaking resources associated with the queue when the queue is non-empty. Fixes: 22ad2d8df77d ("spi: octeon: use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.13 Cc: Jingoo Han Signed-off-by: Johan Hovold --- drivers/spi/spi-cavium-octeon.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeo= n.c index 155085a053a1..b95bfa6a3013 100644 --- a/drivers/spi/spi-cavium-octeon.c +++ b/drivers/spi/spi-cavium-octeon.c @@ -54,7 +54,7 @@ static int octeon_spi_probe(struct platform_device *pdev) host->bits_per_word_mask =3D SPI_BPW_MASK(8); host->max_speed_hz =3D OCTEON_SPI_MAX_CLOCK_HZ; =20 - err =3D devm_spi_register_controller(&pdev->dev, host); + err =3D spi_register_controller(host); if (err) { dev_err(&pdev->dev, "register host failed: %d\n", err); goto fail; @@ -73,8 +73,14 @@ static void octeon_spi_remove(struct platform_device *pd= ev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct octeon_spi *p =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + /* Clear the CSENA* and put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); + + spi_controller_put(host); } =20 static const struct of_device_id octeon_spi_match[] =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCEE63C1970; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=BA6vPIf3WL8kB79pzG5p1D4VxbPb6KyfQ45WLcVyXux7vFdICPNyAVa6sDnlLr1k47QAexCViUdEMQROjb61SAtBlAkdW3WCLi1t/5zDT6TSsCX8zt4Deysz8LRen+SeE65Dk/pdte54b5F09SMQM35RmvfHm7Ghs/J2QVdR7/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=tMFCgvOy4LcT3UQdLxzcCVWCGk2e5r9f9re3+JZhWVc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vAxl1O0F+nGPmB6td6phsmIVggdyFYfG05XAC/GTfOJarAiXrhfUZvp9xyStCzroE/L4DT2FGJ4NHXyehJcIBDr6FG2DTa81vrMuchkHCgwAdRBEwAr3KXSsQosB78nBtstDS/O6DESo4cRUnu3pdrddpslTb+c7/LWHdRpBQSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bAjG3276; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bAjG3276" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E7C5C4AF10; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=tMFCgvOy4LcT3UQdLxzcCVWCGk2e5r9f9re3+JZhWVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAjG3276gO6Px2fz2ch4CMWK2FjzMNZdpVTAfIIGqXBH0yenAbsvH+7/E864mCwBO skLjtGOyXqfDfUtdIRyWI8T8uRsYl2695ALn7lo8nab5NIkkg2yLLAI3N2Zd+Dxbow aXPEfNNLPEI8DW9N+lQWqrh1aFXs6QbLOC19A0DdOfqoMoSwOWVesAAIPuL4JquYfQ Gmre0ROmQ2iVcQ+/WM3vmfTNm8JBvuV5ZkraO9H1OaIBpyVuKFljUn8WiWbPVc/hVJ ZOYYxXan035W5v3gf8Et0+tilesxwrhIlYlY3wFg+m0Udz0WqHLIbEt6jFUr7rasdO LYwLahsiiKPeg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6x-0ATP; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Jan Glauber Subject: [PATCH 09/20] spi: cavium-thunderx: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:08 +0200 Message-ID: <20260409120419.388546-10-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling it to avoid hanging or leaking resources associated with the queue when the queue non-empty. Fixes: 7347a6c7af8d ("spi: octeon: Add ThunderX driver") Cc: stable@vger.kernel.org # 4.9 Cc: Jan Glauber Signed-off-by: Johan Hovold --- drivers/spi/spi-cavium-thunderx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thu= nderx.c index 99aac40a1bba..f1a9aa696c87 100644 --- a/drivers/spi/spi-cavium-thunderx.c +++ b/drivers/spi/spi-cavium-thunderx.c @@ -70,7 +70,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev, =20 pci_set_drvdata(pdev, host); =20 - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret) goto error; =20 @@ -90,8 +90,14 @@ static void thunderx_spi_remove(struct pci_dev *pdev) if (!p) return; =20 + spi_controller_get(host); + + spi_unregister_controller(host); + /* Put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); + + spi_controller_put(host); } =20 static const struct pci_device_id thunderx_spi_pci_id_table[] =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD84D3BF66E; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=hKKWsnVSAq1n2et1PGPgh05tv7PIlbhswfvdjDPLKvGNUyQ9hByrn8yQpLTq9N9Y64N80uBPYL0SLo0Tvcr/7AfKlVqoZ0YxlhvGE5jrCA8/njD8fujsQ7UPrbvN9STe8nMOVKfpmxWciz8lIGm1nW+3lh/k7FV3Ha01NBfZKQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=Hkdce0DcCrLswuUsM5hL/RXlE+ofhVC6Uf3ve7+eq20=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BL52/IaeGm7+y7RYdAqd8pohkhVgU2MLJs3U/t1t3ZhIIKwhyMHWsQopRSIbAPhLFTm00d3tDyJG3o+ZQvl+bXEZRErs7PSmH3y5k7deCZ0HWmM2sOAmkNptwmJ/rheC/cgf7DP3vB+ZWcKABMKOdaOiw+uEye3orMw3utuFoOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KDu1mYfK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KDu1mYfK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6258CC2BCC4; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=Hkdce0DcCrLswuUsM5hL/RXlE+ofhVC6Uf3ve7+eq20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KDu1mYfKniiWmV6WS6LON4avPhVeWD0OWmFjph406MkcpO555IIP5aaxs/NufPZrN 7bipAI0YHmHQjvhpF5W7ixD9cwgTWMFpupXE3zrGS9WeryKwY5EDw5TemTtx7A6/Vd tHuPelyJpgYLOsEQImflwe7T6b2wgV7Oz2dWMXTb8/fxqnt9KKGWynN3f4yhjBu4/U 9bmu8VlooXEs8q29Tr/tnh9G3GIo9gwALUKeqWMI2vsFhbU/GsijmZJOmgaA2tJmsD F1g3ggi2kYVtu72GmjWXTmfaXSSSihtLS4lAjQkNCmsNo+SRngrVpJyPzbsxQuopRh VMW9D6bXuLX6Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6z-0Cpb; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Steven King Subject: [PATCH 10/20] spi: coldfire-qspi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:09 +0200 Message-ID: <20260409120419.388546-11-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like clocks (via runtime pm) during driver unbind. Fixes: 34b8c6617366 ("spi: Add Freescale/Motorola Coldfire QSPI driver") Cc: stable@vger.kernel.org # 2.6.34 Cc: Steven King Signed-off-by: Johan Hovold --- drivers/spi/spi-coldfire-qspi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qsp= i.c index fdf37636cb9f..b45f44de85dc 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -410,9 +410,9 @@ static int mcfqspi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, host); pm_runtime_enable(&pdev->dev); =20 - status =3D devm_spi_register_controller(&pdev->dev, host); + status =3D spi_register_controller(host); if (status) { - dev_dbg(&pdev->dev, "devm_spi_register_controller failed\n"); + dev_dbg(&pdev->dev, "failed to register controller\n"); goto fail1; } =20 @@ -436,11 +436,17 @@ static void mcfqspi_remove(struct platform_device *pd= ev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct mcfqspi *mcfqspi =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); /* disable the hardware (set the baud rate to 0) */ mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR); =20 mcfqspi_cs_teardown(mcfqspi); + + spi_controller_put(host); } =20 #ifdef CONFIG_PM_SLEEP --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBB393BED76; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=SPNUumnMGLJD4aR6MEsl0I6LDu/AqGhrEyv0f3RNvUoXq81cT+m/ixgRMB9pFfrMQCOwtgqdR3bgstXtfqp26B8SadLvoYYyLgZ3ghSr8fJ32Pc5NiPGAdPNKGuwB+U63znlSCAedbofsYa27zdlYSNP7KDS5r7BrHgMvyRattc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=lsKEDnYtZlc757jy27w5VFfQRr0Ca5F25Ct5iUvklLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OF88Rff8hcxmvl1qcthe0k+UDJaiKQyBme4trDzRlSp8dSpeV/r/M8UuGBXk+1jTuDOQxNL6nMHYO3nL1Cjs5bILjni/SWVER/+B8c93W1DNENx4VjP3HSQBtpdc4KfiNgU1ssfuxet/kybszkCxmanQnGdolg7It1/BJFjd4/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Yv+LcjwF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Yv+LcjwF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E2B2C2BCB5; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=lsKEDnYtZlc757jy27w5VFfQRr0Ca5F25Ct5iUvklLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yv+LcjwFUxxbDNQq0MXoUG1Bw4lRo4aGT8KiZZXWwYuqm9ZxiGKIxX4Tus1W78bdx 8JhqnuONz8h+JzmLTIS5CID/CSul1kh2Swao6LBh0HendsY5Gon9xdwU0iKLDBUPrF sXvWyRXvqBvjA2+h71uIhUK1G9nqHbm8Xr+FvmP7nATkSNqZnHvxeItE1DIt0Vh7Nk 3eh055ASbdyay9k223mZGDurMN/oRCQU9H29fir0kxlZIrxoFZWWBveFC36FfamZ9u rcWttVy2JLveAYUDHH5AW/SERkfm1HVed60aQoARyvKPjSHmfuJxCfUnH3b+1iEUFU lmG2NVdAoi+kg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d71-0FGn; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Laurentiu Palcu Subject: [PATCH 11/20] spi: dln2: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:10 +0200 Message-ID: <20260409120419.388546-12-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: 3d8c0d749da3 ("spi: add support for DLN-2 USB-SPI adapter") Cc: stable@vger.kernel.org # 4.0 Cc: Laurentiu Palcu Signed-off-by: Johan Hovold --- drivers/spi/spi-dln2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-dln2.c b/drivers/spi/spi-dln2.c index d90282960ab6..392f0d05f508 100644 --- a/drivers/spi/spi-dln2.c +++ b/drivers/spi/spi-dln2.c @@ -758,7 +758,7 @@ static int dln2_spi_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); =20 - ret =3D devm_spi_register_controller(&pdev->dev, host); + ret =3D spi_register_controller(host); if (ret < 0) { dev_err(&pdev->dev, "Failed to register host\n"); goto exit_register; @@ -783,10 +783,16 @@ static void dln2_spi_remove(struct platform_device *p= dev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct dln2_spi *dln2 =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); =20 if (dln2_spi_enable(dln2, false) < 0) dev_err(&pdev->dev, "Failed to disable SPI module\n"); + + spi_controller_put(host); } =20 #ifdef CONFIG_PM_SLEEP --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5C2D3C13E3; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=oAJC+Y7DXk7s5ju9+a0ZNv7GPGP5rV3OwFMtbGMObaUw5o+VYc0AInt6CT2YmAN1M7TNHsLPdSsryWDvZtoYgEUuwiCc2hDsCExHoe44lqhr9qCfTw5Ak0XzLU6eFM9AguuTC0fjqDkVZ1l7hBpYmLyE4bixFFP0V0Gc6f0tdOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=a6xKSd5zoi2HPbnZ+t/fnsNLvJyQkNXRV2MIagw8iSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=euk34rMyEABHTHKr50ohyEr/P/LFGASb8N9CTIJpQvIfOd0webKQP7YxBfg9KcIo3rPwZzgxcqJY0YEHFGmkeb3341B/SbgJxR4clVoVbB+O1BxHRH1k7uc58OkBRrq0wctk8vpiANGjb17JfRU54GrrWQZzMSFicJcXSlWk/G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bYAXUIbm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bYAXUIbm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D137C4AF0E; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=a6xKSd5zoi2HPbnZ+t/fnsNLvJyQkNXRV2MIagw8iSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bYAXUIbmJrry+yb7d7hkLnsG8WDzxQ+vhNlh6oKCVaaeU3RKqbubfnn6/ofI8aBa3 oqv1XtesMjtPLrLRZcXnm4s9Bdw6u8AElnijLMavRt0K2Bzq3ImE8GFmCSY3yxvcrQ WXteH3k+nc9VTA/u4u5FSmMKUCaarTZGXL5r/dBsqh+4clyL1Ut18yHg5DWZqo55zE /4sY280Kw5UzyMs0aFd3JiikltbbMepsSobb2tTr1LUyrzSMftt28xWdxlovCKfZj7 J/eVw8YZa7FjeULUc7zc9DePV5TeZwNLUgCYwyUNqK3EkIy3WWkUjcrY3ds54iF3W1 Hg2+G+qGOic0A== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d73-0HoV; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 12/20] spi: ep93xx: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:11 +0200 Message-ID: <20260409120419.388546-13-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 011f23a3c2f2 ("spi/ep93xx: implemented driver for Cirrus EP93xx SPI = controller") Cc: stable@vger.kernel.org # 2.6.35 Signed-off-by: Johan Hovold --- drivers/spi/spi-ep93xx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index 90d5f3ea6508..db50018050e5 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -689,7 +689,7 @@ static int ep93xx_spi_probe(struct platform_device *pde= v) /* make sure that the hardware is disabled */ writel(0, espi->mmio + SSPCR1); =20 - error =3D devm_spi_register_controller(&pdev->dev, host); + error =3D spi_register_controller(host); if (error) { dev_err(&pdev->dev, "failed to register SPI host\n"); goto fail_free_dma; @@ -713,7 +713,13 @@ static void ep93xx_spi_remove(struct platform_device *= pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct ep93xx_spi *espi =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + ep93xx_spi_release_dma(espi); + + spi_controller_put(host); } =20 static const struct of_device_id ep93xx_spi_of_ids[] =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B897D3BBA0E; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=bqQdYUj0f7ch5qCP/YDqx0M5IsuIOzuZ+DtIlMfYGRF5xupP4Zb7oBWDDwyBfzxf9aGVot47c0fq/G92CxLM/P9iqJBMf4r5Q1vobGdlltAlwZArTBmvTpQ3m2RgS9ThQ06NSzSXmFeuOKel9kyTPM0ou9Ivl9YnJ4d9tY/vmWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=AN/WmZLURrd95pC2sN/jR4hEhb/ZR49KwdyAN70jqWg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bAffb/hrlij4pblxtRpYfVsq0wuW1VZezKq9cpmQrVriXsxOI3UJo7HS3z0O3KEF3mmX6CDfAnHAltOQhltnHQT69W+vc1caB1D1T6jT88c7HlfaxdcMoH/OjdhfQpSVJTmTnLxVIGSmUmenaMrUtlt90+96JZ/Rw2Th3y5g36Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VTHTZRdA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VTHTZRdA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61B75C2BCB7; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=AN/WmZLURrd95pC2sN/jR4hEhb/ZR49KwdyAN70jqWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VTHTZRdAeGmFp4gUzDerqn4axWzR68XQs5/R6BzowCNQbauvdNH8YHBdRB8Y4UVjk TcPN24QjtxoiJhze/P70dhFrpuKaLSMhN9U9XGkKa+eTj4L3o5PA6VXAunoAkI1qWN irdJO6uNeD49mhybg7OUIuYd8oDTySLUzvGNyErcnh/UR1l6uDk4zPtdDgayEYjD7B ++AaJH7p3JbSL/QSsHX3uXngtMt7SG8okvtgjte5s9fDdc8j9d2UgA6BXHnD8cm0Ho RbvsO2EbDBgHyxiFTecTotNoxEFgPz1IknwflQW56eoO155sMbGfXhSEn3s7c86yF5 s+NDhvsZsG5nw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d75-0KAz; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Heiner Kallweit Subject: [PATCH 13/20] spi: fsl-espi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:12 +0200 Message-ID: <20260409120419.388546-14-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling runtime PM (which can leave the controller disabled) to allow SPI device drivers to do I/O during deregistration. Fixes: e9abb4db8d10 ("spi: fsl-espi: add runtime PM") Cc: stable@vger.kernel.org # 4.3 Cc: Heiner Kallweit Signed-off-by: Johan Hovold --- drivers/spi/spi-fsl-espi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 56270f8fdc17..45b9974ae911 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -718,7 +718,7 @@ static int fsl_espi_probe(struct device *dev, struct re= source *mem, pm_runtime_enable(dev); pm_runtime_get_sync(dev); =20 - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret < 0) goto err_pm; =20 @@ -782,7 +782,15 @@ static int of_fsl_espi_probe(struct platform_device *o= fdev) =20 static void of_fsl_espi_remove(struct platform_device *dev) { + struct spi_controller *host =3D platform_get_drvdata(dev); + + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&dev->dev); + + spi_controller_put(host); } =20 #ifdef CONFIG_PM_SLEEP --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEC2A3BFE5B; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=a7BxdSWWSCcliZ0xQZ9nKshrfJ6bZNWQvdiM0wOlzGZYJDuHvQ0yq/bx2N4odCRecbSnEnTa5w6PZlUPtzXUKAMjBw18BDJ9Y5uDdFAcMOcOKufYoAzo5imlN90+CB4JWUP4qyg4WEJ+EQYwsw138OiJb9hZ3xh/sbu0nNOC3WA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=m013MwNmUgWVC7z7zyIG+6nePlWTBqWNW5DTkKX3MXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mwVNjH0R1V868fxKOjF0tgE5Rxli11KAjgtN9+HeNMMPkIQ17N1U56Bayni24n5JuQu/TRLuPmecwBbiPkdX5EiE3g0sMFKF/mQJK8fHu2dx/EJbSmAvPJzrtG8DK0ATUJHZNKPBbpVndmfQvlllCJW4LfOSRa5awsSd0SzMtnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qrgRt9C2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qrgRt9C2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 665E0C2BCC7; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=m013MwNmUgWVC7z7zyIG+6nePlWTBqWNW5DTkKX3MXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qrgRt9C25icP/TDVNoEqJ9F006zS/lQG9lQPW1RfSQNz/PDVUyzSNVH/FuUjytE8z MwGASqsIEJxz+Ak2oQ1lh4KfUMU33FscIIZppjRsGGB3sfOugJI9k8wS/080vZtJ3b EwsTGOcvC+drmh3f8TsmM0ctgKPXVutEOsoAMNmjPArtQBTyuSNGfJCUEbH9lcuduR yLXK6X6hGaIz2Fw/EqJQ3ppT4IGQByNzIj/XoSafOifKqjhmCix36XWzbx6zBNmRgP fv2vctDGbkmXGCI187NLe0VnJ5GV3LtLbkQMHLFCcY8kWUkc8JIz0nEu88Rjl7gFTW 7i1zjfgUazBJQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d77-0McG; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Heiner Kallweit Subject: [PATCH 14/20] spi: fsl: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:13 +0200 Message-ID: <20260409120419.388546-15-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 4178b6b1b595 ("spi: fsl-(e)spi: migrate to using devm_ functions to = simplify cleanup") Cc: stable@vger.kernel.org # 4.3 Cc: Heiner Kallweit Signed-off-by: Johan Hovold --- drivers/spi/spi-fsl-spi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index bf3fc3ce0cc2..2681ed8daf2b 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -614,7 +614,7 @@ static struct spi_controller *fsl_spi_probe(struct devi= ce *dev, =20 mpc8xxx_spi_write_reg(®_base->mode, regval); =20 - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret < 0) goto err_probe; =20 @@ -751,7 +751,13 @@ static void plat_mpc8xxx_spi_remove(struct platform_de= vice *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct mpc8xxx_spi *mpc8xxx_spi =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + fsl_spi_cpm_free(mpc8xxx_spi); + + spi_controller_put(host); } =20 MODULE_ALIAS("platform:mpc8xxx_spi"); --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5B5E3C062D; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=gP55dV53Q3l0NwG/zQPw4JLR9TDWFYXm4a8mhKRlmSWLQPqPCdKZb2te6A3uBr78VLHrv/bwBS8PEgsFPiuCg9p3rj2cVeMP5E/rbWBT4QSvFPsdSVjkJjZf7hfujryj0Vw/ve5Jcz3ntFhOq07g4CEsnQyxGI4Qf0TVIBwiNlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=tuNfjIQoyz+Ks6HZ8O/w3x28GoFwiQOi8TzTHCOHUPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Av+zLbTYLnlVeRBNg9jBGORTB75EodwGCVJjWJMdGldXP3O7Kcc/FqYntYyV7YnFcX5hw1j53zjFOfAbxakcVGExH5QW9N9RftUfHNez/SYxImxmc1NW2oOVZsaW023pnELih65nLk/YAUIlK+nZ21bpY2u+j/yL5luZfFmTtG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EbA7+h86; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EbA7+h86" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E511C4AF0F; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=tuNfjIQoyz+Ks6HZ8O/w3x28GoFwiQOi8TzTHCOHUPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EbA7+h86tzlRsMowMUd7a6p2un35IUTKJNtVL+xixsaAPbqf/dFOWUelCsC3GpBhr LUSG5hd1mG9MmjVUChaXZJFqRv2O/thI7wn9QQDKQ0REkr5+vwYKxprvckcMgXCZAS iX/9PBsaoSQaLU1BPGsifs6uhy2L7rAVv9vjE61cKC0k/HNzPDwTC6omxEAjD51WLK NIpz80WpDHcNSBmkIHn/5OAt+t40USwNIWfTv3fLY59Bi0wLHWNVnDY3LhJ2wrfy+7 HrM+oNi9e6pd/1qfVSaBKuLN6EfM+lYJv48KZofvlA1yjjSOa1iLTsDoGaMf8aoXHL wsM8hQ91Qe1mw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d79-0OyI; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Andrew Bresticker Subject: [PATCH 15/20] spi: img-spfi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:14 +0200 Message-ID: <20260409120419.388546-16-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling and releasing underlying resources like clocks and DMA during driver unbind. Fixes: deba25800a12 ("spi: Add driver for IMG SPFI controller") Cc: stable@vger.kernel.org # 3.19 Cc: Andrew Bresticker Signed-off-by: Johan Hovold --- drivers/spi/spi-img-spfi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index 902fb64815c9..57625a3ce2f2 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -643,7 +643,7 @@ static int img_spfi_probe(struct platform_device *pdev) pm_runtime_set_active(spfi->dev); pm_runtime_enable(spfi->dev); =20 - ret =3D devm_spi_register_controller(spfi->dev, host); + ret =3D spi_register_controller(host); if (ret) goto disable_pm; =20 @@ -669,6 +669,10 @@ static void img_spfi_remove(struct platform_device *pd= ev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct img_spfi *spfi =3D spi_controller_get_devdata(host); =20 + spi_controller_get(host); + + spi_unregister_controller(host); + if (spfi->tx_ch) dma_release_channel(spfi->tx_ch); if (spfi->rx_ch) @@ -679,6 +683,8 @@ static void img_spfi_remove(struct platform_device *pde= v) clk_disable_unprepare(spfi->spfi_clk); clk_disable_unprepare(spfi->sys_clk); } + + spi_controller_put(host); } =20 #ifdef CONFIG_PM --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B40BA3BADBC; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=Ei2fZSqi8LkKxWR6ZmOeEMmLLv9Vj2B7q/fTk40wvmNIYW61nlJl+m+As5GSpBA08OJgIIWvoOo5VdsQuG35xdQJcvsbWVfLWF1GRCRKTnkECdUoDw7Qq9B38zFGLWP0JSTsTKy0z05ekQM8CXPczo+vZYA00OSla8HXmLgR96A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=gmUCnOtpHlH2RP6FEbCaeVZvSC4xlg/P2/ypqyFLFxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a74pnPAyWLJsI3k3BfTu/4RmN03ExRO5GMYZV1TbzouN+iEFsLKg0Zz7miuny5xKYQ0LIsphFw+xh1xooXok21CU3q69/roXqDGhKqIFYw7HOjidxYyEr+RpOerHEsDvFnxPhEzWdliKjHp0Fu8UTI2QlABTlRzLwUGOw8++kes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MVaeA2XB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MVaeA2XB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F976C4AF0C; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=gmUCnOtpHlH2RP6FEbCaeVZvSC4xlg/P2/ypqyFLFxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVaeA2XBcXjz0GW/shNX+DY+fqDqD+5+byyoVWjHhkIqIX4YfdXhhZijVnsHEpyQs raOko6H9cvlB9hICc7lDM88w4zKw+1pHaIBrJXPAjWWjd+W/p4b3xOym4voyVwpQWY HWfwUdFmuZA6GvdNW8rkUxBKuc1bAtLbtTUHXjoC0XWFBnAHQqL2Jc7Dte8mA6zzOb Fe1VnL6ZqpMOC9YudjmjTu/+yNWKfdbl2O0VZP5bpqtr3arwBbgacQ50zdUsX+uZpl u2g2Nr8RkES3f1Anrdlb2uGHlfpVniUMmyGN4HkZ7onWciLVIJyHmVHvb+VXs3KoQi mrnUzdE/BBaKQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7B-0RGc; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 16/20] spi: lantiq-ssc: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:15 +0200 Message-ID: <20260409120419.388546-17-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before releasing underlying resources like clocks during driver unbind. Fixes: 17f84b793c01 ("spi: lantiq-ssc: add support for Lantiq SSC SPI contr= oller") Cc: stable@vger.kernel.org # 4.11 Cc: Hauke Mehrtens Signed-off-by: Johan Hovold --- drivers/spi/spi-lantiq-ssc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c index f83cb63c9d0c..75b9af8cb5db 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c @@ -994,7 +994,7 @@ static int lantiq_ssc_probe(struct platform_device *pde= v) "Lantiq SSC SPI controller (Rev %i, TXFS %u, RXFS %u, DMA %u)\n", revision, spi->tx_fifo_size, spi->rx_fifo_size, supports_dma); =20 - err =3D devm_spi_register_controller(dev, host); + err =3D spi_register_controller(host); if (err) { dev_err(dev, "failed to register spi host\n"); goto err_wq_destroy; @@ -1016,6 +1016,10 @@ static void lantiq_ssc_remove(struct platform_device= *pdev) { struct lantiq_ssc_spi *spi =3D platform_get_drvdata(pdev); =20 + spi_controller_get(spi->host); + + spi_unregister_controller(spi->host); + lantiq_ssc_writel(spi, 0, LTQ_SPI_IRNEN); lantiq_ssc_writel(spi, 0, LTQ_SPI_CLC); rx_fifo_flush(spi); @@ -1024,6 +1028,8 @@ static void lantiq_ssc_remove(struct platform_device = *pdev) =20 destroy_workqueue(spi->wq); clk_put(spi->fpi_clk); + + spi_controller_put(spi->host); } =20 static struct platform_driver lantiq_ssc_driver =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C33A23BD63B; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=bIqD2618eRjGKG7COrgmQuWI8dctfknK96Qa345DiuqNXYj+LoY44CJljE+sewQfH0o6AfqdZ15JYddfYIGIMvN9f/4sJ6Au3LOjslGofBmhkLFYXtnIacOOnO/JhD8r99AEuizp7TTd9kQ/zARylbJPk1wXmx0kufmPSMbZALY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=WBPrRuAmAQ/zlEaKZ9bjdjO4z8ffnisBNAnRXlbfIHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aoEQztVKCrhiOuCAxzqs6P3oKRO0n7q2O6SI+nUhGze/fES9EHmTMoQMUXqYxQzDJL4ASjhpZEg2cU7vtaD7mPWlPpYLHcrOY+WyjKHR3Uu7JqtxGoDd6A65QZUMp56dPkUOIasSzrnrZzPMh9DaxPR3q0C3pJuudIjq0g8zHCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s0E497hQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s0E497hQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65E5EC2BCC6; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=WBPrRuAmAQ/zlEaKZ9bjdjO4z8ffnisBNAnRXlbfIHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0E497hQZSoWwZQ6DZXGcAHpCcTaGxeP1vqkNgziLgr5xNax4jY2zKZIIdnuYgkhm 0y7AbLeNziHy5YvDRIJyELjr9lTm8tXsIt7XkNsFoNhCTB0Zhr2Mp91+BeQu716SyC RLh6TnQ7DiBu8ipA4H7SL8mVdTdxp7Wl52U9WSyDFitISArQ6jFISWdWR4i7ERhzSR S17QP+aXLcMoxH7SER1p0whmcb+1GcOuIYHOBOoTFcE4yxb1JAhtTodCF2LhrY3slG Ty+HBhvruXOp7Lv0LatjDiu2Vat6C6iNkOzZhMEhN4lKomrf5vBov9A3uHsIufG2OD GO32R3cYWmGNA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7D-0Tgw; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Neil Armstrong Subject: [PATCH 17/20] spi: meson-spicc: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:16 +0200 Message-ID: <20260409120419.388546-18-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: 454fa271bc4e ("spi: Add Meson SPICC driver") Cc: stable@vger.kernel.org # 4.13 Cc: Neil Armstrong Signed-off-by: Johan Hovold --- drivers/spi/spi-meson-spicc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index 57768da3205d..b80f9f457b66 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -1081,7 +1081,7 @@ static int meson_spicc_probe(struct platform_device *= pdev) } } =20 - ret =3D devm_spi_register_controller(&pdev->dev, host); + ret =3D spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "spi registration failed\n"); goto out_host; @@ -1099,8 +1099,14 @@ static void meson_spicc_remove(struct platform_devic= e *pdev) { struct meson_spicc_device *spicc =3D platform_get_drvdata(pdev); =20 + spi_controller_get(spicc->host); + + spi_unregister_controller(spicc->host); + /* Disable SPI */ writel(0, spicc->base + SPICC_CONREG); + + spi_controller_put(spicc->host); } =20 static const struct meson_spicc_data meson_spicc_gx_data =3D { --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E80913C2765; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; cv=none; b=mhfTNfArzgrzQIQs/iuKFJX1YedTYJFX6sj+tLzBgwrMSEJ5451VDgfY2sfrwiE9WznYW31hIv0lyEMenZy3s/2Vjf9UWmy3N8VlVC5jpUPMh8x+49dYUbtB3i7vG0GD65ThxdtzwfHikaR8j/Nbe6L/yZM0qm9NOkysF8muSCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; c=relaxed/simple; bh=2KNfJnA46W3qlgDrPGdTrCw4e1Cl0KMREmMjES5TO4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GvvQ7ue9LIjfEYqROw/yArkGcYVsAlH1NWuS6ngRo0gJMwXOWVInNclk0vf7LDSccZb9NElJwEdbkASonMnsBH/62vuITzm7O5eEDjoFJgKSf+ENpyX4LwDlbkX4mEDVt9Qwr5ru6g6CexdcxJgw4RMnZlpC7avYl385c9MejBA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q4IvigfN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q4IvigfN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74129C2BCF5; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=2KNfJnA46W3qlgDrPGdTrCw4e1Cl0KMREmMjES5TO4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q4IvigfNOt3Srbkzd2lP5K8sLhNBkpeW+Jtch1NtBW4kmw6bU1Lyrsji5xg+maVfB PhAgA3mbLr62V97E3Yi1E5SdWc0RKztwZhIWenppAp9qbHtSNco7hPXNOnE9g8Aqef mV1iDPBhvpy5eDUgPWZtZ/EeYdL+I/p5YFUXisautGihB122D1WRwbOCczWuMY50Wa Vl0VZfgknOJexQEyFu5EbSJI4efH0mYWZhQzJCzIEyEEH4keKL1SydLYyNxkN90Zxb yHvnVKhRA0PdBUMNhZ9vhUYN7DcnuIdnhtRxCQeDtaT8RKNmu+apHvgIsPjGBUHIrH eJOY7Tew5m5DQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7F-0W6T; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Naga Sureshkumar Relli Subject: [PATCH 18/20] spi: microchip-core-qspi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:17 +0200 Message-ID: <20260409120419.388546-19-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 8596124c4c1b ("spi: microchip-core-qspi: Add support for microchip f= pga qspi controllers") Cc: stable@vger.kernel.org # 6.1 Cc: Naga Sureshkumar Relli Signed-off-by: Johan Hovold Acked-by: Conor Dooley --- drivers/spi/spi-microchip-core-qspi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microc= hip-core-qspi.c index aafe6cbf2aea..eab059fb0bc2 100644 --- a/drivers/spi/spi-microchip-core-qspi.c +++ b/drivers/spi/spi-microchip-core-qspi.c @@ -692,7 +692,7 @@ static int mchp_coreqspi_probe(struct platform_device *= pdev) return -ENOMEM; =20 qspi =3D spi_controller_get_devdata(ctlr); - platform_set_drvdata(pdev, qspi); + platform_set_drvdata(pdev, ctlr); =20 qspi->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(qspi->regs)) @@ -732,7 +732,7 @@ static int mchp_coreqspi_probe(struct platform_device *= pdev) ctlr->num_chipselect =3D 2; ctlr->use_gpio_descriptors =3D true; =20 - ret =3D devm_spi_register_controller(&pdev->dev, ctlr); + ret =3D spi_register_controller(ctlr); if (ret) return dev_err_probe(&pdev->dev, ret, "spi_register_controller failed\n"); @@ -742,9 +742,13 @@ static int mchp_coreqspi_probe(struct platform_device = *pdev) =20 static void mchp_coreqspi_remove(struct platform_device *pdev) { - struct mchp_coreqspi *qspi =3D platform_get_drvdata(pdev); - u32 control =3D readl_relaxed(qspi->regs + REG_CONTROL); + struct spi_controller *ctlr =3D platform_get_drvdata(pdev); + struct mchp_coreqspi *qspi =3D spi_controller_get_devdata(ctlr); + u32 control; =20 + spi_unregister_controller(ctlr); + + control =3D readl_relaxed(qspi->regs + REG_CONTROL); mchp_coreqspi_disable_ints(qspi); control &=3D ~CONTROL_ENABLE; writel_relaxed(control, qspi->regs + REG_CONTROL); --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4A173BB9FC; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=nvjxT8IfNzRJ81M2nxR26oLYJC/ZZoPsOrpkF+HwopeZ7Y7WkEHGDuTC+aM/ttSQrVkeB8YkgwL4vfRfhp6PVCC5acNC5aXus81yP0UKtu4BuSMqiFj9ZcH7TONms8Es0rNAFxwx43rHA6kHZ8S4bkqOQFL7Gfr6X0CSnK0ME0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=2uxiTHf7+/Jq9Yfc9KZLO7wTUuJPnmq2OheP+99yRUM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=arq77VjadJPK/2QLpQF0STOWoTa13dhiw3yroMV7DHUbNEgwzAGz2ghbP4qRT7sAzgEJJmQGmNT/o5h8euCnUlsVPoO0axqyHpmNSDcRxhDGJbq6ImznwyoGLx4EE3TC7vC7dKZbDDINiedSoGeFUdj+mgDN1A38FkHc1BASe6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n/rBVe8w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="n/rBVe8w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E3B6C2BCB8; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=2uxiTHf7+/Jq9Yfc9KZLO7wTUuJPnmq2OheP+99yRUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/rBVe8wc6VfAWlBoPfgX8EzDkI9BQK8Wwp4cxxpBvtNR3bieUGR7Oy++nCM0qMyu AIv4HefHJn95pz79VMahvHbvOVpJDaNRaZnYruEBSd9m7Gz8wTLLHhJ8DrtcgrM4NM acY0HfoXUHvjYcaVdrfKX9ri3wHY1davvVxeG8MlQVcvqwqpm8LaBI/8DmCt6ie4sK 4YjlLY50fII1BijPt18AU+4qOTkFGTRbcKxqDOBGeLmlIgSbJM+HMUbuVZjRBPglht a2bmBkZesYVUp/kdp4r0C+erKDXEw/XfgjHvS7UeF+LP3a058ewCpl8Pr/B3V7gEmH LTynMjDiYfofw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7H-0YU0; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Prajna Rajendra Kumar Subject: [PATCH 19/20] spi: microchip-core-spi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:18 +0200 Message-ID: <20260409120419.388546-20-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 059f545832be ("spi: add support for microchip "soft" spi controller") Cc: stable@vger.kernel.org # 6.19 Cc: Prajna Rajendra Kumar Signed-off-by: Johan Hovold Acked-by: Conor Dooley --- drivers/spi/spi-microchip-core-spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-microchip-core-spi.c b/drivers/spi/spi-microch= ip-core-spi.c index a4c128ae391b..be01c178e2b0 100644 --- a/drivers/spi/spi-microchip-core-spi.c +++ b/drivers/spi/spi-microchip-core-spi.c @@ -384,7 +384,7 @@ static int mchp_corespi_probe(struct platform_device *p= dev) =20 mchp_corespi_init(host, spi); =20 - ret =3D devm_spi_register_controller(dev, host); + ret =3D spi_register_controller(host); if (ret) { mchp_corespi_disable_ints(spi); mchp_corespi_disable(spi); @@ -399,6 +399,8 @@ static void mchp_corespi_remove(struct platform_device = *pdev) struct spi_controller *host =3D platform_get_drvdata(pdev); struct mchp_corespi *spi =3D spi_controller_get_devdata(host); =20 + spi_unregister_controller(host); + mchp_corespi_disable_ints(spi); mchp_corespi_disable(spi); } --=20 2.52.0 From nobody Mon Jun 15 09:32:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3D1E3C3444; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; cv=none; b=ARIuEFW2LEjrBqkjbG+6vdI5ToObextA3UMzHtU2kN28d0pHYfEt5UvO+OTVrl1a0MYJc1BI+xMdr+vdBrWFz5Er5lVmCcstCLdGwBOn5TIhfjFrwdMWpWUuQfWG3F1OQ14GLnB7AYewm9jvvPD+g3dSUmjYtpOtoJ7mKbQw2Ak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; c=relaxed/simple; bh=+7HUP2x3eChcguKGttuSuj2E873EeFIoS7RjFCEZxvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YIOqUsrRilo1ToRaJpD4lH1cx/Jo5uJABGObSYk/tc2mmsNoobs0eGQcmo7VV/2vuf+ga8sYPcA3tmWaoPKcd8Xuu2wHPJCLXmRZep4+CH5+v4MW5vBKDzt9cmKwbrahk+yRHOJPRBAd9KdEhLROy4tQp4XI+c5+aOWG5wSV29s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KWiGwXaC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KWiGwXaC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BF8EC2BCFF; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=+7HUP2x3eChcguKGttuSuj2E873EeFIoS7RjFCEZxvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWiGwXaCOCUyBqKfFiionYUWWSkcgdcSEUluduv2VHpqPnrc/tWWkHMICBZc+L72O 7gccoy1pzZyV9IjrOKHXHZ626s2nQpB0Ako7z8VgZdgNu/BDcBJ/G0NeXZRht0+mjw FGwmkq7CtXYeYbkFqps2yoT+YrdCwOosUOnkbQnzlcOjuYvgGVz6bsorWRtyKnQ3g+ eR5lSSKiXV+gpsp2cXBJvfNbs6xe8jDEKOiJiVrLtKYRX3yv+ge1Co8RLIBw6+FIK8 w/4EeUFRPVc7xrWKyUWih2et+oQXG/uOV6/vvrOsihhEbkkmgkl8lXuqfMgXljfg6F R1H37WyTU+96g== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7J-0aoc; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Conor Dooley Subject: [PATCH 20/20] spi: mpfs: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:19 +0200 Message-ID: <20260409120419.388546-21-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers") Cc: stable@vger.kernel.org # 6.0 Cc: Conor Dooley Signed-off-by: Johan Hovold Acked-by: Conor Dooley --- drivers/spi/spi-mpfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-mpfs.c b/drivers/spi/spi-mpfs.c index 64d15a6188ac..989a379b0700 100644 --- a/drivers/spi/spi-mpfs.c +++ b/drivers/spi/spi-mpfs.c @@ -574,7 +574,7 @@ static int mpfs_spi_probe(struct platform_device *pdev) =20 mpfs_spi_init(host, spi); =20 - ret =3D devm_spi_register_controller(&pdev->dev, host); + ret =3D spi_register_controller(host); if (ret) { mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); @@ -592,6 +592,8 @@ static void mpfs_spi_remove(struct platform_device *pde= v) struct spi_controller *host =3D platform_get_drvdata(pdev); struct mpfs_spi *spi =3D spi_controller_get_devdata(host); =20 + spi_unregister_controller(host); + mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); } --=20 2.52.0