mmc: sdhci-tegra: Add support to enumerate in HS400ES mode
Subsystems (3)
PATCH 1/1 mmc: sdhci-tegra: Add support to enumerate in HS400ES mode
When CMD13 is sent after switching to HS400 mode, the bus is operating at either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400 mode, force SDHCI interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host controller CAR clock and the interface clock are rate matched.
--- drivers/mmc/host/sdhci-tegra.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/mmc/host/sdhci-tegra.c +12 -0
@@ -123,6 +123,8 @@ SDHCI_TRNS_BLK_CNT_EN | \ SDHCI_TRNS_DMA) +static void tegra_sdhci_set_clock (struct sdhci_host *host,unsigned int clock); +struct sdhci_tegra_soc_data {const struct sdhci_pltfm_data *pdata;u64 dma_mask;
@@ -369,6 +371,16 @@ static void tegra_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc,sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +/* +* When CMD13 is sent after switching to HS400 mode, the bus +* is operating at either MMC_HIGH_26_MAX_DTR or +* MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400 mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); + }static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask)
Signature · 1 line
2.17.1
Adrian Hunter
maintainerQuoted 5 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400 mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400 mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.
This sounds like an issue with or without enhanced strobe?
Also it seems more like a fix than "adding support".
i.e. is this really "mmc: sdhci-tegra: Fix switch to HS400ES mode" ?
Quoted 11 lines
Signed-off-by Prathamesh Shete <[email protected]>--- drivers/mmc/host/sdhci-tegra.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/mmc/host/sdhci-tegra.c +0
-0
drivers/mmc/host/sdhci-tegra.c line 126
Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +1
-0@@ -123,6 +123,8 @@ SDHCI_TRNS_BLK_CNT_EN | \ SDHCI_TRNS_DMA) +static void tegra_sdhci_set_clock (struct sdhci_host *host,unsigned int clock);
Please move one of the functions so that the forward declaration is not necessary.
Quoted 7 lines
drivers/mmc/host/sdhci-tegra.c +1
-0+struct sdhci_tegra_soc_data {const struct sdhci_pltfm_data *pdata;u64 dma_mask;@@ -369,6 +371,16 @@ static void tegra_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc,sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL );
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc, · line 382
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +9
-0+/* +* When CMD13 is sent after switching to HS400 mode, the bus +* is operating at either MMC_HIGH_26_MAX_DTR or +* MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400 mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR );
This being done irrespective of ios->enhanced_strobe, which doesn't seem right based on the comment?
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc, · line 383
Quoted 1 line
drivers/mmc/host/sdhci-tegra.c +1
-0+
Please remove the blank line.
Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +0
-0}static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask)
PATCH v2 1/1 mmc: sdhci-tegra: Fix switch to HS400ES mode
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host controller CAR clock and the interface clock are rate matched.
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)
drivers/mmc/host/sdhci-tegra.c +26 -17
@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +else + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
Signature · 1 line
2.17.1
Adrian Hunter
maintainerRe: [PATCH v2] mmc: sdhci-tegra: Fix switch to HS400ES mode
Quoted 55 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)drivers/mmc/host/sdhci-tegra.c +12
-17@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +else + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ;
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) · line 798
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +10
-0+ +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched.
Still doesn't explain why you want to set MMC_HS200_MAX_DTR when ios->enhanced_strobe is false e.g. mmc_set_initial_state()
Quoted 8 lines
drivers/mmc/host/sdhci-tegra.c +4
-0+*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
RE: [PATCH v2] mmc: sdhci-tegra: Fix switch to HS400ES mode
Thanks for review!
Updated the programming sequence and Pushed version v3.
Thanks
Prathamesh.
Quoted 77 lines
-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: Thursday, December 2, 2021 8:05 PM
To: Prathamesh Shete <[email protected]>; [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; [email protected]; linux- [email protected]; [email protected]
Cc: Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>
Subject: Re: [PATCH v2] mmc: sdhci-tegra: Fix switch to HS400ES modeExternal email: Use caution opening links or attachments
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_tap(struct sdhci_host
Quoted 18 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)(quoted diff) +0
-0
b/drivers/mmc/host/sdhci-tegra.cindex387ce9cdbd7c..ca261cce9b37100644drivers/mmc/host/sdhci-tegra.c +0
-0@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host*host, unsigned int tap)
Quoted 13 lines
drivers/mmc/host/sdhci-tegra.c +0
-10} } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ;drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap)
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +0
-8-else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host,unsigned int clock)
Quoted 19 lines
drivers/mmc/host/sdhci-tegra.c +16
-0} } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) { +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +else + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +/* +* When CMD13 is sent from mmc_select_hs400es() after
Quoted 8 lines
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) · line 798
Quoted 5 lines
drivers/mmc/host/sdhci-tegra.c +5
-0+* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. Still doesn't explain why you want to set
MMC_HS200_MAX_DTRwhenios->enhanced_strobeis false e.g.mmc_set_initial_state()
That’s a good catch. Updated the code sequence and pushed v3.
Quoted 7 lines
Quoted 7 lines
drivers/mmc/host/sdhci-tegra.c +3
-0+*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); } + static unsigned int tegra_sdhci_get_max_clock(struct sdhci_host*host) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
PATCH v3 1/1 mmc: sdhci-tegra: Fix switch to HS400ES mode
In reply to Adrian HunterWhen CMD13 is sent after switching to HS400ES mode, the bus is operating at either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host controller CAR clock and the interface clock are rate matched.
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)
drivers/mmc/host/sdhci-tegra.c +26 -17
@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) { + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); + }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
Signature · 1 line
2.17.1
Re: [PATCH v3] mmc: sdhci-tegra: Fix switch to HS400ES mode
Quoted 7 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>
One minor comment below otherwise:
Quoted 45 lines
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)drivers/mmc/host/sdhci-tegra.c +9
-17@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) {
drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) · line 795
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +10
-0+ val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR );
Comment and line above need indenting
Quoted 11 lines
drivers/mmc/host/sdhci-tegra.c +7
-0+ }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
PATCH v4 1/1 mmc: sdhci-tegra: Fix switch to HS400ES mode
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host controller CAR clock and the interface clock are rate matched.
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)
drivers/mmc/host/sdhci-tegra.c +26 -17
@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) { + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); + }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
Signature · 1 line
2.17.1
Re: [PATCH v4] mmc: sdhci-tegra: Fix switch to HS400ES mode
Quoted 7 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>
Quoted 67 lines
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)drivers/mmc/host/sdhci-tegra.c +26
-18@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) { + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); + }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); -- 2.17.1
Re: [PATCH v4] mmc: sdhci-tegra: Fix switch to HS400ES mode
In reply to Prathamesh SheteQuoted 8 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>
Applied for fixes and by adding a fixes and a stable tag, thanks!
Kind regards
Uffe
Quoted 68 lines
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)drivers/mmc/host/sdhci-tegra.c +26
-18@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap) } } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; -else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);@@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) { + val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR ); + }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); +} +static unsigned int tegra_sdhci_get_max_clock (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); --2.17.1
RE: [PATCH v3] mmc: sdhci-tegra: Fix switch to HS400ES mode
In reply to Adrian HunterThanks for acknowledging the change.
Updated and pushed version v4 to fix the indentation.
Thanks
Prathamesh.
Quoted 97 lines
-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: Tuesday, December 14, 2021 11:31 AM
To: Prathamesh Shete <[email protected]>; [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; [email protected]; linux- [email protected]; [email protected]
Cc: Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>
Subject: Re: [PATCH v3] mmc: sdhci-tegra: Fix switch to HS400ES modeExternal email: Use caution opening links or attachments
Quoted 7 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400ES mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR. To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.Signed-off-by Prathamesh Shete <[email protected]>One minor comment below otherwise:
Acked-by Adrian Hunter <[email protected]>drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_tap(struct sdhci_host
Quoted 11 lines
--- drivers/mmc/host/sdhci-tegra.c | 43 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-)(quoted diff) +0
-0
b/drivers/mmc/host/sdhci-tegra.cindex387ce9cdbd7c..ddaa3d9000f6100644drivers/mmc/host/sdhci-tegra.c +0
-0@@ -354,23 +354,6 @@ static void tegra_sdhci_set_tap(struct sdhci_host*host, unsigned int tap)
Quoted 13 lines
drivers/mmc/host/sdhci-tegra.c +0
-10} } -static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, -struct mmc_ios *ios) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 val; - - val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -if (ios->enhanced_strobe) - val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ;drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap)
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +0
-8-else - val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; - -sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); - -} -static void tegra_sdhci_reset (struct sdhci_host *host,u8 mask) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -791,6 +774,32 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host,unsigned int clock)
Quoted 11 lines
drivers/mmc/host/sdhci-tegra.c +8
-0} } +static void tegra_sdhci_hs400_enhanced_strobe (struct mmc_host *mmc, +struct mmc_ios *ios) { +struct sdhci_host *host =mmc_priv (mmc); +u32 val; + + val =sdhci_readl (host,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); + +if (ios->enhanced_strobe) {drivers/mmc/host/sdhci-tegra.c static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) · line 795
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +10
-0+ val |=SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; +/* +* When CMD13 is sent from mmc_select_hs400es() after +* switching to HS400ES mode, the bus is operating at +* either MMC_HIGH_26_MAX_DTR or MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400ES mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR );Comment and line above need indenting
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +6
-0+ }else { + val &= ~SDHCI_TEGRA_SYS_SW_CTRL_ENHANCED_STROBE ; + } + +sdhci_writel (host, val,SDHCI_TEGRA_VENDOR_SYS_SW_CTRL ); } + static unsigned int tegra_sdhci_get_max_clock(struct sdhci_host*host) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
Thanks for review
This issue is specific to HS400ES mode.
Updated and pushed version v2.
Updated commit message and comments to clarify on HS400ES mode. Also moved the function as suggested.
Answers to some questions inlined.
Thanks
Prathamesh.
-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: Thursday, December 2, 2021 12:10 PM
To: Prathamesh Shete <[email protected]>; [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Aniruddha Tvs Rao <[email protected]>
Subject: Re: [PATCH] mmc: sdhci-tegra: Add support to enumerate in HS400ES mode
External email: Use caution opening links or attachments
Quoted 5 lines · Prathamesh Shete
When CMD13 is sent after switching to HS400 mode, the bus is operating at either
MMC_HIGH_26_MAX_DTRorMMC_HIGH_52_MAX_DTR.
To meet Tegra SDHCI requirement at HS400 mode, force SDHCI interface clock toMMC_HS200_MAX_DTR(200 MHz) so that host controller CAR clock and the interface clock are rate matched.
This sounds like an issue with or without enhanced strobe? [P.S]issue is specific to HS400ES mode updated commit message in v2.
Also it seems more like a fix than "adding support".
i.e. is this really "mmc: sdhci-tegra: Fix switch to HS400ES mode" ? [P.S] yes this is fix ... updated commit subject in version v2.
Quoted 12 lines
Signed-off-by Prathamesh Shete <[email protected]>--- drivers/mmc/host/sdhci-tegra.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)(quoted diff) +0
-0
b/drivers/mmc/host/sdhci-tegra.cindex387ce9cdbd7c..d800396d1112100644
drivers/mmc/host/sdhci-tegra.c line 127
Quoted 5 lines
drivers/mmc/host/sdhci-tegra.c +2
-0@@ -123,6 +123,8 @@ SDHCI_TRNS_BLK_CNT_EN | \ SDHCI_TRNS_DMA) +static void tegra_sdhci_set_clock (struct sdhci_host *host,unsigned +int clock);
Please move one of the functions so that the forward declaration is not necessary. [P.S]Done.
Quoted 8 lines
drivers/mmc/host/sdhci-tegra.c +1
-0+struct sdhci_tegra_soc_data {const struct sdhci_pltfm_data *pdata;u64 dma_mask;@@ -369,6 +371,16 @@ static void tegra_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc,sdhci_writel (host, val, SDHCI_TEGRA_VENDOR_SYS_SW_CTRL);
drivers/mmc/host/sdhci-tegra.c static void · line 383
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +9
-0+/* +* When CMD13 is sent after switching to HS400 mode, the bus +* is operating at either MMC_HIGH_26_MAX_DTR or +* MMC_HIGH_52_MAX_DTR. +* To meet Tegra SDHCI requirement at HS400 mode, force SDHCI +* interface clock to MMC_HS200_MAX_DTR (200 MHz) so that host +* controller CAR clock and the interface clock are rate matched. +*/ +tegra_sdhci_set_clock (host,MMC_HS200_MAX_DTR );
This being done irrespective of ios->enhanced_strobe, which doesn't seem right based on the comment? [P.S]Updated comments.
drivers/mmc/host/sdhci-tegra.c static void · line 384
Quoted 1 line
drivers/mmc/host/sdhci-tegra.c +1
-0+
Please remove the blank line.
[P.S]done
Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +0
-0}static void
tegra_sdhci_reset(struct sdhci_host *host, u8 mask)