Validate and clean up UHS/DDR/HS200 timing checks
cover Validate and clean up UHS/DDR/HS200 timing checks
This series adds validation for UHS/DDR/HS200 timing modes when the host only supports 1-bit bus width which also fixes a real performance drop issue due to incorrect hs200 mode switch code. And then cleans up the check in mmc_host_can_uhs().
Luke Wang (1):
mmc: core: Validate UHS/DDR/HS200 timing selection for 1-bit bus width
Shawn Lin (1):
mmc: core: Remove checking MMC_CAP_4_BIT_DATA from mmc_host_can_uhs()
drivers/mmc/core/host.c | 9 +++++++++ drivers/mmc/core/host.h | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 mmc: core: Validate UHS/DDR/HS200 timing selection for 1-bit bus width
From: Luke Wang <[email protected]>
UHS/DDR/HS200 modes require at least 4-bit bus support. Host controllers that lack relevant capability registers rely on paring properties provided by firmware, which may incorrectly set these modes. Now that mmc_validate_host_caps() has been introduced to validate such configuration violations, let's also add checks for UHS/DDR/HS200 modes.
This fixes an issue where, if the HS200/HS400 property is set while only a 1-bit bus width is used, mmc_select_hs200() returns 0 without actually performing the mode switch. Consequently, mmc_select_timing() proceeds without falling back to mmc_select_hs(), leaving the eMMC device operating in legacy mode (26 MHz) instead of switching to High Speed mode (52 MHz).
---
drivers/mmc/core/host.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mmc/core/host.c +9 -0
@@ -624,6 +624,15 @@ static int mmc_validate_host_caps(struct mmc_host *host)return -EINVAL ; } +/* UHS/DDR/HS200 modes require at least 4-bit bus */ +if (!(caps & (MMC_CAP_4_BIT_DATA |MMC_CAP_8_BIT_DATA )) && + ((caps & (MMC_CAP_UHS |MMC_CAP_DDR )) || (caps2 &MMC_CAP2_HS200 ))) { +dev_warn (dev,"drop UHS/DDR/HS200 support since 1-bit bus only\n" ); + host->caps = caps = caps & ~(MMC_CAP_UHS |MMC_CAP_DDR ); + host->caps2 = caps2 = caps2 & ~MMC_CAP2_HS200 ; + } + +/* HS400 and HS400ES modes require 8-bit bus */ if (caps2 & (MMC_CAP2_HS400_ES |MMC_CAP2_HS400 ) && !(caps &MMC_CAP_8_BIT_DATA ) && !(caps2 &MMC_CAP2_NO_MMC )) {dev_warn (dev,"drop HS400 support since no 8-bit bus\n" );
Signature · 1 line
2.7.4
Re: [PATCH 1/2] mmc: core: Validate UHS/DDR/HS200 timing selection for 1-bit bus width
Quoted 28 lines · Shawn Lin
From: Luke Wang <[email protected]>
UHS/DDR/HS200 modes require at least 4-bit bus support. Host controllers that lack relevant capability registers rely on paring properties provided by firmware, which may incorrectly set these modes. Now that
mmc_validate_host_caps()has been introduced to validate such configuration violations, let's also add checks for UHS/DDR/HS200 modes.This fixes an issue where, if the HS200/HS400 property is set while only a 1-bit bus width is used,
mmc_select_hs200()returns 0 without actually performing the mode switch. Consequently,mmc_select_timing()proceeds without falling back tommc_select_hs(), leaving the eMMC device operating in legacy mode (26 MHz) instead of switching to High Speed mode (52 MHz).Signed-off-by Luke Wang <[email protected]>[Shawn: reword the commit msg and drop HS400 change]Signed-off-by Shawn Lin <[email protected]>---
drivers/mmc/core/host.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/mmc/core/host.c +0
-0
drivers/mmc/core/host.c static int mmc_validate_host_caps(struct mmc_host *host) · line 632
Quoted 9 lines
drivers/mmc/core/host.c +6
-0@@ -624,6 +624,15 @@ static int mmc_validate_host_caps(struct mmc_host *host)return -EINVAL ; } +/* UHS/DDR/HS200 modes require at least 4-bit bus */ +if (!(caps & (MMC_CAP_4_BIT_DATA |MMC_CAP_8_BIT_DATA )) && + ((caps & (MMC_CAP_UHS |MMC_CAP_DDR )) || (caps2 &MMC_CAP2_HS200 ))) { +dev_warn (dev,"drop UHS/DDR/HS200 support since 1-bit bus only\n" ); + host->caps = caps = caps & ~(MMC_CAP_UHS |MMC_CAP_DDR ); + host->caps2 = caps2 = caps2 & ~MMC_CAP2_HS200 ;
Hmm.
How about just updating the temporary variables, caps and caps2, here?
Then at the end of the function when we have validated all "caps", we can update the variables in the host, like:host->caps = caps;host->caps2 = caps2;
Quoted 9 lines
drivers/mmc/core/host.c +3
-1+ } + +/* HS400 and HS400ES modes require 8-bit bus */ if (caps2 & (MMC_CAP2_HS400_ES |MMC_CAP2_HS400 ) && !(caps &MMC_CAP_8_BIT_DATA ) && !(caps2 &MMC_CAP2_NO_MMC )) {dev_warn (dev,"drop HS400 support since no 8-bit bus\n" ); --2.7.4
Kind regards
Uffe
Re: [PATCH 1/2] mmc: core: Validate UHS/DDR/HS200 timing selection for 1-bit bus width
Hi Ulf,
Quoted 41 lines · Ulf Hansson
Quoted 28 lines · Shawn Lin
From: Luke Wang <[email protected]>
UHS/DDR/HS200 modes require at least 4-bit bus support. Host controllers that lack relevant capability registers rely on paring properties provided by firmware, which may incorrectly set these modes. Now that
mmc_validate_host_caps()has been introduced to validate such configuration violations, let's also add checks for UHS/DDR/HS200 modes.This fixes an issue where, if the HS200/HS400 property is set while only a 1-bit bus width is used,
mmc_select_hs200()returns 0 without actually performing the mode switch. Consequently,mmc_select_timing()proceeds without falling back tommc_select_hs(), leaving the eMMC device operating in legacy mode (26 MHz) instead of switching to High Speed mode (52 MHz).Signed-off-by Luke Wang <[email protected]>[Shawn: reword the commit msg and drop HS400 change]Signed-off-by Shawn Lin <[email protected]>---
drivers/mmc/core/host.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/mmc/core/host.c +0
-0drivers/mmc/core/host.c static int mmc_validate_host_caps(struct mmc_host *host) · line 632
Quoted 9 lines
drivers/mmc/core/host.c +6
-0@@ -624,6 +624,15 @@ static int mmc_validate_host_caps(struct mmc_host *host)return -EINVAL ; } +/* UHS/DDR/HS200 modes require at least 4-bit bus */ +if (!(caps & (MMC_CAP_4_BIT_DATA |MMC_CAP_8_BIT_DATA )) && + ((caps & (MMC_CAP_UHS |MMC_CAP_DDR )) || (caps2 &MMC_CAP2_HS200 ))) { +dev_warn (dev,"drop UHS/DDR/HS200 support since 1-bit bus only\n" ); + host->caps = caps = caps & ~(MMC_CAP_UHS |MMC_CAP_DDR ); + host->caps2 = caps2 = caps2 & ~MMC_CAP2_HS200 ;Hmm.
Quoted 6 lines
How about just updating the temporary variables, caps and caps2, here?
Then at the end of the function when we have validated all "caps", we can update the variables in the host, like:
host->caps= caps;host->caps2= caps2;
It looks better. Will update v2 based on your suggestion.
Quoted 14 lines
Quoted 10 lines
drivers/mmc/core/host.c +3
-1+ } + +/* HS400 and HS400ES modes require 8-bit bus */ if (caps2 & (MMC_CAP2_HS400_ES |MMC_CAP2_HS400 ) && !(caps &MMC_CAP_8_BIT_DATA ) && !(caps2 &MMC_CAP2_NO_MMC )) {dev_warn (dev,"drop HS400 support since no 8-bit bus\n" ); --2.7.4
Kind regards
Uffe
PATCH 2/2 mmc: core: Remove checking MMC_CAP_4_BIT_DATA from mmc_host_can_uhs()
In reply to Shawn LinThe bus width support for UHS mode is now validated in mmc_validate_host_caps(). Therefore, we can safely remove the explicit MMC_CAP_4_BIT_DATA check from mmc_host_can_uhs(). As part of this cleanup, simplify the condition by using the consolidated MMC_CAP_UHS flag.
---
drivers/mmc/core/host.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/core/host.h +1 -5
@@ -56,11 +56,7 @@ static inline int mmc_host_can_access_boot(struct mmc_host *host)static inline int mmc_host_can_uhs (struct mmc_host *host) { -return host->caps & - (MMC_CAP_UHS_SDR12 |MMC_CAP_UHS_SDR25 | -MMC_CAP_UHS_SDR50 |MMC_CAP_UHS_SDR104 | -MMC_CAP_UHS_DDR50 ) && - host->caps &MMC_CAP_4_BIT_DATA ; +return host->caps &MMC_CAP_UHS ; }static inline bool mmc_card_hs200 (struct mmc_card *card)
Signature · 1 line
2.7.4