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 7F7103321B1 for ; Wed, 13 May 2026 18:20:22 +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=1778696422; cv=none; b=QM5D2SrAOxobaglC+Ylbl+yMVFCnIR7yc8APR/wjtRWOprlout6cirkrp50aiob+7vbUVSILL5bDOcNADkmesxMaqYicQy+Fq0k90ynvfYFXqsSHbad858Ad8CO2FaH2t3FpftzutwE0BkDg5BQDrESJtCHplLgIqCcnhYCZSFs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778696422; c=relaxed/simple; bh=GUekj2NCxCvvwjCuhpWe4wc0snSZwM1XXJI1ZzXv93U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b2c6ps12PyYJbCXl0aWyRh4Al2wu4PLP3O38ziBDxygkVS5oRVerj8PYxvYgXl2NAo8xfCpEPy70FTYpSyP5+S4RV6JsZnkBnrHptNwiXUBb+k8hARdzOVFqJXlgEXz24HYPeBjcsgyAnRUcF+H3lQizhv+GG0Z7MmF9y25g7bc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R75mvBlS; 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="R75mvBlS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C596BC2BCC9; Wed, 13 May 2026 18:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778696422; bh=GUekj2NCxCvvwjCuhpWe4wc0snSZwM1XXJI1ZzXv93U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R75mvBlSvE7xdJ9qkKYe8q7yfSF152aO513XnrgA93Y2TuFqrwlutXJV/8QFYo/mf igWUqQgkfUHc8ZY1JC/oD+QjIbhOVPYz66E5dHfhqenbCiPlgQzDNrwMzGVy5K8R8H SXSgczgKlDQDiprIQMESk5V51TVlJ2nmSgA1nj+/ZEQZeB757sXbFr08HKOzza1qAf wWjrAgxxB9lEPE5Xrus2QfL6mYpdegX5c+MGjnJRAntkViWn41gwmWAdfNhRQZ6h0X OlYWgBKqM3LWoCIIY4cDjwV2EP5f3VbnI1Ah4yloxeNhzJBsJBpBHm7ziaf1gYNZwz bkrx5gU4yqwhQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Sebastian Andrzej Siewior , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y 4/4] spi: ti-qspi: fix controller deregistration Date: Wed, 13 May 2026 14:20:17 -0400 Message-ID: <20260513182017.3918352-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513182017.3918352-1-sashal@kernel.org> References: <2026051215-exclusion-jargon-8c4e@gregkh> <20260513182017.3918352-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 49146009ea426..52949d409a297 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -896,7 +896,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; @@ -911,19 +911,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