From nobody Wed Jun 17 01:32:57 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 BF0FC212D7C; Tue, 21 Apr 2026 14:39:40 +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=1776782380; cv=none; b=SnBkukDUOsgzQGzy+Iq0RXxvTVTJNR1VlNugdIcc+6iWmXI2ZhVqS9Fxu8LsDDOFfvP+nv64IRH1y0K468quMaQmnZrm+mQ6h5C1dAOl5ymHm5R2QkntYstzKYOeP6mSH14EI6Kxs0m21n5vc6ix9XSbsHCAdt2r2l7MI7tjxA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776782380; c=relaxed/simple; bh=3kXk5bQkW8ZHGa/eebV3Ad1vkWgg5LsbbMFNDeYGrqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jENvi2QAhdKzrT4xkd0SQspDz2Wy7cfxBNM5DORidcRCDjZdYLj1/x4/4dEMGN8dLIbAYTE8xI3xysS90g7jPsHbLSZ3J04P9nJ20Fl3/OhdlLMrB/0ZRQuqYHKsYhvCcwMuyXw8bHDT2I8cV+F2yBW9X9S4NzaRg2pRnObjkpk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bQmrcFGq; 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="bQmrcFGq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 827DFC2BCB8; Tue, 21 Apr 2026 14:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776782380; bh=3kXk5bQkW8ZHGa/eebV3Ad1vkWgg5LsbbMFNDeYGrqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bQmrcFGqba/gRMjzSuJUmMSbmnseBFA+7JJIYzs2ebjyiSDhiq8LhuG5Emc7z3efE 3ECCK9bPY2UjDKpAryp+S36X3BL40Jb4KJlZIre34myzg37dO6tMxVIHfxU4frn9WX GmOfOwNOtaWe19nMVDnF30w/A09LC9vTGNbWGu/kYgIUSQydRmj3qNnil/bXqntLbT PHC/WR9q1DRKmkVnkTnipXc1jsHLxEWJNHvrj4JFPfyYt+ifC61AfkgT30YiJWbror 8sG7AEadsWgTgBRPgsJHZuAL72aGOfqVqBmrcLrLm3wSfuGiTSVL89uhZkj06ae6R5 SkB8PvToWRFyw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wFCGI-00000006VhG-19tL; Tue, 21 Apr 2026 16:39:38 +0200 From: Johan Hovold To: Mark Brown Cc: Vladimir Moravcevic , Tzu-Hao Wei , Swark Yang , Prasad Bolisetty , Harshit Shah , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/3] spi: axiado: fix runtime pm imbalance on probe failure Date: Tue, 21 Apr 2026 16:39:23 +0200 Message-ID: <20260421143925.1551781-2-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260421143925.1551781-1-johan@kernel.org> References: <20260421143925.1551781-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 that the controller is active before disabling clocks on late probe failure and on driver unbind to avoid a clock disable imbalance. Also make sure that the usage count is balanced on probe failure (e.g. probe deferral) so that the controller can be suspended when a driver is later bound. Note that the runtime PM state can only be set when runtime PM is disabled. Fixes: e75a6b00ad79 ("spi: axiado: Add driver for Axiado SPI DB controller") Cc: stable@vger.kernel.org # 7.0 Cc: Vladimir Moravcevic Signed-off-by: Johan Hovold --- drivers/spi/spi-axiado.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-axiado.c b/drivers/spi/spi-axiado.c index dc55c55ae63c..6449b376a3a8 100644 --- a/drivers/spi/spi-axiado.c +++ b/drivers/spi/spi-axiado.c @@ -842,8 +842,6 @@ static int ax_spi_probe(struct platform_device *pdev) =20 ctlr->bits_per_word_mask =3D SPI_BPW_MASK(8); =20 - pm_runtime_put_autosuspend(&pdev->dev); - ctlr->mem_ops =3D &ax_spi_mem_ops; =20 ret =3D spi_register_controller(ctlr); @@ -852,11 +850,16 @@ static int ax_spi_probe(struct platform_device *pdev) goto clk_dis_all; } =20 + pm_runtime_put_autosuspend(&pdev->dev); + return ret; =20 clk_dis_all: - pm_runtime_set_suspended(&pdev->dev); pm_runtime_disable(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + pm_runtime_dont_use_autosuspend(&pdev->dev); + clk_disable_unprepare(xspi->ref_clk); clk_dis_apb: clk_disable_unprepare(xspi->pclk); @@ -877,10 +880,14 @@ static void ax_spi_remove(struct platform_device *pde= v) struct spi_controller *ctlr =3D platform_get_drvdata(pdev); struct ax_spi *xspi =3D spi_controller_get_devdata(ctlr); =20 + pm_runtime_get_sync(&pdev->dev); + spi_unregister_controller(ctlr); =20 - pm_runtime_set_suspended(&pdev->dev); pm_runtime_disable(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + pm_runtime_dont_use_autosuspend(&pdev->dev); =20 clk_disable_unprepare(xspi->ref_clk); clk_disable_unprepare(xspi->pclk); --=20 2.52.0 From nobody Wed Jun 17 01:32:57 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 BF19A3A4F58; Tue, 21 Apr 2026 14:39:40 +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=1776782380; cv=none; b=KqWYPW2jQESHebv2YWphnURvGVzSIQh6XdkZg+fwsn5qwP7y3lnHv1jwXJAnjMhARDRQiPDSFI+oJsMVqWHuZOTLqhCV2NI5v1mikmAc6Uejkjdn7QVsP9mUKv30ymz75hsSIKPBiyJDBTGRnUgm4hGyU1RV0iTZBW/G/Pj7xCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776782380; c=relaxed/simple; bh=a/92PbNgAa9NhdPLCqXs6cqKx0gXdh1h2JC/Z7rvKqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qh2tMxBLmapm8Wxm7MaZI8EnF3SkGV2D1pkPYqAPZppUAHYQCoSWlpQuFMCy4jEGcPGrrwFZBI0C95GQygYII7SCfIA0AnOkqtFCF249+bwdQV5hNgOS3stBq33Lg+b7a4mHA7LQIbnzl1nvQhszxVBLfySDzkHrNk/JJVdFyJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WizirZwB; 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="WizirZwB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75CB9C2BCB0; Tue, 21 Apr 2026 14:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776782380; bh=a/92PbNgAa9NhdPLCqXs6cqKx0gXdh1h2JC/Z7rvKqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WizirZwBADjxFphe0smYTkYpEssxvI5LGE4nqZbMeQZJeo+kXvJF+KDu8IylvhJxa H9HRQVuW74FqgKacobLzw7dRxh6VSFkGLYy7BZVrgVDTCP1S8rdAjEPO2uVF1oCpJL fCbs39GnnTMDDT+hzLMe2bDpr2anqTL0/0CI7oIaeoj/NCCqMG9BjncM/nl431O1Ay TynjmKFiB/u5QYAucUwrkwdb1ptr8k0yo2t/cD9zkqsz8DFUGRCJjYnxmIc8/W7Bgz Gth6khUdHk87OSTdY+n30ZRi+dxZIawAHxNRb9zEpkwekl3N4Yt5falm5pZ8hmWf6T q5e36W9k5PQYQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wFCGI-00000006VhI-1DFi; Tue, 21 Apr 2026 16:39:38 +0200 From: Johan Hovold To: Mark Brown Cc: Vladimir Moravcevic , Tzu-Hao Wei , Swark Yang , Prasad Bolisetty , Harshit Shah , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/3] spi: axiado: rename probe error labels Date: Tue, 21 Apr 2026 16:39:24 +0200 Message-ID: <20260421143925.1551781-3-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260421143925.1551781-1-johan@kernel.org> References: <20260421143925.1551781-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" Rename the probe error labels after what they do. Signed-off-by: Johan Hovold --- drivers/spi/spi-axiado.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-axiado.c b/drivers/spi/spi-axiado.c index 6449b376a3a8..a347774ae824 100644 --- a/drivers/spi/spi-axiado.c +++ b/drivers/spi/spi-axiado.c @@ -785,7 +785,7 @@ static int ax_spi_probe(struct platform_device *pdev) ret =3D clk_prepare_enable(xspi->ref_clk); if (ret) { dev_err(&pdev->dev, "Unable to enable device clock.\n"); - goto clk_dis_apb; + goto err_disable_apb; } =20 pm_runtime_use_autosuspend(&pdev->dev); @@ -815,7 +815,7 @@ static int ax_spi_probe(struct platform_device *pdev) irq =3D platform_get_irq(pdev, 0); if (irq <=3D 0) { ret =3D -ENXIO; - goto clk_dis_all; + goto err_disable_rpm; } =20 ret =3D devm_request_irq(&pdev->dev, irq, ax_spi_irq, @@ -823,7 +823,7 @@ static int ax_spi_probe(struct platform_device *pdev) if (ret !=3D 0) { ret =3D -ENXIO; dev_err(&pdev->dev, "request_irq failed\n"); - goto clk_dis_all; + goto err_disable_rpm; } =20 ctlr->use_gpio_descriptors =3D true; @@ -847,21 +847,21 @@ static int ax_spi_probe(struct platform_device *pdev) ret =3D spi_register_controller(ctlr); if (ret) { dev_err(&pdev->dev, "spi_register_controller failed\n"); - goto clk_dis_all; + goto err_disable_rpm; } =20 pm_runtime_put_autosuspend(&pdev->dev); =20 return ret; =20 -clk_dis_all: +err_disable_rpm: pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); =20 clk_disable_unprepare(xspi->ref_clk); -clk_dis_apb: +err_disable_apb: clk_disable_unprepare(xspi->pclk); =20 return ret; --=20 2.52.0 From nobody Wed Jun 17 01:32:57 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 BF3433D5259; Tue, 21 Apr 2026 14:39:40 +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=1776782380; cv=none; b=PTuRMDwFbj4O2B5g3p/chyvUeCczHaZfjyfOVNkrW9maAxuzaC5gC3UCXKCZRbfdAx7uroeESQE3+o+B+I7dgwte5UW5TqvbRlHYoE1KSOe53KmGf3igRmrYv9DrZ4VDMrHp4FrZknW2fqIL3WRQ40C5CKkaJynJqwPsCz1hplE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776782380; c=relaxed/simple; bh=fHWcE/+n7LqtpmgMfWsn150j5v8p3oOvZ78DZvaakpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YK8r/KtwUZlni+15lOlJ2DfGlno2WW45+UEaavKUwR0lmarBtH2H5hFYVa9aDQDHxkEDiNnFE0uCuhOFvFNaCGd3NYBXeSuN8S/pkCn9J+HEEjvsRsjNha52P8VYjk2Zj4dfhlHGa2oo1+FkzrCYk/pX4UpTmajyO3b4B63M5qs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kHAFGcJA; 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="kHAFGcJA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F614C2BCB7; Tue, 21 Apr 2026 14:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776782380; bh=fHWcE/+n7LqtpmgMfWsn150j5v8p3oOvZ78DZvaakpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kHAFGcJA6m6yhRE7MT1URPlhlPLyzrKY6mz5ds2NRSMha6dOVHPMD+SwmPKljZhBv aPovLgUN3D4aDGLSjfH9Jf02JzcOU2R6tJLe/9Po++xJLH5nbq1TkvGkk1NzIC6ZMO wV7+kjzCiTZSv3j6cXKglfiG3m4BZbhCpkM7L5mye5xGYtvD4rrcNj875wo9ck+xHm Ycfh5Nu5oJkBmzAj31+MOZynw6PjQ5DbGW+JTo3sNjmVBn4G8eM7eolBZO7+5LkDkP bSJvojvs8e8QIMrJBZgMmXEmEHwF76aQbO5qhmVdnE1viYRVQEUXZpUyPyT5002ch+ 6J0a+bXJ2XiRA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wFCGI-00000006VhK-1GkN; Tue, 21 Apr 2026 16:39:38 +0200 From: Johan Hovold To: Mark Brown Cc: Vladimir Moravcevic , Tzu-Hao Wei , Swark Yang , Prasad Bolisetty , Harshit Shah , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/3] spi: axiado: clean up probe return value Date: Tue, 21 Apr 2026 16:39:25 +0200 Message-ID: <20260421143925.1551781-4-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260421143925.1551781-1-johan@kernel.org> References: <20260421143925.1551781-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" Drop the redundant initialisation and return explicit zero on successful probe to make the code more readable. Signed-off-by: Johan Hovold --- drivers/spi/spi-axiado.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-axiado.c b/drivers/spi/spi-axiado.c index a347774ae824..9057a0a8df4a 100644 --- a/drivers/spi/spi-axiado.c +++ b/drivers/spi/spi-axiado.c @@ -751,9 +751,9 @@ static const struct spi_controller_mem_ops ax_spi_mem_o= ps =3D { */ static int ax_spi_probe(struct platform_device *pdev) { - int ret =3D 0, irq; struct spi_controller *ctlr; struct ax_spi *xspi; + int ret, irq; u32 num_cs; =20 ctlr =3D devm_spi_alloc_host(&pdev->dev, sizeof(*xspi)); @@ -852,7 +852,7 @@ static int ax_spi_probe(struct platform_device *pdev) =20 pm_runtime_put_autosuspend(&pdev->dev); =20 - return ret; + return 0; =20 err_disable_rpm: pm_runtime_disable(&pdev->dev); --=20 2.52.0