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 8D3C43FF8A1 for ; Fri, 15 May 2026 08:29:07 +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=1778833747; cv=none; b=n06JDpPhI+/p+ZLv2rg+eEvWbXTyhct56lb9c5HEBPQx6D19sP8jAtZJtVtCD/qNWAOFCieWSfOEN/3rADexvHDdQWjHVQ8vBKwq3ZKRjuKcsuhr+xGdTA7+fHLTfB+8ghCQtxrrI2ZpERFoZinqiXphx5UQr/aq75Rb/EH+ItM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833747; c=relaxed/simple; bh=QdQ/qTZB94RoA0UhlCuRaAslF9imelD60NpIex0583s=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=q3RVqFbvVbTYkqmbguLYVqyl5P7o2IpZZm/J4x8TqgEfiO7DxikBCKRp3fTQkXWAbly3uFYquTxoQ+sTvjpWIX+3HtgqdGoLpdoIJcaLDGTYFTFbpaJkHl5lZrF+akEHeV9rPviVY17CWwCBH2stJb0kEcg7WaxLDnQiENS7JDI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0KZBwZCF; 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="0KZBwZCF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA748C2BCC7; Fri, 15 May 2026 08:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833747; bh=QdQ/qTZB94RoA0UhlCuRaAslF9imelD60NpIex0583s=; h=Subject:To:Cc:From:Date:From; b=0KZBwZCFdeu2P5qb8iMlnj6rrQpdT07VnNH2empn3V/goziDuGbGr6atAI28ICKyP mhtUL5QeDWIcasm2aJfQ/9pCXNTwCe60dVUAzF8wF1BoajutKOyC6doU5n57SL8sdr B827broh9hN/7KkViFQRRwPBIkDAty3S4rMedMr8= Subject: FAILED: patch "[PATCH] spi: bcm63xx-hsspi: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,jonas.gorski@gmail.com Cc: From: Date: Fri, 15 May 2026 10:28:33 +0200 Message-ID: <2026051533-perm-stallion-042e@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.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x ab837c51899d7595c1165a45dfb631facad49461 # git commit -s git send-email --to '' --in-reply-to '2026051533-perm-stallion-042e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ab837c51899d7595c1165a45dfb631facad49461 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:05 +0200 Subject: [PATCH] spi: bcm63xx-hsspi: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind to allow SPI drivers to do I/O during deregistration. Note that clocks were also disabled before the recent commit e532e21a246d ("spi: bcm63xx-hsspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 7d255695804f ("spi/bcm63xx-hsspi: use devm_register_master()") Cc: stable@vger.kernel.org # 3.14 Cc: Jonas Gorski Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-7-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index 266eabd3715b..e935e8ab9cfd 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -857,7 +857,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) } /* register and we are done */ - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret) goto out_sysgroup_disable; @@ -880,9 +880,15 @@ static void bcm63xx_hsspi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct bcm63xx_hsspi *bs = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + /* reset the hardware and block queue progress */ __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG); sysfs_remove_group(&pdev->dev.kobj, &bcm63xx_hsspi_group); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP