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 9505343E4BA; Tue, 16 Jun 2026 16:22:31 +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=1781626952; cv=none; b=A8wH7K5R5UWaM9/2ddjCcLBKe26M2sXLpeL8TSbbsKbZaEYDK3Tp8+zNm2NAVA21EpbCO4QQIf8FdGNZT61/UZeIhWFr6xH8EiqPW3c9Yauqflav0mE8DWNW4HOQz2LQtvrE7k29VqkKvhTzD42kbx2w+f/uWkZnOPnzyL59R4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781626952; c=relaxed/simple; bh=6uUhRmkGEK3nRPB934ylBdSlZEY1n7YWOAbcDH55Eig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bLGbiYHcSg8eXco/sQxeYDmC5oy1BvVJlNtdHf/8adECFQdQQDtMeaPmC11pIxTrJO0E+RAAqkdQh01FVQa8qzaBZEBHRFs3XYMoVcCGSA1PXtz9L1tXheZMNzh9Ob71RkQ4OHNRMwFvZNnGbcpHSlHylJONLi4lppIt1GJ89DI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Onc0UIwc; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Onc0UIwc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B3C01F000E9; Tue, 16 Jun 2026 16:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781626951; bh=jIvsIjr2P8BKMCIK4zSIljlIlO4hWonp5+IEBZX+/kM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Onc0UIwcMQ888JI/PcjES29mj1EdkMANM8wEH6AiA0TyjTPvYtMs8P1F3fbCWIA7k 77dof/VcDiayeXBT316QvXbrQCQ6xpFtKngwzGXUe9SdNeWwCWhcKKXvY2jUeQ0P5b +ZpMNUD6vC0zwmkr1j3A+4RO+RSVRTpO8Q+o/e00= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dhruva Gole , Johan Hovold , Mark Brown , Robert Garcia , Sasha Levin Subject: [PATCH 6.12 067/261] spi: cadence-quadspi: fix unclocked access on unbind Date: Tue, 16 Jun 2026 20:28:25 +0530 Message-ID: <20260616145048.237489809@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145044.869532709@linuxfoundation.org> References: <20260616145044.869532709@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit 233db2cb14db8b1935dda52a6affd97276462b82 ] Make sure that the controller is runtime resumed before disabling it during driver unbind to avoid an unclocked register access. This issue was flagged by Sashiko when reviewing a controller deregistration fix. Fixes: 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") Cc: stable@vger.kernel.org # 6.7 Cc: Dhruva Gole Link: https://sashiko.dev/#/patchset/20260414134319.978196-1-johan%40kernel.org?part=2 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260421125354.1534871-4-johan@kernel.org Signed-off-by: Mark Brown [ Context adaptation performed. ] Signed-off-by: Robert Garcia Signed-off-by: Sasha Levin --- drivers/spi/spi-cadence-quadspi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 72262b6fb62b43..da8401261bbc3e 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -2013,13 +2013,14 @@ static void cqspi_remove(struct platform_device *pdev) cqspi_wait_idle(cqspi); spi_unregister_controller(cqspi->host); - cqspi_controller_enable(cqspi, 0); if (cqspi->rx_chan) dma_release_channel(cqspi->rx_chan); - if (pm_runtime_get_sync(&pdev->dev) >= 0) + if (pm_runtime_get_sync(&pdev->dev) >= 0) { + cqspi_controller_enable(cqspi, 0); clk_disable(cqspi->clk); + } if (cqspi->is_jh7110) cqspi_jh7110_disable_clk(pdev, cqspi); -- 2.53.0