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 49E923E51E1 for ; Fri, 15 May 2026 08:29:31 +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=1778833771; cv=none; b=ZWgK+1uir9cNvbu50bNkNrGNT7ojRbYColFDWefySitF4yzEB9scUWcHCiUPPAuavHrlvN11Tgy7CyeO+hyRR+ytnzMUoqwYXikX3dgsm29pMx6N/mHEBii7xTqqTu3/jbpGnFzdXw4emey7yRmey/oPE0chgR2P4OSbJ7JJUng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833771; c=relaxed/simple; bh=2yQ98kwNjuX9opooFF6H8/MEVuybgiDoCs8W5fHDHSI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Sw/WOj5R0HGJfhk29ph/VoU3kARMqhOir7Ay6zPZa2iJb3VkPKHsPdA/D2AIvjAdX+XAakilTsovAewp6JAWVaATv6jNHGgTdZEAbqWmRY6k46mTY/nR1X2kvZ5KQD3A0Kj4W28+EdpihQOv8P2D2y/TQ8bn2nguytIlIOM9qWM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eaK8BnUu; 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="eaK8BnUu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8872C2BCB0; Fri, 15 May 2026 08:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833771; bh=2yQ98kwNjuX9opooFF6H8/MEVuybgiDoCs8W5fHDHSI=; h=Subject:To:Cc:From:Date:From; b=eaK8BnUuYcKFwBzaW/0/RaAQmSUAkqU/0Ge4MhdGkUv1dDcSa2j6NiTmqXlh+UEsS rIunfZJpTvH3sLqe4Y7MdqrfQzP/P6V9jYqKbbxpEKAx+vMSzxHtkWlTM1vK4xYtDg RWihVy5PvKfrq0qt8qILCzIHkP5IQoNQBD9pbjyU= Subject: FAILED: patch "[PATCH] spi: cavium-thunderx: fix controller deregistration" failed to apply to 6.6-stable tree To: johan@kernel.org,broonie@kernel.org,jan.glauber@gmail.com Cc: From: Date: Fri, 15 May 2026 10:29:12 +0200 Message-ID: <2026051512-parasite-livestock-87e1@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 dbb6b01267c0c866eaac4019cec19f414beec61d # git commit -s git send-email --to '' --in-reply-to '2026051512-parasite-livestock-87e1@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From dbb6b01267c0c866eaac4019cec19f414beec61d Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:08 +0200 Subject: [PATCH] spi: cavium-thunderx: fix controller deregistration Make sure to deregister the controller before disabling it to avoid hanging or leaking resources associated with the queue when the queue non-empty. Fixes: 7347a6c7af8d ("spi: octeon: Add ThunderX driver") Cc: stable@vger.kernel.org # 4.9 Cc: Jan Glauber Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-10-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c index 99aac40a1bba..f1a9aa696c87 100644 --- a/drivers/spi/spi-cavium-thunderx.c +++ b/drivers/spi/spi-cavium-thunderx.c @@ -70,7 +70,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, host); - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret) goto error; @@ -90,8 +90,14 @@ static void thunderx_spi_remove(struct pci_dev *pdev) if (!p) return; + spi_controller_get(host); + + spi_unregister_controller(host); + /* Put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); + + spi_controller_put(host); } static const struct pci_device_id thunderx_spi_pci_id_table[] = {