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 F0874333434 for ; Thu, 14 May 2026 18:50:18 +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=1778784619; cv=none; b=XaqrFmZnpGfPH15EH347dTAFVOE267OvXmH+vn9MpDLqJJrmFVQhrspp08XUWDFj4ugKyWfk5vjj7JQUUYIcC6IpBIYI9+xlvUsXajH14b859cUY5iqq3Jj6AZzdXmnbg7fc5ZeyB/LWUdeIZMWgefnL1pX9dQzjEz35dB1Ml5c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778784619; c=relaxed/simple; bh=roKcjPhSIDBS6NeTQpqSeyW9DiM4tvnejgJQ/PbIJ6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hv/FcHohwXk7c1V7xlcopsGlDDCRM6NGJX6M7wNIgZvfAYjneQUFqhxeqNvRtJRYYkoyzpCTIEP2JO3yFYLTm9U+BuxEyCOvlzQyxm16MQWAqMiS6pdbMZbL25L/oPjHuSMTyLa2czwJWUZFFelDUuuil5nbLyy7Gt056tLmoS4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XR6JgmTE; 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="XR6JgmTE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 100DAC2BCB3; Thu, 14 May 2026 18:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778784618; bh=roKcjPhSIDBS6NeTQpqSeyW9DiM4tvnejgJQ/PbIJ6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XR6JgmTE2E6xZqSgZcsvmYKuqueD24XKVCwwEHJ1478rbKZkZCgrh4F9U2xk/8QsF NyaX8frF0wKNabyuy5rzj0xsZ9pfxNEixFqdXJ2RNbVbx5LmuqiSHmUYEpImBCch/L kz6ZtF2Yc2752tFoKtAPPP1jYdLj8ohOZ8YJFcNWJxVpaQeR99WGT5fKdNgRHQD0o8 LHkiweTjrbQUCfbuUfIrD3bNfA33hrJhhzo7tEEcesOL+bRBZ3ja6M6ybB88GMn8nD UAEWPaNBfIUKLME/51oXinvz2kbEJg7MNAUlQWTsvEy9Dpa+Kl+jJVGs4BT0KJKawT HNP2Vd7K8dO/g== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Naga Sureshkumar Relli , Conor Dooley , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y 3/3] spi: microchip-core-qspi: fix controller deregistration Date: Thu, 14 May 2026 14:50:14 -0400 Message-ID: <20260514185014.948789-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260514185014.948789-1-sashal@kernel.org> References: <2026051251-distaste-stardom-583e@gregkh> <20260514185014.948789-1-sashal@kernel.org> 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 e6464140d439f2d42f072eb422a5b1fec470c5a6 ] 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 Signed-off-by: Sasha Levin --- drivers/spi/spi-microchip-core-qspi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c index 0e44683d5ab5e..160861891b460 100644 --- a/drivers/spi/spi-microchip-core-qspi.c +++ b/drivers/spi/spi-microchip-core-qspi.c @@ -512,7 +512,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) "unable to allocate master for QSPI controller\n"); 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)) @@ -545,7 +545,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) SPI_TX_DUAL | SPI_TX_QUAD; ctlr->dev.of_node = np; - 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"); @@ -555,9 +555,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); -- 2.53.0