From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 65DDA3F4DCC for ; Wed, 20 May 2026 15:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779290302; cv=none; b=kOjVZCr9+0G8Fn1cB/wMsU9pug0vC5hiWULq8v8C0kHluEo30Yx/8I8w5abvzOOs4WFc/Xx1joXhsLbok5EKPwVgZdR5EtgdKNvA9AxREkf4HIBd/xBqyR69Ky8qO+YnqL4jwoU52rAYKMLRg7FtboWMdb14/nlFqmTauRAboQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779290302; c=relaxed/simple; bh=tvQzNcgYJuWiwJYrbrcog5quYwRzSKcabHNAwmsbrQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MBFdWziIQAxD0OY6BRUiXmfzglMFV3ebJqPLHFiNqFRgHbDpEEfxCEAjC+L12hDOW+4omZOMV2uLJis6wSHD6B/B3IKdYlCpcfLRE1IXeKNLmUMH9XFMJf8D2KR9Oma2wicvbH9pOYdEVgAocl4fWOeun+Dh00L+Chw9gwgrP0k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DgnX+XtG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DgnX+XtG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 876281F000E9; Wed, 20 May 2026 15:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779290301; bh=cDpInlaDz/xIlGdRK3/AaVijUnTBxOzExYWxaX25Xig=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DgnX+XtGS8YFREcM5iJ1CI4Z6RV4eCx5ENFRTLtC9/ZCZy2CLb41npl6g6swDIBlN cv8Z1Zd1zCtiANyV4pFSUVqbKnthSjWGeTYP3JWeaUiFulk56mue6TO25N+lzTnXZP RVulbq9gYlJWvyr1kyA9XDRq5Q5DbCWKrGnH2WQP4wucjMvdhjpPcSR45r40EtSnuk QWFAA/O5/x0bwLCUULdJi5zle1taVCQXj1Teqmwq5hzemWTBdr/uPSd2YTTOzRBT6c b9IGOmqT9WYq3pB8MR5uOABdLOYyJN2aCXO1QjDkoA/OX8MGxNfyg72EIlCp9kgJBY RVhaS/mH9wPTg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Yash Shah , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y 2/2] spi: sifive: fix controller deregistration Date: Wed, 20 May 2026 11:18:18 -0400 Message-ID: <20260520151818.3912903-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520151818.3912903-1-sashal@kernel.org> References: <2026051547-backside-sermon-2557@gregkh> <20260520151818.3912903-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 0f25236694a2854627c1597465a071e6bb6fe572 ] Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Note that clocks were also disabled before the recent commit 140039c23aca ("spi: sifive: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 484a9a68d669 ("spi: sifive: Add driver for the SiFive SPI controller") Cc: stable@vger.kernel.org # 5.1 Cc: Yash Shah Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-15-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sifive.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 6964d287ae141..683dce55ef302 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -393,7 +393,7 @@ static int sifive_spi_probe(struct platform_device *pdev) dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n", irq, host->num_chipselect); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret < 0) { dev_err(&pdev->dev, "spi_register_host failed\n"); goto put_host; @@ -412,8 +412,14 @@ static void sifive_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct sifive_spi *spi = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + /* Disable all the interrupts just in case */ sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0); + + spi_controller_put(host); } static int sifive_spi_suspend(struct device *dev) -- 2.53.0