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 6084A325491 for ; Wed, 20 May 2026 12:55:45 +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=1779281747; cv=none; b=pQgOO+p0bfPFwcvy5BnJ1hgXzMgqoRcsvz8ukB4XIPLMAHSSPnS5pgEhLFOGRMmBD4So3VfSvDNQyQrH6ST48gOc0zkUCkB1zGC8yMYMUjgkm9yGn3rqmHuzL9pohQ9NHwUqHtX0v5cJ2D75UolwYkUuLHwuCQUEZPEvMf4nSM8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779281747; c=relaxed/simple; bh=MZd7OL5pfY+eQGLeTzP+5RuZXAwX+rSzFUdvjdr30kk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XMMjJ98f5jQF8qqph6pCb127xD6JFpz+EnAG8FGp+hjeBivc11qMSelexB9uJmQCR7h/7tT9AOkwztf212dQJquajcgGF3sea06TBFxgP7tKV412g6HNdglRIQYdB5M115lSq9etCWy52BMOzzPHmLQX9LS5JDPLrjdck8SND9s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=co5cvViX; 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="co5cvViX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89AB91F00893; Wed, 20 May 2026 12:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779281744; bh=57Aoy6OfTSW8Mo/XArrpPOKXUjZPohbNgKd43hSFUNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=co5cvViXmk+CJ//PArwTvlWc8NpXkz+PtqRdJsnefMhBBWhhiPrDbp60SxPBMwxo5 t/L0pb+uo4nlZQZBBGzE18PYGH41A119vWx81uDpxl1/Jy50xRWOzivndRHbNhcZ0v L/4rO66L6bE1AbC+BZdhcG7T7VgyG0lsBA/zTQFAKIwsFvR+bWQGWn/kKOfYdOJdBz /j8BBqktKpu8vgrAlCS1z9T1t5ns+iUTaz8Ou+HZ8TgXn91kcGN/amHmBiX7Zk9K6M cRDdrTwD/VYabrLpLFdeumg9yzlHvfvLIjmFbjltg4snGZEBVqRP5ZHXnEpWurioal CvdvE3NcVesTA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Yash Shah , Mark Brown , Sasha Levin Subject: [PATCH 7.0.y 2/2] spi: sifive: fix controller deregistration Date: Wed, 20 May 2026 08:55:41 -0400 Message-ID: <20260520125541.3536279-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520125541.3536279-1-sashal@kernel.org> References: <2026051546-gestation-vessel-153b@gregkh> <20260520125541.3536279-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 54adbc057af62..74a3e32fd2b5d 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -392,7 +392,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; @@ -411,8 +411,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