mmc: dw_mmc: fix DW MMC cores with 32-bit bus on 64-bit Linux systems
Subsystems (4)
v5 cover mmc: dw_mmc: fix DW MMC cores with 32-bit bus on 64-bit Linux systems
DesignWare MMC cores have a configurable data bus width of either 16, 32, or 64 bytes. It is possible, and some vendors actually do it, to ship a DW MMC core configured for 32-bit data bus within a 64-bit SoC. In this case the kernel will attempt 64-bit (readq) accesses to certain 64-bit MMIO registers, while the core will expect pairs of 32-bit accesses.
It seems that currently the only register for which the kernel performs 64-bit accesses is the FIFO. The symptom is that the DW MMC core never receives a read on the second half of the register, does not register the datum as being read, and thus not advancing its internal FIFO pointer, breaking further reads. It also seems that this FIFO is only used for small (less than 16 bytes) transfers, which probably means that only some SDIO cards are affected.
Changelog:
v5:
- rename "samsung,exynos78xx-dw-mshc" to "samsung,exynos7885-dw-mshc"
- rename "samsung,exynos78xx-dw-mshc" to "samsung,exynos7885-dw-mshc"
v4:
- split dt-bindings and dts update into separate commits
- add an explanation why it'ss necessary to change the compatible string
v3:
- removed "fifo-access-32bit" devicetree property
- added "samsung,exynos78xx-dw-mshc" compatible string
- added "samsung,exynos78xx-dw-mshc-smu" compatible string
v2:
- added commit messages
v1:
- added "fifo-access-32bit" devicetree property
- added DW_MMC_QUIRK_FIFO64_32
- added new dw_mci_{pull,push}_data* variants (...-data64_32)
Sergey Lisov (3):
dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
mmc: dw_mmc: add an option to force 32-bit access to 64-bit FIFO
arm64: dts: exynos: fix wrong mmc compatible in exynos7885.dtsi
.../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 2 +- drivers/mmc/host/dw_mmc-exynos.c | 43 +++++- drivers/mmc/host/dw_mmc.c | 122 +++++++++++++++++- drivers/mmc/host/dw_mmc.h | 2 + 5 files changed, 167 insertions(+), 4 deletions(-)
Signature · 8 lines
2.38.3 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v5 1/3 dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
Some Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves.
Add two new compatible strings, "samsung,exynos7885-dw-mshc" and "samsung,exynos7885-dw-mshc-smu" respectively, to denote exynos7885 boards that need this quirk. But it's very possible that all "samsung,exynos7-dw-mshc" boards are actually affected.
--- .../devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2 -0
@@ -22,6 +22,8 @@ properties: - samsung,exynos5420-dw-mshc-smu - samsung,exynos7-dw-mshc - samsung,exynos7-dw-mshc-smu + - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smu - axis,artpec8-dw-mshc reg:
Signature · 8 lines
2.38.3 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
Quoted 8 lines · Sergey Lisov
Some Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves.
Add two new compatible strings, "samsung,exynos7885-dw-mshc" and "samsung,exynos7885-dw-mshc-smu" respectively, to denote exynos7885 boards that need this quirk. But it's very possible that all "samsung,exynos7-dw-mshc" boards are actually affected.
And now this is third copy of the same email. This is not acceptable.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
In reply to Sergey LisovQuoted 17 lines · Sergey Lisov
Some Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves.
Add two new compatible strings, "samsung,exynos7885-dw-mshc" and "samsung,exynos7885-dw-mshc-smu" respectively, to denote exynos7885 boards that need this quirk. But it's very possible that all "samsung,exynos7-dw-mshc" boards are actually affected.
--- .../devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +0
-0
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0@@ -22,6 +22,8 @@ properties: - samsung,exynos5420-dw-mshc-smu - samsung,exynos7-dw-mshc - samsung,exynos7-dw-mshc-smu + - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smu
What about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Best regards,
Krzysztof
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
Quoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 2 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0+ - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smuWhat about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Makes sense. Also it probably makes sense to add "samsung,exynos7-dw-mshc" as a fallback compatible to the jackpotlte.dts, because it probably somewhat worked for whoever contributed that.
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
In reply to Krzysztof KozlowskiQuoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 2 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0+ - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smuWhat about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Makes sense. Also it probably makes sense to add "samsung,exynos7-dw-mshc" as a fallback compatible to the jackpotlte.dts, because it probably somewhat worked for whoever contributed that.
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
In reply to Krzysztof KozlowskiQuoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 2 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0+ - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smuWhat about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Makes sense. Also it probably makes sense to add "samsung,exynos7-dw-mshc" as a fallback compatible to the jackpotlte.dts, because it probably somewhat worked for whoever contributed that.
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
In reply to Krzysztof KozlowskiQuoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 2 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0+ - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smuWhat about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Makes sense. Also it probably makes sense to add "samsung,exynos7-dw-mshc" as a fallback compatible to the jackpotlte.dts, because it probably somewhat worked for whoever contributed that.
Re: [PATCH v5 1/3] dt-bindings: exynos-dw-mshc-common: add exynos7885 variants
In reply to Krzysztof KozlowskiQuoted 5 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml properties: · line 26
Quoted 2 lines
Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +2
-0+ - samsung,exynos7885-dw-mshc + - samsung,exynos7885-dw-mshc-smuWhat about the if-then at the end? Since this is pretty compatible with exynos7, then I would expect being added also there.
Makes sense. Also it probably makes sense to add "samsung,exynos7-dw-mshc" as a fallback compatible to the jackpotlte.dts, because it probably somewhat worked for whoever contributed that.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v5 2/3 mmc: dw_mmc: add an option to force 32-bit access to 64-bit FIFO
In reply to Sergey LisovSome Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves.
--- drivers/mmc/host/dw_mmc-exynos.c | 43 ++++++++++- drivers/mmc/host/dw_mmc.c | 122 ++++++++++++++++++++++++++++++- drivers/mmc/host/dw_mmc.h | 2 + 3 files changed, 164 insertions(+), 3 deletions(-)
drivers/mmc/host/dw_mmc-exynos.c +42 -1
@@ -28,6 +28,8 @@ enum dw_mci_exynos_type {DW_MCI_TYPE_EXYNOS5420_SMU ,DW_MCI_TYPE_EXYNOS7 ,DW_MCI_TYPE_EXYNOS7_SMU , +DW_MCI_TYPE_EXYNOS78XX , +DW_MCI_TYPE_EXYNOS78XX_SMU , DW_MCI_TYPE_ARTPEC8, };
@@ -70,6 +72,12 @@ static struct dw_mci_exynos_compatible { }, { .compatible = "samsung,exynos7-dw-mshc-smu", .ctrl_type = DW_MCI_TYPE_EXYNOS7_SMU, + }, { + .compatible = "samsung,exynos7885-dw-mshc", + .ctrl_type = DW_MCI_TYPE_EXYNOS78XX, + }, { + .compatible = "samsung,exynos7885-dw-mshc-smu", + .ctrl_type = DW_MCI_TYPE_EXYNOS78XX_SMU, }, { .compatible = "axis,artpec8-dw-mshc", .ctrl_type = DW_MCI_TYPE_ARTPEC8,
@@ -86,6 +94,8 @@ static inline u8 dw_mci_exynos_get_ciu_div(struct dw_mci *host)return EXYNOS4210_FIXED_CIU_CLK_DIV ; else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type == DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type == DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type == DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type == DW_MCI_TYPE_ARTPEC8) return SDMMC_CLKSEL_GET_DIV(mci_readl(host, CLKSEL64)) + 1; else
@@ -101,7 +111,8 @@ static void dw_mci_exynos_config_smu(struct dw_mci *host)* set for non-ecryption mode at this time. */ if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS5420_SMU || - priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU ) { + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU ) {mci_writel (host,MPSBEGIN0 ,0 );mci_writel (host,MPSEND0 ,SDMMC_ENDING_SEC_NR_MAX ); mci_writel(host, MPSCTRL0, SDMMC_MPSCTRL_SECURE_WRITE_BIT |
@@ -127,6 +138,12 @@ static int dw_mci_exynos_priv_init(struct dw_mci *host)DQS_CTRL_GET_RD_DELAY (priv->saved_strobe_ctrl); } +if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU ) { +/* Quirk needed for certain Exynos SoCs */ + host->quirks |=DW_MMC_QUIRK_FIFO64_32 ; + } +if (priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 ) {/* Quirk needed for the ARTPEC-8 SoC */ host->quirks |=DW_MMC_QUIRK_EXTENDED_TMOUT ;
@@ -144,6 +161,8 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 ) clksel =mci_readl (host,CLKSEL64 );else
@@ -153,6 +172,8 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 )mci_writel (host,CLKSEL64 , clksel);else
@@ -223,6 +244,8 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 ) clksel =mci_readl (host,CLKSEL64 );else
@@ -231,6 +254,8 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)if (clksel &SDMMC_CLKSEL_WAKEUP_INT ) {if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 )mci_writel (host,CLKSEL64 , clksel);else
@@ -410,6 +435,8 @@ static inline u8 dw_mci_exynos_get_clksmpl(struct dw_mci *host)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 )return SDMMC_CLKSEL_CCLK_SAMPLE (mci_readl (host,CLKSEL64 ));else
@@ -423,6 +450,8 @@ static inline void dw_mci_exynos_set_clksmpl(struct dw_mci *host, u8 sample)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 ) clksel =mci_readl (host,CLKSEL64 );else
@@ -430,6 +459,8 @@ static inline void dw_mci_exynos_set_clksmpl(struct dw_mci *host, u8 sample) clksel =SDMMC_CLKSEL_UP_SAMPLE (clksel, sample);if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 )mci_writel (host,CLKSEL64 , clksel);else
@@ -444,6 +475,8 @@ static inline u8 dw_mci_exynos_move_next_clksmpl(struct dw_mci *host)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 ) clksel =mci_readl (host,CLKSEL64 );else
@@ -454,6 +487,8 @@ static inline u8 dw_mci_exynos_move_next_clksmpl(struct dw_mci *host)if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type ==DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type ==DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type ==DW_MCI_TYPE_ARTPEC8 )mci_writel (host,CLKSEL64 , clksel);else
@@ -633,6 +668,12 @@ static const struct of_device_id dw_mci_exynos_match[] = { .data = &exynos_drv_data, }, { .compatible = "samsung,exynos7-dw-mshc-smu", .data = &exynos_drv_data, }, + /* XXX: more SoCs probably have the same quirk, + the compatible should be something more generic */ + { .compatible = "samsung,exynos7885-dw-mshc", + .data = &exynos_drv_data, }, + { .compatible = "samsung,exynos7885-dw-mshc-smu", + .data = &exynos_drv_data, }, { .compatible = "axis,artpec8-dw-mshc", .data = &artpec_drv_data, }, {},
drivers/mmc/host/dw_mmc.c +120 -2
134 lines not on this page · raw message
drivers/mmc/host/dw_mmc.h +2 -0
@@ -280,6 +280,8 @@ struct dw_mci_board {/* Support for longer data read timeout */ #define DW_MMC_QUIRK_EXTENDED_TMOUT BIT(0) +/* Force 32-bit access to the FIFO */ +#define DW_MMC_QUIRK_FIFO64_32 BIT(1)#define DW_MMC_240A 0x240a#define DW_MMC_280A 0x280a
Signature · 8 lines
2.38.3 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v5 3/3 arm64: dts: exynos: fix wrong mmc compatible in exynos7885.dtsi
In reply to Sergey LisovThis DW-MMC variant is not actually compatible with "samsung,exynos7-dw-mshc-smu", and requires an additional quirk to handle very short data transfers, typically used by SDIO cards. Update the compatible string to "samsung,exynos7885-dw-mshc-smu" to reflect this fact.
--- arch/arm64/boot/dts/exynos/exynos7885.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/exynos/exynos7885.dtsi +1 -1
@@ -294,7 +294,7 @@ pmu_system_controller: system-controller@11c80000 { }; mmc_0: mmc@13500000 { - compatible = "samsung,exynos7-dw-mshc-smu"; + compatible = "samsung,exynos7885-dw-mshc-smu"; reg = <0x13500000 0x2000>; interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>;
Signature · 8 lines
2.38.3 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel