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 68C00BE46; Tue, 8 Jul 2025 16:47:47 +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=1751993267; cv=none; b=nBUnOvuXjJ4GYhIpml0K+n7mGGy+Si/ZZMy9SgtNfSXmapFoGVbz5AMuHHVHMNRwys7+/qZmetVEeO7w/49byNxjEWtFhV1NF62g/kO0ggaDjrVXZlZhudpzleIT/rgqPLDX5wBWeqho0cOjqaFV2/xhwueufZZDGK/04w60eZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751993267; c=relaxed/simple; bh=xddW8fvts2LWgi5SkMCQ48yWCN0JMKqWhDuEJ5PlwTQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K4peZPvYCt1rORxiFKN8E7PjJh4IbwyQGSJyYU9fwyGRbw46cLK+vPsGgT/3W13H7dcAteXWxtCk8Jf6aLoVSBXXbHxRPMUwaVq020m71EpannSY9x+oFjOC8VH/BVVPzCjpIjvHeLKqNMM+0geKEQYWrSkT3hDB38lF5pm9E9I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TjlfWQR7; 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="TjlfWQR7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E631EC4CEED; Tue, 8 Jul 2025 16:47:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751993267; bh=xddW8fvts2LWgi5SkMCQ48yWCN0JMKqWhDuEJ5PlwTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TjlfWQR7QE1ju3hoRs8iyCD4ULHDcp2+kuDAgb0SN+U5faguR3YY63oqpRk/hLA2f lWnNXWJKTL5DDZjnZUWY0VcHLDTUm0DjlL9w+EtdS3QdafzowQevCZho2Kqzeg/e5k BumqMVS6J/ODnMRR8SLojPb9XQxeUd22uU3DofWk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Erick Shepherd , Adrian Hunter , Jonathan Liu , Salvatore Bonaccorso , Ulf Hansson Subject: [PATCH 6.15 016/178] Revert "mmc: sdhci: Disable SD card clock before changing parameters" Date: Tue, 8 Jul 2025 18:20:53 +0200 Message-ID: <20250708162236.970748390@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250708162236.549307806@linuxfoundation.org> References: <20250708162236.549307806@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ulf Hansson commit dcc3bcfc5b50c625b475dcc25d167b6b947a6637 upstream. It has turned out the trying to strictly conform to the SDHCI specification is causing problems. Let's revert and start over. This reverts commit fb3bbc46c94f261b6156ee863c1b06c84cf157dc. Cc: Erick Shepherd Cc: stable@vger.kernel.org Fixes: fb3bbc46c94f ("mmc: sdhci: Disable SD card clock before changing parameters") Suggested-by: Adrian Hunter Reported-by: Jonathan Liu Reported-by: Salvatore Bonaccorso Closes: https://bugs.debian.org/1108065 Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20250624110932.176925-1-ulf.hansson@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2065,15 +2065,10 @@ void sdhci_set_clock(struct sdhci_host * host->mmc->actual_clock = 0; - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - if (clk & SDHCI_CLOCK_CARD_EN) - sdhci_writew(host, clk & ~SDHCI_CLOCK_CARD_EN, - SDHCI_CLOCK_CONTROL); + sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); - if (clock == 0) { - sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); + if (clock == 0) return; - } clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock); sdhci_enable_clk(host, clk);