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 1978C399889 for ; Tue, 12 May 2026 13:47:54 +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=1778593675; cv=none; b=rSSqUGMjITZD2FkUzXPsJ9o4NO+mmrHotwVV2w5N0MqponG9KitP2eP47hYm5y5Z+vfZDuTMnF77WFckfT5hLoyJMdow34EruHNg7NBiPefxauiSeJYx2MDXG0MHFHR3nZArTCYa1/0xXK3C3z8Qt/KSHBVc8/3m9+oy/nOeHjw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778593675; c=relaxed/simple; bh=HIgORDiYuZMObKbMlGuw1A9FcBJs0BCQ+KZW3itBEYc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Df4M/E1R98PcPxTZuiRm0tO65wGKYk/v0vM8wk0Wel6OZ528ty0kEifAnjEe+n7xvYSylbz7nghAkzYRHFTQ9axhH+mcjVHB9hiYeuodN0QqWK0uxtqUpT7NSYapwgBTkLYcWxJjNWYlqdtvaxJpA6nTlLSJK8XxFfVcNF2DrMQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yKn5MyZq; 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="yKn5MyZq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 526A6C2BCB0; Tue, 12 May 2026 13:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778593674; bh=HIgORDiYuZMObKbMlGuw1A9FcBJs0BCQ+KZW3itBEYc=; h=Subject:To:Cc:From:Date:From; b=yKn5MyZqUSAieq+aYXsezPLLcmp0Qx7pN59VADvooKnukBlF1rtVCUFwkluQD+ADI cFD0/Ix//gxFLowr8Q/B+ZbG2snY5yVJdDJ0FWekHachgdTi9F7fqaue1QlJtb69cr ba1XgtX0VivZy8lm+y2xpwDTkJNCygWRhQOZ3pzA= Subject: FAILED: patch "[PATCH] spi: microchip-core-qspi: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,conor.dooley@microchip.com,nagasuresh.relli@microchip.com Cc: From: Date: Tue, 12 May 2026 15:47:51 +0200 Message-ID: <2026051251-distaste-stardom-583e@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 e6464140d439f2d42f072eb422a5b1fec470c5a6 # git commit -s git send-email --to '' --in-reply-to '2026051251-distaste-stardom-583e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6464140d439f2d42f072eb422a5b1fec470c5a6 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:17 +0200 Subject: [PATCH] spi: microchip-core-qspi: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 8596124c4c1b ("spi: microchip-core-qspi: Add support for microchip fpga qspi controllers") Cc: stable@vger.kernel.org # 6.1 Cc: Naga Sureshkumar Relli Signed-off-by: Johan Hovold Acked-by: Conor Dooley Link: https://patch.msgid.link/20260409120419.388546-19-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c index aafe6cbf2aea..eab059fb0bc2 100644 --- a/drivers/spi/spi-microchip-core-qspi.c +++ b/drivers/spi/spi-microchip-core-qspi.c @@ -692,7 +692,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) return -ENOMEM; qspi = spi_controller_get_devdata(ctlr); - platform_set_drvdata(pdev, qspi); + platform_set_drvdata(pdev, ctlr); qspi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(qspi->regs)) @@ -732,7 +732,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) ctlr->num_chipselect = 2; ctlr->use_gpio_descriptors = true; - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) return dev_err_probe(&pdev->dev, ret, "spi_register_controller failed\n"); @@ -742,9 +742,13 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) static void mchp_coreqspi_remove(struct platform_device *pdev) { - struct mchp_coreqspi *qspi = platform_get_drvdata(pdev); - u32 control = readl_relaxed(qspi->regs + REG_CONTROL); + struct spi_controller *ctlr = platform_get_drvdata(pdev); + struct mchp_coreqspi *qspi = spi_controller_get_devdata(ctlr); + u32 control; + spi_unregister_controller(ctlr); + + control = readl_relaxed(qspi->regs + REG_CONTROL); mchp_coreqspi_disable_ints(qspi); control &= ~CONTROL_ENABLE; writel_relaxed(control, qspi->regs + REG_CONTROL);