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 129E94CA278; Fri, 15 May 2026 16:16:49 +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=1778861809; cv=none; b=Qopju/S6n5oihk16FB+Yn+3BMTlRIN/gFMPjoekoEz8msQU+QN5m3wtZ69Tf3rKWOkoRgacnpdi5b0F9E8WogX+W4cWvIFhUxKyPwvJdUxlDpKfZBMyYs7s4w7DeXEko+O8yzIWOWlh+BGzcox1o5dOIFzvgdzlaPWNGOqjA96Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861809; c=relaxed/simple; bh=z2ToMcHDAFv7awkHyteBeHJoOxEUSpQJa8cuZvADAyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BYGMt4GkiW9AnC2OS/dW/rAZKFb62bkX6ygtfVtjg3ftSbzxUSdfmuanrsmYpYKAk6fsQFi6/T24L3Fo6LbYbQu777UhwoXNQrJ3d9GKfMfnrAlfSyijwhBooHu8jizPBZ7p3NJHcw5R16DyZbiW8VZS7P4IdJKQamcBj/E2D8A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k0TOQiP8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="k0TOQiP8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 978F2C2BCB0; Fri, 15 May 2026 16:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861808; bh=z2ToMcHDAFv7awkHyteBeHJoOxEUSpQJa8cuZvADAyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k0TOQiP8xIlDz7eObEzt4GWxXJ7xodIkb/zslJkMpZC9w8arf0iSJMwq44dEaSuPw Ygdij7eQiEICVRH4d9Fxwriz/ErLFkDCdx9NP4fCGldgp+v2VpXuwZD5Yb++CD/zOX yiPtep6PruWISkyu/fN3V2gOSA7blfG3Qj4y1nB8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sebastian Andrzej Siewior , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 6.6 429/474] spi: ti-qspi: fix controller deregistration Date: Fri, 15 May 2026 17:48:58 +0200 Message-ID: <20260515154724.351989856@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-ti-qspi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -895,7 +895,7 @@ no_dma: 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 @@ free_host: 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 = {