From mboxrd@z Thu Jan 1 00:00:00 1970 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 BBD7A3A6F07 for ; Wed, 13 May 2026 18:08:46 +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=1778695726; cv=none; b=PkvkUXTq9GQM9IZ/dnF+WfRDOREC4Y1HUBxeOS82M/7qkbEpteerVy9RMNPJaLRTWo/mI4NNu4M50qk3AMraaY77a3ZjxpB2ADjJmX9Bbr4h6U0j+XISGmnzBt1jFXWWMOdg0VSnTMfTyN6PS86VoMH/B3FmDeg4JwQ6Y8/kFm4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778695726; c=relaxed/simple; bh=pAFXd/TSLSk0/aezEDlm406RngCKPHGDw7oqU7L0+bE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xj5/IoMHH166pTb8sfxKSw2+qXIuL5io4cAl/CMTFrcM4YiCi2FWcHV7Y30j9NFBVqCpEXPL5SHeNlkKZ/wP9i/jYkMnIvATTCGmjhtDqo0rMfEK+tnoDtA7uQ+ezMLrw9KKJDTuy3r3RJe72O1nUPhX8yvOjuVi3qgdbG3nGnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uercv1Mb; 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="uercv1Mb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFD82C4AF09; Wed, 13 May 2026 18:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778695726; bh=pAFXd/TSLSk0/aezEDlm406RngCKPHGDw7oqU7L0+bE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uercv1Mb3e7pB8cefZHUEAlj93Gy4X+01PNn1sb/QUOL8267NB5m4zF1lfCp/a7AD d6CWm8a2l80ptAIrn3+1r4qHcoSrVHSOxtoXdcfBslPOL564k+JZNYaqrgtxgJ/Ndc J+e/22g5Ivsq6yRS7qw62vLcGVkorY9B7dgd79TQZC3iRYTi6GafEN1dIczNxIHm7z u4eKUVjIRwMT8X5e5rOJOCLTbw1zbX5fXURb3qBUmO0X4WDfqUh6Pd5LIz5PTY9L1Z HH212pw07Dk0QayLCj3+iywojhHIXrIM9Y3KBse1kPpablK+Bol9Gl623xI/r+4OVd 4lKVME6g3VPZQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Sebastian Andrzej Siewior , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y 3/3] spi: ti-qspi: fix controller deregistration Date: Wed, 13 May 2026 14:08:42 -0400 Message-ID: <20260513180842.3912849-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513180842.3912849-1-sashal@kernel.org> References: <2026051215-earache-outdated-a817@gregkh> <20260513180842.3912849-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Note that the controller is suspended before disabling and releasing resources since commit 3ac066e2227c ("spi: spi-ti-qspi: Suspend the queue before removing the device") which avoids issues like unclocked accesses but prevents SPI device drivers from doing I/O during deregistration. Fixes: 3b3a80019ff1 ("spi: ti-qspi: one only one interrupt handler") Cc: stable@vger.kernel.org # 3.13 Cc: Sebastian Andrzej Siewior Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-24-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-ti-qspi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index d9ce878389da9..e0459fd4d549b 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -895,7 +895,7 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->mmap_enabled = false; qspi->current_cs = -1; - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (!ret) return 0; @@ -910,19 +910,17 @@ static int ti_qspi_probe(struct platform_device *pdev) static void ti_qspi_remove(struct platform_device *pdev) { struct ti_qspi *qspi = platform_get_drvdata(pdev); - int rc; - rc = spi_controller_suspend(qspi->host); - if (rc) { - dev_alert(&pdev->dev, "spi_controller_suspend() failed (%pe)\n", - ERR_PTR(rc)); - return; - } + spi_controller_get(qspi->host); + + spi_unregister_controller(qspi->host); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); ti_qspi_dma_cleanup(qspi); + + spi_controller_put(qspi->host); } static const struct dev_pm_ops ti_qspi_pm_ops = { -- 2.53.0