mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues
Subsystems (5)
v2 cover mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues
Patch 1~3 fix acmd23 unwork issue.
Currently the eMMC chip integrated on i.MX6Q SabreSD boards does not work. (It's easily reproduced once you enable usdhc4 on sabresd, see patch 3) It's caused by acmd setting bits are never cleared once it's been set which cause the next normal commands to work abnormally.
Patch 4~6 fix DDR not supported on SabreSD board.
The SabreSD board does not have 1.8v signal voltage switch support for uSDHC, thus it can not support UHS_DDR50 mode which can only run at 1.8v signal voltage.
The issue is that current mmc DDR mode support implemented in MMC core depends on UHS_DDR50, which then cause such controller like uSDHC on SabreSD without 1.8v capability can not support eMMC DDR mode too.
(But the SabreSD board does support eMMC DDR mode since the eMMC DDR mode can work on either 1.8v or 3.3v)
So this patch gets rid of this limitation to let controller not support 1.8v signal voltage can also support eMMC DDR mode.
ChangeLog:v1->v2: a minor change on patch1, switch the order of patch 4&5.
dropped patch 7: mmc: sdhci-esdhc-imx: add eMMC HS200 mode support which will be in another series together with another extra fix on tuning broken issue in latest Chris' tree.
Dong Aisheng (6):
mmc: sdhci: clear auto cmd setting bits for no data cmds
mmc: sdhci-esdhc-imx: add SDHCI_TRANSFER_MODE read function
ARM: dts: sabresd: add usdhc4 support
mmc: sdhci-esdhc-imx: fix cpas over write issue
mmc: sdhci-esdhc-imx: add MMC_CAP_1_8V_DDR for mx6
mmc: core: mmc DDR mode should not depend on UHS_DDR50
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 9 +++++++++ drivers/mmc/core/mmc.c | 8 ++------ drivers/mmc/host/sdhci-esdhc-imx.c | 19 ++++++++++++++++++- drivers/mmc/host/sdhci.c | 7 ++++++- 4 files changed, 35 insertions(+), 8 deletions(-)
Signature · 1 line
1.7.2.rc3
PATCH v2 1/6 mmc: sdhci: clear auto cmd setting bits for no data cmds
The auto cmd settings bits should be cleared before sending new commands or we may receive command timeout error for normal commands due to wrongly pre-sent auto cmd.
e.g. we receive CMD13 timeout error due to ACMD23 is wrongly enabled by former data commands.
mmc2: new high speed DDR MMC card at address 0001
mmcblk1: mmc2:0001 SEM08G 7.39 GiB
mmcblk1boot0: mmc2:0001 SEM08G partition 1 2.00 MiB
mmcblk1boot1: mmc2:0001 SEM08G partition 2 2.00 MiB
mmcblk1rpmb: mmc2:0001 SEM08G partition 3 128 KiB
mmcblk1: p1 p2 p3 p4 < p5 p6 p7 >
mmc2: Timeout waiting for hardware interrupt.
mmcblk1boot1: unknown partition table
mmc2: Timeout waiting for hardware interrupt.
mmcblk1boot0: unknown partition table
--- drivers/mmc/host/sdhci.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/mmc/host/sdhci.c +6 -1
@@ -903,8 +903,13 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,u16 mode;struct mmc_data *data = cmd->data; -if (data ==NULL ) +if (data ==NULL ) { +/* clear Auto CMD settings for no data CMDs */ + mode =sdhci_readw (host,SDHCI_TRANSFER_MODE ); +sdhci_writew (host, mode & ~(SDHCI_TRNS_AUTO_CMD12 | +SDHCI_TRNS_AUTO_CMD23 ),SDHCI_TRANSFER_MODE );return ; + }WARN_ON (!host->data);
Signature · 1 line
1.7.2.rc3
Fabio Estevam
reviewerPATCH v2 1/6 mmc: sdhci: clear auto cmd setting bits for no data cmds
Quoted 18 lines · Dong Aisheng
The auto cmd settings bits should be cleared before sending new commands or we may receive command timeout error for normal commands due to wrongly pre-sent auto cmd.
e.g. we receive CMD13 timeout error due to ACMD23 is wrongly enabled by former data commands.
mmc2: new high speed DDR MMC card at address 0001
mmcblk1: mmc2:0001 SEM08G 7.39 GiB
mmcblk1boot0: mmc2:0001 SEM08G partition 1 2.00 MiB
mmcblk1boot1: mmc2:0001 SEM08G partition 2 2.00 MiB
mmcblk1rpmb: mmc2:0001 SEM08G partition 3 128 KiB
mmcblk1: p1 p2 p3 p4 < p5 p6 p7 >
mmc2: Timeout waiting for hardware interrupt.
mmcblk1boot1: unknown partition table
mmc2: Timeout waiting for hardware interrupt.
mmcblk1boot0: unknown partition table
Quoted 1 line
Signed-off-by Dong Aisheng <[email protected]>
Thanks for the patch, Dong.
This fixes the eMMC interrupt timeout issue on mx6qsabresd.
I think we should mark it for stable. At least 3.11 and 3.12 have this issue and your patch fixes it.
Regards,
Fabio Estevam
PATCH v2 2/6 mmc: sdhci-esdhc-imx: add SDHCI_TRANSFER_MODE read function
In reply to Dong AishengUsed to read out the correct value of SDHCI_TRANSFER_MODE register for upper layer.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +16 -0
@@ -385,6 +385,22 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)return ret; } +if (unlikely (reg ==SDHCI_TRANSFER_MODE )) { +if (esdhc_is_usdhc (imx_data)) { +u32 m =readl (host->ioaddr +ESDHC_MIX_CTRL ); + ret = m &ESDHC_MIX_CTRL_SDHCI_MASK ; +/* Swap AC23 bit */ +if (m &ESDHC_MIX_CTRL_AC23EN ) { + ret &= ~ESDHC_MIX_CTRL_AC23EN ; + ret |=SDHCI_TRNS_AUTO_CMD23 ; + } + }else { + ret =readw (host->ioaddr +SDHCI_TRANSFER_MODE ); + } + +return ret; + } +return readw (host->ioaddr + reg); }
Signature · 1 line
1.7.2.rc3
PATCH v2 3/6 ARM: dts: sabresd: add usdhc4 support
In reply to Dong AishengAdd usdhc4 support which has an eMMC card mounted on board.
--- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +9 -0
@@ -241,3 +241,12 @@ wp-gpios = <&gpio2 1 0>; status = "okay"; }; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4_1>; + bus-width = <8>; + non-removable; + no-1-8-v; + status = "okay"; +};
Signature · 1 line
1.7.2.rc3
PATCH v2 4/6 mmc: sdhci-esdhc-imx: fix cpas over write issue
In reply to Dong AishengWe should use '|=' instead '=', or it may over write the original caps assigned before this line.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -1
@@ -1069,7 +1069,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)break ;case ESDHC_CD_PERMANENT : - host->mmc->caps =MMC_CAP_NONREMOVABLE ; + host->mmc->caps |=MMC_CAP_NONREMOVABLE ;break ;case ESDHC_CD_NONE :
Signature · 1 line
1.7.2.rc3
PATCH v2 5/6 mmc: sdhci-esdhc-imx: add MMC_CAP_1_8V_DDR for mx6
In reply to Dong AishengThe i.MX6 supports 1.8v/3.3v eMMC DDR mode, so add this flag.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -0
@@ -1025,6 +1025,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)if (esdhc_is_usdhc (imx_data)) {writel (0x08100810 , host->ioaddr +ESDHC_WTMK_LVL ); host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; + host->mmc->caps |=MMC_CAP_1_8V_DDR ; }if (imx_data->socdata->flags &ESDHC_FLAG_MAN_TUNING )
Signature · 1 line
1.7.2.rc3
PATCH v2 6/6 mmc: core: mmc DDR mode should not depend on UHS_DDR50
In reply to Dong AishengThe MMC_CAP_UHS_DDR50 must work on 1.8v.
However, the eMMC DDR mode can work on either 1.8v or 3.3v and should not depend on UHS_DDR50.
So get rid of this limitation to let controller without 1.8v signal voltage support can also work for eMMC DDR mode if it claims.
--- drivers/mmc/core/mmc.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
drivers/mmc/core/mmc.c +2 -6
@@ -1119,14 +1119,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,*/ if (mmc_card_highspeed (card)) {if ((card->ext_csd.card_type &EXT_CSD_CARD_TYPE_DDR_1_8V ) - && ((host->caps & (MMC_CAP_1_8V_DDR | -MMC_CAP_UHS_DDR50 )) - == (MMC_CAP_1_8V_DDR |MMC_CAP_UHS_DDR50 ))) + && (host->caps &MMC_CAP_1_8V_DDR )) ddr =MMC_1_8V_DDR_MODE ;else if ((card->ext_csd.card_type &EXT_CSD_CARD_TYPE_DDR_1_2V ) - && ((host->caps & (MMC_CAP_1_2V_DDR | -MMC_CAP_UHS_DDR50 )) - == (MMC_CAP_1_2V_DDR |MMC_CAP_UHS_DDR50 ))) + && (host->caps &MMC_CAP_1_2V_DDR )) ddr =MMC_1_2V_DDR_MODE ; }
Signature · 1 line
1.7.2.rc3
PATCH v2 6/6 mmc: core: mmc DDR mode should not depend on UHS_DDR50
Quoted 7 lines · Dong Aisheng
The
MMC_CAP_UHS_DDR50must work on 1.8v.
However, the eMMC DDR mode can work on either 1.8v or 3.3v and should not depend onUHS_DDR50.
So get rid of this limitation to let controller without 1.8v signal voltage support can also work for eMMC DDR mode if it claims.Signed-off-by Dong Aisheng <[email protected]>
Quoted 33 lines
--- drivers/mmc/core/mmc.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)drivers/mmc/core/mmc.c +2
-7@@ -1119,14 +1119,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,*/ if (mmc_card_highspeed (card)) {if ((card->ext_csd.card_type &EXT_CSD_CARD_TYPE_DDR_1_8V ) - && ((host->caps & (MMC_CAP_1_8V_DDR | -MMC_CAP_UHS_DDR50 )) - == (MMC_CAP_1_8V_DDR |MMC_CAP_UHS_DDR50 ))) + && (host->caps &MMC_CAP_1_8V_DDR )) ddr =MMC_1_8V_DDR_MODE ;else if ((card->ext_csd.card_type &EXT_CSD_CARD_TYPE_DDR_1_2V ) - && ((host->caps & (MMC_CAP_1_2V_DDR | -MMC_CAP_UHS_DDR50 )) - == (MMC_CAP_1_2V_DDR |MMC_CAP_UHS_DDR50 ))) + && (host->caps &MMC_CAP_1_2V_DDR )) ddr =MMC_1_2V_DDR_MODE ; } --1.7.2.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
v2 cover mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues
In reply to Dong AishengQuoted 7 lines · Dong Aisheng
Dong Aisheng (6):
mmc: sdhci: clear auto cmd setting bits for no data cmds
mmc: sdhci-esdhc-imx: addSDHCI_TRANSFER_MODEread function
ARM: dts: sabresd: add usdhc4 support
mmc: sdhci-esdhc-imx: fix cpas over write issue
mmc: sdhci-esdhc-imx: addMMC_CAP_1_8V_DDRfor mx6
mmc: core: mmc DDR mode should not depend onUHS_DDR50
For the series:
v2 cover mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues
Hi Chris,
Quoted 9 lines · Shawn Guo
Quoted 7 lines · Dong Aisheng
Dong Aisheng (6):
mmc: sdhci: clear auto cmd setting bits for no data cmds
mmc: sdhci-esdhc-imx: addSDHCI_TRANSFER_MODEread function
ARM: dts: sabresd: add usdhc4 support
mmc: sdhci-esdhc-imx: fix cpas over write issue
mmc: sdhci-esdhc-imx: addMMC_CAP_1_8V_DDRfor mx6
mmc: core: mmc DDR mode should not depend onUHS_DDR50
Quoted 4 lines
For the series:
Acked-by Shawn Guo <[email protected]>
Would you help pick up this series?
Regards
Dong Aisheng
Quoted 5 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
v2 cover mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues
In reply to Dong AishengHi Dong,
Quoted 9 lines · Dong Aisheng
Patch 1~3 fix acmd23 unwork issue.
Currently the eMMC chip integrated on i.MX6Q SabreSD boards does not work. (It's easily reproduced once you enable usdhc4 on sabresd, see patch 3) It's caused by acmd setting bits are never cleared once it's been set which cause the next normal commands to work abnormally.Patch 4~6 fix DDR not supported on SabreSD board.
The SabreSD board does not have 1.8v signal voltage switch support for uSDHC, thus it can not supportUHS_DDR50mode which can only run at 1.8v signal voltage.
Thanks, pushed patches 1-6 to mmc-next for 3.14.
- Chris.
Signature · 1 line
Chris Ball <[email protected]> <http://printf.net/>