* [PATCH v3 2/3] mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function
2025-09-11 2:40 [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Ben Chuang
@ 2025-09-11 2:41 ` Ben Chuang
2025-09-11 6:14 ` Adrian Hunter
2025-09-11 2:42 ` [PATCH v3 3/3] mmc: sdhci-pci-gli: GL9767: Fix initializing the UHS-II interface during a power-on Ben Chuang
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Ben Chuang @ 2025-09-11 2:41 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson
Cc: victor.shih, ben.chuang, HL.Liu, SeanHY.Chen, benchuanggli,
victorshihgli, linux-mmc, linux-kernel, stable
From: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Fix calling incorrect sdhci_set_clock() in __sdhci_uhs2_set_ios() when the
vendor defines its own sdhci_set_clock().
Fixes: 10c8298a052b ("mmc: sdhci-uhs2: add set_ios()")
Cc: stable@vger.kernel.org # v6.13+
Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
---
v3:
* kepp "host->clock = ios->clock;" to part1.
v2:
* remove the "if (host->ops->set_clock)" statement
* add "host->clock = ios->clock;"
v1:
* https://lore.kernel.org/all/20250901094046.3903-1-benchuanggli@gmail.com/
---
drivers/mmc/host/sdhci-uhs2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
index 18fb6ee5b96a..c459a08d01da 100644
--- a/drivers/mmc/host/sdhci-uhs2.c
+++ b/drivers/mmc/host/sdhci-uhs2.c
@@ -295,7 +295,7 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
else
sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);
- sdhci_set_clock(host, ios->clock);
+ host->ops->set_clock(host, ios->clock);
host->clock = ios->clock;
}
--
2.51.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/3] mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function
2025-09-11 2:41 ` [PATCH v3 2/3] mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function Ben Chuang
@ 2025-09-11 6:14 ` Adrian Hunter
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Hunter @ 2025-09-11 6:14 UTC (permalink / raw)
To: Ben Chuang, ulf.hansson
Cc: victor.shih, ben.chuang, HL.Liu, SeanHY.Chen, victorshihgli,
linux-mmc, linux-kernel, stable
On 11/09/2025 05:41, Ben Chuang wrote:
> From: Ben Chuang <ben.chuang@genesyslogic.com.tw>
>
> Fix calling incorrect sdhci_set_clock() in __sdhci_uhs2_set_ios() when the
> vendor defines its own sdhci_set_clock().
>
> Fixes: 10c8298a052b ("mmc: sdhci-uhs2: add set_ios()")
> Cc: stable@vger.kernel.org # v6.13+
> Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> v3:
> * kepp "host->clock = ios->clock;" to part1.
>
> v2:
> * remove the "if (host->ops->set_clock)" statement
> * add "host->clock = ios->clock;"
>
> v1:
> * https://lore.kernel.org/all/20250901094046.3903-1-benchuanggli@gmail.com/
> ---
> drivers/mmc/host/sdhci-uhs2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
> index 18fb6ee5b96a..c459a08d01da 100644
> --- a/drivers/mmc/host/sdhci-uhs2.c
> +++ b/drivers/mmc/host/sdhci-uhs2.c
> @@ -295,7 +295,7 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> else
> sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);
>
> - sdhci_set_clock(host, ios->clock);
> + host->ops->set_clock(host, ios->clock);
> host->clock = ios->clock;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] mmc: sdhci-pci-gli: GL9767: Fix initializing the UHS-II interface during a power-on
2025-09-11 2:40 [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Ben Chuang
2025-09-11 2:41 ` [PATCH v3 2/3] mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function Ben Chuang
@ 2025-09-11 2:42 ` Ben Chuang
2025-09-11 6:14 ` [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Adrian Hunter
2025-09-12 13:34 ` Ulf Hansson
3 siblings, 0 replies; 6+ messages in thread
From: Ben Chuang @ 2025-09-11 2:42 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson
Cc: victor.shih, ben.chuang, HL.Liu, SeanHY.Chen, benchuanggli,
victorshihgli, linux-mmc, linux-kernel, stable
From: Ben Chuang <ben.chuang@genesyslogic.com.tw>
According to the power structure of IC hardware design for UHS-II
interface, reset control and timing must be added to the initialization
process of powering on the UHS-II interface.
Fixes: 27dd3b82557a ("mmc: sdhci-pci-gli: enable UHS-II mode for GL9767")
Cc: stable@vger.kernel.org # v6.13+
Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
v3: add Acked-by tag.
v2:
* use sdhci_gl9767_uhs2_phy_reset() instead of
sdhci_gl9767_uhs2_phy_reset_assert() and sdhci_gl9767_uhs2_phy_reset_deassert()
* add comments for set/clean PCIE_GLI_9767_UHS2_CTL2_FORCE_RESETN and
PCIE_GLI_9767_UHS2_CTL2_FORCE_PHY_RESETN_VALUE
* use usleep_range() instead of mdelay()
v1:
* https://lore.kernel.org/all/20250901094224.3920-1-benchuanggli@gmail.com/
---
drivers/mmc/host/sdhci-pci-gli.c | 68 +++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
index 3a1de477e9af..b0f91cc9e40e 100644
--- a/drivers/mmc/host/sdhci-pci-gli.c
+++ b/drivers/mmc/host/sdhci-pci-gli.c
@@ -283,6 +283,8 @@
#define PCIE_GLI_9767_UHS2_CTL2_ZC_VALUE 0xb
#define PCIE_GLI_9767_UHS2_CTL2_ZC_CTL BIT(6)
#define PCIE_GLI_9767_UHS2_CTL2_ZC_CTL_VALUE 0x1
+#define PCIE_GLI_9767_UHS2_CTL2_FORCE_PHY_RESETN BIT(13)
+#define PCIE_GLI_9767_UHS2_CTL2_FORCE_RESETN_VALUE BIT(14)
#define GLI_MAX_TUNING_LOOP 40
@@ -1179,6 +1181,65 @@ static void gl9767_set_low_power_negotiation(struct pci_dev *pdev, bool enable)
gl9767_vhs_read(pdev);
}
+static void sdhci_gl9767_uhs2_phy_reset(struct sdhci_host *host, bool assert)
+{
+ struct sdhci_pci_slot *slot = sdhci_priv(host);
+ struct pci_dev *pdev = slot->chip->pdev;
+ u32 value, set, clr;
+
+ if (assert) {
+ /* Assert reset, set RESETN and clean RESETN_VALUE */
+ set = PCIE_GLI_9767_UHS2_CTL2_FORCE_PHY_RESETN;
+ clr = PCIE_GLI_9767_UHS2_CTL2_FORCE_RESETN_VALUE;
+ } else {
+ /* De-assert reset, clean RESETN and set RESETN_VALUE */
+ set = PCIE_GLI_9767_UHS2_CTL2_FORCE_RESETN_VALUE;
+ clr = PCIE_GLI_9767_UHS2_CTL2_FORCE_PHY_RESETN;
+ }
+
+ gl9767_vhs_write(pdev);
+ pci_read_config_dword(pdev, PCIE_GLI_9767_UHS2_CTL2, &value);
+ value |= set;
+ pci_write_config_dword(pdev, PCIE_GLI_9767_UHS2_CTL2, value);
+ value &= ~clr;
+ pci_write_config_dword(pdev, PCIE_GLI_9767_UHS2_CTL2, value);
+ gl9767_vhs_read(pdev);
+}
+
+static void __gl9767_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsigned short vdd)
+{
+ u8 pwr = 0;
+
+ if (mode != MMC_POWER_OFF) {
+ pwr = sdhci_get_vdd_value(vdd);
+ if (!pwr)
+ WARN(1, "%s: Invalid vdd %#x\n",
+ mmc_hostname(host->mmc), vdd);
+ pwr |= SDHCI_VDD2_POWER_180;
+ }
+
+ if (host->pwr == pwr)
+ return;
+
+ host->pwr = pwr;
+
+ if (pwr == 0) {
+ sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+ } else {
+ sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+
+ pwr |= SDHCI_POWER_ON;
+ sdhci_writeb(host, pwr & 0xf, SDHCI_POWER_CONTROL);
+ usleep_range(5000, 6250);
+
+ /* Assert reset */
+ sdhci_gl9767_uhs2_phy_reset(host, true);
+ pwr |= SDHCI_VDD2_POWER_ON;
+ sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
+ usleep_range(5000, 6250);
+ }
+}
+
static void sdhci_gl9767_set_clock(struct sdhci_host *host, unsigned int clock)
{
struct sdhci_pci_slot *slot = sdhci_priv(host);
@@ -1205,6 +1266,11 @@ static void sdhci_gl9767_set_clock(struct sdhci_host *host, unsigned int clock)
}
sdhci_enable_clk(host, clk);
+
+ if (mmc_card_uhs2(host->mmc))
+ /* De-assert reset */
+ sdhci_gl9767_uhs2_phy_reset(host, false);
+
gl9767_set_low_power_negotiation(pdev, true);
}
@@ -1476,7 +1542,7 @@ static void sdhci_gl9767_set_power(struct sdhci_host *host, unsigned char mode,
gl9767_vhs_read(pdev);
sdhci_gli_overcurrent_event_enable(host, false);
- sdhci_uhs2_set_power(host, mode, vdd);
+ __gl9767_uhs2_set_power(host, mode, vdd);
sdhci_gli_overcurrent_event_enable(host, true);
} else {
gl9767_vhs_write(pdev);
--
2.51.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios()
2025-09-11 2:40 [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Ben Chuang
2025-09-11 2:41 ` [PATCH v3 2/3] mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function Ben Chuang
2025-09-11 2:42 ` [PATCH v3 3/3] mmc: sdhci-pci-gli: GL9767: Fix initializing the UHS-II interface during a power-on Ben Chuang
@ 2025-09-11 6:14 ` Adrian Hunter
2025-09-12 13:34 ` Ulf Hansson
3 siblings, 0 replies; 6+ messages in thread
From: Adrian Hunter @ 2025-09-11 6:14 UTC (permalink / raw)
To: Ben Chuang, ulf.hansson
Cc: victor.shih, ben.chuang, HL.Liu, SeanHY.Chen, victorshihgli,
linux-mmc, linux-kernel, stable
On 11/09/2025 05:40, Ben Chuang wrote:
> From: Ben Chuang <ben.chuang@genesyslogic.com.tw>
>
> The sdhci_set_clock() is called in sdhci_set_ios_common() and
> __sdhci_uhs2_set_ios(). According to Section 3.13.2 "Card Interface
> Detection Sequence" of the SD Host Controller Standard Specification
> Version 7.00, the SD clock is supplied after power is supplied, so we only
> need one in __sdhci_uhs2_set_ios(). Let's move the code related to setting
> the clock from sdhci_set_ios_common() into sdhci_set_ios() and modify
> the parameters passed to sdhci_set_clock() in __sdhci_uhs2_set_ios().
>
> Fixes: 10c8298a052b ("mmc: sdhci-uhs2: add set_ios()")
> Cc: stable@vger.kernel.org # v6.13+
> Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> v3:
> * use ios->clock instead of host->clock as the parameter of
> sdhci_set_clcok() in __sdhci_uhs2_set_ios().
> * set ios->clock to host->clock after calling sdhci_set_clock() in
> __sdhci_uhs2_set_ios().
>
> v2: add this patch
> v1: None
> ---
> drivers/mmc/host/sdhci-uhs2.c | 3 ++-
> drivers/mmc/host/sdhci.c | 34 +++++++++++++++++-----------------
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
> index 0efeb9d0c376..18fb6ee5b96a 100644
> --- a/drivers/mmc/host/sdhci-uhs2.c
> +++ b/drivers/mmc/host/sdhci-uhs2.c
> @@ -295,7 +295,8 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> else
> sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);
>
> - sdhci_set_clock(host, host->clock);
> + sdhci_set_clock(host, ios->clock);
> + host->clock = ios->clock;
> }
>
> static int sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 3a17821efa5c..ac7e11f37af7 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2367,23 +2367,6 @@ void sdhci_set_ios_common(struct mmc_host *mmc, struct mmc_ios *ios)
> (ios->power_mode == MMC_POWER_UP) &&
> !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))
> sdhci_enable_preset_value(host, false);
> -
> - if (!ios->clock || ios->clock != host->clock) {
> - host->ops->set_clock(host, ios->clock);
> - host->clock = ios->clock;
> -
> - if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&
> - host->clock) {
> - host->timeout_clk = mmc->actual_clock ?
> - mmc->actual_clock / 1000 :
> - host->clock / 1000;
> - mmc->max_busy_timeout =
> - host->ops->get_max_timeout_count ?
> - host->ops->get_max_timeout_count(host) :
> - 1 << 27;
> - mmc->max_busy_timeout /= host->timeout_clk;
> - }
> - }
> }
> EXPORT_SYMBOL_GPL(sdhci_set_ios_common);
>
> @@ -2410,6 +2393,23 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>
> sdhci_set_ios_common(mmc, ios);
>
> + if (!ios->clock || ios->clock != host->clock) {
> + host->ops->set_clock(host, ios->clock);
> + host->clock = ios->clock;
> +
> + if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&
> + host->clock) {
> + host->timeout_clk = mmc->actual_clock ?
> + mmc->actual_clock / 1000 :
> + host->clock / 1000;
> + mmc->max_busy_timeout =
> + host->ops->get_max_timeout_count ?
> + host->ops->get_max_timeout_count(host) :
> + 1 << 27;
> + mmc->max_busy_timeout /= host->timeout_clk;
> + }
> + }
> +
> if (host->ops->set_power)
> host->ops->set_power(host, ios->power_mode, ios->vdd);
> else
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios()
2025-09-11 2:40 [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Ben Chuang
` (2 preceding siblings ...)
2025-09-11 6:14 ` [PATCH v3 1/3] mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios() Adrian Hunter
@ 2025-09-12 13:34 ` Ulf Hansson
3 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2025-09-12 13:34 UTC (permalink / raw)
To: Ben Chuang
Cc: adrian.hunter, victor.shih, ben.chuang, HL.Liu, SeanHY.Chen,
victorshihgli, linux-mmc, linux-kernel, stable
On Thu, 11 Sept 2025 at 04:40, Ben Chuang <benchuanggli@gmail.com> wrote:
>
> From: Ben Chuang <ben.chuang@genesyslogic.com.tw>
>
> The sdhci_set_clock() is called in sdhci_set_ios_common() and
> __sdhci_uhs2_set_ios(). According to Section 3.13.2 "Card Interface
> Detection Sequence" of the SD Host Controller Standard Specification
> Version 7.00, the SD clock is supplied after power is supplied, so we only
> need one in __sdhci_uhs2_set_ios(). Let's move the code related to setting
> the clock from sdhci_set_ios_common() into sdhci_set_ios() and modify
> the parameters passed to sdhci_set_clock() in __sdhci_uhs2_set_ios().
>
> Fixes: 10c8298a052b ("mmc: sdhci-uhs2: add set_ios()")
> Cc: stable@vger.kernel.org # v6.13+
> Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
The series applied for fixes, thanks!
Kind regards
Uffe
> ---
> v3:
> * use ios->clock instead of host->clock as the parameter of
> sdhci_set_clcok() in __sdhci_uhs2_set_ios().
> * set ios->clock to host->clock after calling sdhci_set_clock() in
> __sdhci_uhs2_set_ios().
>
> v2: add this patch
> v1: None
> ---
> drivers/mmc/host/sdhci-uhs2.c | 3 ++-
> drivers/mmc/host/sdhci.c | 34 +++++++++++++++++-----------------
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
> index 0efeb9d0c376..18fb6ee5b96a 100644
> --- a/drivers/mmc/host/sdhci-uhs2.c
> +++ b/drivers/mmc/host/sdhci-uhs2.c
> @@ -295,7 +295,8 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> else
> sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);
>
> - sdhci_set_clock(host, host->clock);
> + sdhci_set_clock(host, ios->clock);
> + host->clock = ios->clock;
> }
>
> static int sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 3a17821efa5c..ac7e11f37af7 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2367,23 +2367,6 @@ void sdhci_set_ios_common(struct mmc_host *mmc, struct mmc_ios *ios)
> (ios->power_mode == MMC_POWER_UP) &&
> !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))
> sdhci_enable_preset_value(host, false);
> -
> - if (!ios->clock || ios->clock != host->clock) {
> - host->ops->set_clock(host, ios->clock);
> - host->clock = ios->clock;
> -
> - if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&
> - host->clock) {
> - host->timeout_clk = mmc->actual_clock ?
> - mmc->actual_clock / 1000 :
> - host->clock / 1000;
> - mmc->max_busy_timeout =
> - host->ops->get_max_timeout_count ?
> - host->ops->get_max_timeout_count(host) :
> - 1 << 27;
> - mmc->max_busy_timeout /= host->timeout_clk;
> - }
> - }
> }
> EXPORT_SYMBOL_GPL(sdhci_set_ios_common);
>
> @@ -2410,6 +2393,23 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>
> sdhci_set_ios_common(mmc, ios);
>
> + if (!ios->clock || ios->clock != host->clock) {
> + host->ops->set_clock(host, ios->clock);
> + host->clock = ios->clock;
> +
> + if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&
> + host->clock) {
> + host->timeout_clk = mmc->actual_clock ?
> + mmc->actual_clock / 1000 :
> + host->clock / 1000;
> + mmc->max_busy_timeout =
> + host->ops->get_max_timeout_count ?
> + host->ops->get_max_timeout_count(host) :
> + 1 << 27;
> + mmc->max_busy_timeout /= host->timeout_clk;
> + }
> + }
> +
> if (host->ops->set_power)
> host->ops->set_power(host, ios->power_mode, ios->vdd);
> else
> --
> 2.51.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread