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 4C01B39E9C5 for ; Tue, 12 May 2026 12:47:51 +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=1778590071; cv=none; b=S6GDCaruWmR4wALdIZlLoCZ/aKe3kYRUSgWmmSGjYaUGsLep7QNZw0ZHQkItpQsgGBqdl2WcrychMFbzBiZSiLc0cDdiz453DiK1Ol1oFNiJNJ0woPFTBKvslM/0aA+PK7s4nQBs4gDBzrnJEtwIdxOOASAC3C9rX7oiEoPE7To= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590071; c=relaxed/simple; bh=XCDuYCQmppeVDBxHl5/Ke9VaqP3lSiW7TcpxiXb8Olw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=t+dsUnrYW1pHWf/9WGTANVOOIkZ+JI2kmhNT0CuuJWVhC/Qa/7/k4qhz8BNtigMOXdJciYVP8+i/iOYRl2kAYtTs6Op5CzFro1PWsrxJ2/dUhJhXjDeshNGLPP9coloTCSJJl7wBI/s+JUR7DxCgiYZBXXPYWg8fKS0HsP8Y6Ck= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JYRW2Cqp; 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="JYRW2Cqp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8100C2BCB0; Tue, 12 May 2026 12:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590071; bh=XCDuYCQmppeVDBxHl5/Ke9VaqP3lSiW7TcpxiXb8Olw=; h=Subject:To:Cc:From:Date:From; b=JYRW2CqpGBRGUn3N/h0hTZzkBsurhftL/keV3ql6RUIt7vsKn+TR6YJ9jspZ3lhda VYbxW7esWIjCJzu1mzAwsDQYRl6Ws5VAT7va9TRZ1wuAe0+iiSrdu3SlnpEmu4GavA xxWyJOwy01f7dX0ApVGFXcM4JjPQa5j8m6VCGllE= Subject: FAILED: patch "[PATCH] spi: ti-qspi: fix controller deregistration" failed to apply to 6.6-stable tree To: johan@kernel.org,bigeasy@linutronix.de,broonie@kernel.org Cc: From: Date: Tue, 12 May 2026 14:46:15 +0200 Message-ID: <2026051215-earache-outdated-a817@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea # git commit -s git send-email --to '' --in-reply-to '2026051215-earache-outdated-a817@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:53 +0200 Subject: [PATCH] spi: ti-qspi: fix controller deregistration 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 diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index d1d880a8ed7d..1fbd710d616f 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -888,7 +888,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; @@ -903,19 +903,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 = {