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 E5AFE2AE9A; Mon, 2 Jun 2025 14:44:55 +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=1748875496; cv=none; b=ZSa9bXlJf8HVI7Koew74znX1vPaJnX7t1+CZ2sj68Flhncd8tRrHl4cem7/R3QfAvxqZjWu4DFZc/GFm6w4B+GRAS/Lt3iwqN8/Jyw9gu30YZEhpdltxlFkSjq/vfnIhStXhASaTDYIbSJ/D45nmXGubh27SOJQC0NYpk+TKERc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748875496; c=relaxed/simple; bh=7sDEC8hg29sIwhau3z9cv71VUoIEBBz8p93DrFMrWuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sQwIZrD0V4rSRtfKDY+5LrQ5iy+FzkA7CIPCcA2lAKlxrK890Q/Y6enmViFSMH6LcOjgHTSIyXxx79+rr40W6syK8mdIQDFgtAjV+793dHVtnkjCvD1Rg7nlvEZGlxRfWe1TkO68WL1lnK6cL1njNy4UZOyuRKGLcrLDlS/aMCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sYDWBZKw; 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="sYDWBZKw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B9F0C4CEEB; Mon, 2 Jun 2025 14:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748875495; bh=7sDEC8hg29sIwhau3z9cv71VUoIEBBz8p93DrFMrWuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYDWBZKwgd/KsQ61+gKAnBZax72Tu/Xf9FSPNu7c1LpYJWmlaQ/3owj+PlSfuUtMZ 0fJ9VVUz2x0IHCTzAV7bvrKHMwur1me9wJasDftWrfoE4hISfC6yZWjrU1B0Q/WNM+ T2n8Z+ngmZBG4iOwwrjfG7F+G2tfQplaU56mOgLo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kyle Roeschley , Brad Mouring , Erick Shepherd , Adrian Hunter , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 152/270] mmc: sdhci: Disable SD card clock before changing parameters Date: Mon, 2 Jun 2025 15:47:17 +0200 Message-ID: <20250602134313.436379076@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134307.195171844@linuxfoundation.org> References: <20250602134307.195171844@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Erick Shepherd [ Upstream commit fb3bbc46c94f261b6156ee863c1b06c84cf157dc ] Per the SD Host Controller Simplified Specification v4.20 ยง3.2.3, change the SD card clock parameters only after first disabling the external card clock. Doing this fixes a spurious clock pulse on Baytrail and Apollo Lake SD controllers which otherwise breaks voltage switching with a specific Swissbit SD card. Signed-off-by: Kyle Roeschley Signed-off-by: Brad Mouring Signed-off-by: Erick Shepherd Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20250211214645.469279-1-erick.shepherd@ni.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9091930f58591..3d601a3f31c1e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2010,10 +2010,15 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) host->mmc->actual_clock = 0; - sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); + clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if (clk & SDHCI_CLOCK_CARD_EN) + sdhci_writew(host, clk & ~SDHCI_CLOCK_CARD_EN, + SDHCI_CLOCK_CONTROL); - if (clock == 0) + if (clock == 0) { + sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); return; + } clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock); sdhci_enable_clk(host, clk); -- 2.39.5