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 C25F62D739C for ; Thu, 14 May 2026 03:10:08 +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=1778728208; cv=none; b=cEbl5ES55YH6svMu4xDbh8YHeafZ6v/R7swiCVf6W7Z6KU7Kk54PatQPOB4nBo6LuJ9q2H6cFyY0T5/SSFrxcRNA7akVKg0aF7Wg7LM9iQoHhkL4XtwasiYSfqqps41ISiC56ZcRCs05ahEPd7+HdI/Ykj9fPfAYkxcZInFy5Ek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778728208; c=relaxed/simple; bh=FNUnWFO2gz/OZVSBk84RYZD/FnHHJxd0ZJfinivtiw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MFTnMBLkR2sJB5PWcaoGTiJJwnPRC/qjztoN37apNKdW+Drq6yZR7fs+QWlt3yMUVxx3lN2phAS4EVkVwZ/G2rqeOgN/iJOFgCNdwRuP66BpeYgxLONml16ycMD1S/ATOMFapVp69zbBBAumTZ/cyR2QscNVS3RXYwUdzL17dRM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S9fzbhpW; 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="S9fzbhpW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1E71C19425; Thu, 14 May 2026 03:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778728208; bh=FNUnWFO2gz/OZVSBk84RYZD/FnHHJxd0ZJfinivtiw0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S9fzbhpWimUDPCMDmSIXLhJMDlkpcSckKxxi7Xod4faCLhwZPX4EVDyCATwHvGk3/ KCkSlP7vmTRgP1Awd1t3yRVONFp5JBvPDcm+XltH2raU5EECvWq8MZ+YCa+Go0TUQO KAudD6Zk22kQ+WhjEWeSlZ0npnpR6+vyHNpp2qBRMYvmg7nPk+FEdupDavdy9gcgor OSBeVK6KqCxSbP4RfKeyVjfneHN/H76cYJYfeGdSgFYdnbIt2OrkwJEqEOv8UJSG+4 P8aadNUMNEc8gkOC6a9mIXO7uXkFeD71xYATuIQjxjRxj6EspihvCl8IMk39Lxklgk BWwmxpLShK1OA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Sebastian Andrzej Siewior , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: ti-qspi: fix controller deregistration Date: Wed, 13 May 2026 23:10:05 -0400 Message-ID: <20260514031006.4117436-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051216-outboard-easel-dbcb@gregkh> References: <2026051216-outboard-easel-dbcb@gregkh> 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 [ renamed spi_controller_*/host APIs to spi_master_*/master and kept remove() returning int ] Signed-off-by: Sasha Levin --- drivers/spi/spi-ti-qspi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index 081da1fd3fd7e..3d1488bfcd082 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -894,7 +894,7 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->mmap_enabled = false; qspi->current_cs = -1; - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (!ret) return 0; @@ -909,17 +909,18 @@ static int ti_qspi_probe(struct platform_device *pdev) static int ti_qspi_remove(struct platform_device *pdev) { struct ti_qspi *qspi = platform_get_drvdata(pdev); - int rc; - rc = spi_master_suspend(qspi->master); - if (rc) - return rc; + spi_master_get(qspi->master); + + spi_unregister_master(qspi->master); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); ti_qspi_dma_cleanup(qspi); + spi_master_put(qspi->master); + return 0; } -- 2.53.0