mmc: renesas_sdhi: Fix card initialization failure in high speed mode
Subsystems (2)
PATCH 1/1 mmc: renesas_sdhi: Fix card initialization failure in high speed mode
From: Takeshi Saito <[email protected]>
This fixes card initialization failure in high speed mode.
If U-Boot uses SDR or HS200/400 mode before starting Linux and Linux DT does not enable SDR/HS200/HS400 mode, card initialization fails in high speed mode.
It is necessary to initialize SCC registers during card initialization phase. HW reset function is registered only for a port with either of SDR/HS200/HS400 properties in device tree. If SDR/HS200/HS400 properties are not present in device tree, SCC registers will not be reset. In SoC that support SCC registers, HW reset function should be registered regardless of the configuration of device tree.
Reproduction procedure:
- Use U-Boot that support MMC HS200/400 mode.
- Delete HS200/HS400 properties in device tree. (Delete mmc-hs200-1_8v and mmc-hs400-1_8v)
- MMC port works high speed mode and all commands fail.
To: [email protected]
--
NOTE: Marek: - Reworded commit message
- Updated patch to next/master
--- drivers/mmc/host/renesas_sdhi_core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/mmc/host/renesas_sdhi_core.c +7 -4
@@ -723,6 +723,13 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.start_signal_voltage_switch = renesas_sdhi_start_signal_voltage_switch; host->sdcard_irq_setbit_mask =TMIO_STAT_ALWAYS_SET_27 ; + +/* SDR and HS200/400 registers requires HW reset */ +if (of_data && of_data->scc_offset) { + priv->scc_ctl = host->ctl + of_data->scc_offset; + host->mmc->caps |=MMC_CAP_HW_RESET ; + host->hw_reset = renesas_sdhi_hw_reset; + } }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
@@ -775,8 +782,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,const struct renesas_sdhi_scc *taps = of_data->taps;bool hit = false; - host->mmc->caps |=MMC_CAP_HW_RESET ; -for (i =0 ; i < of_data->taps_num; i++) {if (taps[i].clk_rate ==0 || taps[i].clk_rate == host->mmc->f_max) {
@@ -789,12 +794,10 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (!hit)dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); - priv->scc_ctl = host->ctl + of_data->scc_offset; host->init_tuning = renesas_sdhi_init_tuning; host->prepare_tuning = renesas_sdhi_prepare_tuning; host->select_tuning = renesas_sdhi_select_tuning; host->check_scc_error = renesas_sdhi_check_scc_error; - host->hw_reset = renesas_sdhi_hw_reset; host->prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning; host->hs400_downgrade = renesas_sdhi_disable_scc;
Signature · 1 line
2.19.2
Quoted 21 lines · On Tue, Jan 29, 2019 at 06:40:39AM +0100, [email protected] wrote:
From: Takeshi Saito <[email protected]>
This fixes card initialization failure in high speed mode.
If U-Boot uses SDR or HS200/400 mode before starting Linux and Linux DT does not enable SDR/HS200/HS400 mode, card initialization fails in high speed mode.
It is necessary to initialize SCC registers during card initialization phase. HW reset function is registered only for a port with either of SDR/HS200/HS400 properties in device tree. If SDR/HS200/HS400 properties are not present in device tree, SCC registers will not be reset. In SoC that support SCC registers, HW reset function should be registered regardless of the configuration of device tree.
Reproduction procedure:
- Use U-Boot that support MMC HS200/400 mode.
- Delete HS200/HS400 properties in device tree. (Delete mmc-hs200-1_8v and mmc-hs400-1_8v)
- MMC port works high speed mode and all commands fail.
Quoted 8 lines
Signed-off-by Takeshi Saito <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Niklas Söderlund <[email protected]>Cc Simon Horman <[email protected]>Cc Ulf Hansson <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 22 lines · On Tue, 29 Jan 2019 at 06:40, <[email protected]> wrote:
From: Takeshi Saito <[email protected]>
This fixes card initialization failure in high speed mode.
If U-Boot uses SDR or HS200/400 mode before starting Linux and Linux DT does not enable SDR/HS200/HS400 mode, card initialization fails in high speed mode.
It is necessary to initialize SCC registers during card initialization phase. HW reset function is registered only for a port with either of SDR/HS200/HS400 properties in device tree. If SDR/HS200/HS400 properties are not present in device tree, SCC registers will not be reset. In SoC that support SCC registers, HW reset function should be registered regardless of the configuration of device tree.
Reproduction procedure:
- Use U-Boot that support MMC HS200/400 mode.
- Delete HS200/HS400 properties in device tree. (Delete mmc-hs200-1_8v and mmc-hs400-1_8v)
- MMC port works high speed mode and all commands fail.
Quoted 8 lines
Signed-off-by Takeshi Saito <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Niklas Söderlund <[email protected]>Cc Simon Horman <[email protected]>Cc Ulf Hansson <[email protected]>Cc Wolfram Sang <[email protected]>
Is this a regression? Should it be tagged for stable?
Kind regards
Uffe
Quoted 50 lines
--
NOTE: Marek: - Reworded commit message
- Updated patch to next/master--- drivers/mmc/host/renesas_sdhi_core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/mmc/host/renesas_sdhi_core.c +7
-5@@ -723,6 +723,13 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.start_signal_voltage_switch = renesas_sdhi_start_signal_voltage_switch; host->sdcard_irq_setbit_mask =TMIO_STAT_ALWAYS_SET_27 ; + +/* SDR and HS200/400 registers requires HW reset */ +if (of_data && of_data->scc_offset) { + priv->scc_ctl = host->ctl + of_data->scc_offset; + host->mmc->caps |=MMC_CAP_HW_RESET ; + host->hw_reset = renesas_sdhi_hw_reset; + } }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */ @@ -775,8 +782,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,const struct renesas_sdhi_scc *taps = of_data->taps;bool hit = false; - host->mmc->caps |=MMC_CAP_HW_RESET ; -for (i =0 ; i < of_data->taps_num; i++) {if (taps[i].clk_rate ==0 || taps[i].clk_rate == host->mmc->f_max) {@@ -789,12 +794,10 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (!hit)dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); - priv->scc_ctl = host->ctl + of_data->scc_offset; host->init_tuning = renesas_sdhi_init_tuning; host->prepare_tuning = renesas_sdhi_prepare_tuning; host->select_tuning = renesas_sdhi_select_tuning; host->check_scc_error = renesas_sdhi_check_scc_error; - host->hw_reset = renesas_sdhi_hw_reset; host->prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning; host->hs400_downgrade = renesas_sdhi_disable_scc; --2.19.2
Quoted 32 lines · Ulf Hansson
Quoted 22 lines · On Tue, 29 Jan 2019 at 06:40, <[email protected]> wrote:
From: Takeshi Saito <[email protected]>
This fixes card initialization failure in high speed mode.
If U-Boot uses SDR or HS200/400 mode before starting Linux and Linux DT does not enable SDR/HS200/HS400 mode, card initialization fails in high speed mode.
It is necessary to initialize SCC registers during card initialization phase. HW reset function is registered only for a port with either of SDR/HS200/HS400 properties in device tree. If SDR/HS200/HS400 properties are not present in device tree, SCC registers will not be reset. In SoC that support SCC registers, HW reset function should be registered regardless of the configuration of device tree.
Reproduction procedure:
- Use U-Boot that support MMC HS200/400 mode.
- Delete HS200/HS400 properties in device tree. (Delete mmc-hs200-1_8v and mmc-hs400-1_8v)
- MMC port works high speed mode and all commands fail.Quoted 8 lines
Signed-off-by Takeshi Saito <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Niklas Söderlund <[email protected]>Cc Simon Horman <[email protected]>Cc Ulf Hansson <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 1 line
Is this a regression?
No, because this was broken since the beginning. But U-Boot HS200/HS400 support is now, so this bug was hidden.
Quoted 1 line
Should it be tagged for stable?
I am tempted to say yes.
Signature · 2 lines
Best regards, Marek Vasut
Quoted 4 lines
Quoted 2 lines
Should it be tagged for stable?
I am tempted to say yes.
I agree.
Quoted 22 lines · On Tue, 29 Jan 2019 at 06:40, <[email protected]> wrote:
From: Takeshi Saito <[email protected]>
This fixes card initialization failure in high speed mode.
If U-Boot uses SDR or HS200/400 mode before starting Linux and Linux DT does not enable SDR/HS200/HS400 mode, card initialization fails in high speed mode.
It is necessary to initialize SCC registers during card initialization phase. HW reset function is registered only for a port with either of SDR/HS200/HS400 properties in device tree. If SDR/HS200/HS400 properties are not present in device tree, SCC registers will not be reset. In SoC that support SCC registers, HW reset function should be registered regardless of the configuration of device tree.
Reproduction procedure:
- Use U-Boot that support MMC HS200/400 mode.
- Delete HS200/HS400 properties in device tree. (Delete mmc-hs200-1_8v and mmc-hs400-1_8v)
- MMC port works high speed mode and all commands fail.
Quoted 8 lines
Signed-off-by Takeshi Saito <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Niklas Söderlund <[email protected]>Cc Simon Horman <[email protected]>Cc Ulf Hansson <[email protected]>Cc Wolfram Sang <[email protected]>
Applied for next and added a stable tag, thanks!
Kind regards
Uffe
Quoted 50 lines
--
NOTE: Marek: - Reworded commit message
- Updated patch to next/master--- drivers/mmc/host/renesas_sdhi_core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/mmc/host/renesas_sdhi_core.c +7
-5@@ -723,6 +723,13 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.start_signal_voltage_switch = renesas_sdhi_start_signal_voltage_switch; host->sdcard_irq_setbit_mask =TMIO_STAT_ALWAYS_SET_27 ; + +/* SDR and HS200/400 registers requires HW reset */ +if (of_data && of_data->scc_offset) { + priv->scc_ctl = host->ctl + of_data->scc_offset; + host->mmc->caps |=MMC_CAP_HW_RESET ; + host->hw_reset = renesas_sdhi_hw_reset; + } }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */ @@ -775,8 +782,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,const struct renesas_sdhi_scc *taps = of_data->taps;bool hit = false; - host->mmc->caps |=MMC_CAP_HW_RESET ; -for (i =0 ; i < of_data->taps_num; i++) {if (taps[i].clk_rate ==0 || taps[i].clk_rate == host->mmc->f_max) {@@ -789,12 +794,10 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (!hit)dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); - priv->scc_ctl = host->ctl + of_data->scc_offset; host->init_tuning = renesas_sdhi_init_tuning; host->prepare_tuning = renesas_sdhi_prepare_tuning; host->select_tuning = renesas_sdhi_select_tuning; host->check_scc_error = renesas_sdhi_check_scc_error; - host->hw_reset = renesas_sdhi_hw_reset; host->prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning; host->hs400_downgrade = renesas_sdhi_disable_scc; --2.19.2