mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Subsystems (2)
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
mmc_of_parse() can populate the 'f_max' and 'host_caps' fields of struct mmc_config from devicetree.
The same logic is duplicated in stm32_sdmmc2_probe(). Use mmc_of_parse(), which is more generic.
--- drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/mmc/stm32_sdmmc2.c +2 -16
@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ; -/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ; +mmc_of_parse (dev, cfg); upriv->mmc = &plat->mmc;
Signature · 1 line
2.25.4
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Hi Alexandru
Quoted 33 lines · Alexandru Gagniuc
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/mmc/stm32_sdmmc2.c +0
-10@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ; -/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ;
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 687
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +2
-6-break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ; +mmc_of_parse (dev, cfg); upriv->mmc = &plat->mmc;
Patrice
Thanks
Quoted 1 line
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
In reply to Alexandru GagniucHi Alexandru,
Quoted 9 lines
Sent: mercredi 9 septembre 2020 23:54
To: uboot-stm32 at st-md-mailman.stormreply.com
Cc: Alexandru Gagniuc <[email protected]>; Patrick DELAUNAY <[email protected]>; Patrice CHOTARD <[email protected]>; Peng Fan <[email protected]>; u-boot at lists.denx.de
Subject: [PATCH] mmc:stm32_sdmmc2: Usemmc_of_parse()to read host capabilities
Importance: High
Quoted 7 lines
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>---
Thanks for the patch, I miss the addition of this new API.
Quoted 25 lines
drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/mmc/stm32_sdmmc2.c index renamed from drivers/mmc/stm32_sdmmc2.c +0
-0
6d50356217..77871d5afc100644drivers/mmc/stm32_sdmmc2.c +0
-8@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ; -/* fall through */
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 686
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +2
-8-case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ; +mmc_of_parse (dev, cfg);
Result of mmc_of_parse is not tested ?
I proposed:
+ ret = mmc_of_parse(dev, cfg);
+ if (ret)
+ return ret;
Quoted 5 lines
drivers/mmc/stm32_sdmmc2.c +0
-1upriv->mmc = &plat->mmc; --2.25.4
I test this patch with a trace in stm32_sdmmc2_probe on STM32MP157C-EV1
Before the patch :cfg->host_caps = 0x2000000e (SD card)cfg->host_caps = 0x6000000e (eMMC)
After the patch:cfg->host_caps = 0x300001e6 (SD card)cfg->host_caps = 0x70004006 (eMMC)
I see 2 problem here :
1/ MMC_MODE_HS_52MHz = MMC_CAP(MMC_HS_52) is removed
and the eMMC on EV1 use only at 26MHz instead 52MHz before the patch
Mode: MMC High Speed (52MHz)
=>
Mode: MMC High Speed (26MHz)
The "cap-mmc-highspeed" is used in Linux for MMC HS at 26MHz or 52MHz
./Documentation/devicetree/bindings/mmc/mmc-controller.yaml:122:
cap-mmc-highspeed:
$ref: /schemas/types.yaml#/definitions/flag description:
MMC high-speed timing is supported.
And in Linux mmc/core/mmc.c
static void mmc_select_card_type(struct mmc_card *card)
{
.....
if (caps & MMC_CAP_MMC_HIGHSPEED &&
card_type & EXT_CSD_CARD_TYPE_HS_26) {
hs_max_dtr = MMC_HIGH_26_MAX_DTR;
avail_type |= EXT_CSD_CARD_TYPE_HS_26;
}
if (caps & MMC_CAP_MMC_HIGHSPEED &&
card_type & EXT_CSD_CARD_TYPE_HS_52) {
hs_max_dtr = MMC_HIGH_52_MAX_DTR;
avail_type |= EXT_CSD_CARD_TYPE_HS_52;
}
....include/linux/mmc/mmc.h:347:
#define EXT_CSD_CARD_TYPE_HS_26 (1<<0) /* Card can run at 26MHz */ #define EXT_CSD_CARD_TYPE_HS_52 (1<<1) /* Card can run@52MHz */
I think that it is a issue U-Boot, in mmc uclass in mmc_of_parse():
if (dev_read_bool(dev, "cap-mmc-highspeed"))
- cfg->host_caps |= MMC_CAP(MMC_HS);
+ cfg->host_caps |= MMC_CAP(MMC_HS) | MMC_CAP(MMC_HS_52);
In U-Boot this capability is splitted in 2 bits = one for 26MHz one for 52MHz And for card side it is managed on card side by mmc_get_capabilities()
include/mmc.h:254:
#define EXT_CSD_CARD_TYPE_26 (1 << 0) /* Card can run at 26MHz */ #define EXT_CSD_CARD_TYPE_52 (1 << 1) /* Card can run@52MHz */
A other solution is to only impact the sdmmc driver..... and to activate 52MHZ mode support is frequency is >= 26MHz
cfg->f_max = 52000000; ret = mmc_of_parse(dev, cfg); if (ret) return ret; if ((cfg->host_caps & MMC_HS) && cfg->f_max > 26000000) cfg->host_caps |= MMC_HS_52;
but I prefer the previous generic solution in u-class.
2) some host caps can be added in device tree (they are supported by SOC and by Linux driver) but they are not supported by U-Boot driver, for example:
#define MMC_MODE_DDR_52MHz MMC_CAP(MMC_DDR_52)
#define MMC_MODE_HS200 MMC_CAP(MMC_HS_200)
#define MMC_MODE_HS400 MMC_CAP(MMC_HS_400)
#define MMC_MODE_HS400_ES MMC_CAP(MMC_HS_400_ES)
MMC_CAP(UHS_SDR12)MMC_CAP(UHS_SDR25)MMC_CAP(UHS_SDR50)MMC_CAP(UHS_SDR104)MMC_CAP(UHS_DDR50)
I afraid (I don't sure) that this added caps change the mmc core behavior in U-Boot = U-Boot try to select the high speed mode even if not supported by driver....
The host_caps bitfield should be limited by the supported features in the driver (or remove the unsupported features)
#define SDMMC_SUPPORTED_CAPS (MMC_MODE_1BIT | MMC_MODE_4BIT | MMC_MODE_8BIT | MMC_CAP_CD_ACTIVE_HIGH | MMC_CAP_NEEDS_POLL | MMC_CAP_NONREMOVABLE | MMC_MODE_HS | MMC_MODE_HS_52MHz) or
#define SDMMC_UNSUPPORTED_CAPS (MMC_MODE_DDR_52MHz | MMC_MODE_HS200 | MMC_MODE_HS400 | MMC_MODE_HS400_ES | UHS_CAPS)
cfg->f_max = 52000000; ret = mmc_of_parse(dev, cfg); if (ret) return ret; cfg->host_caps &= SDMMC_SUPPORTED_CAPS; or cfg->host_caps |= ~SDMMC_UNSUPPORTED_CAPS;
Best Regards
Patrick
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Quoted 1 line · Patrick DELAUNAY
Hi Alexandru,
Hi
[snip]
Review
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 685
Quoted 2 lines
drivers/mmc/stm32_sdmmc2.c +2
-0+ cfg->f_max =52000000 ; +mmc_of_parse (dev, cfg);Result of
mmc_of_parseis not tested ?I proposed:
(quoted diff) +3
-0+ ret = mmc_of_parse(dev, cfg); + if (ret) + return ret;
You're right. I'll get that updated.
Quoted 1 line
I test this patch with a trace in
stm32_sdmmc2_probeon STM32MP157C-EV1
[snip]
Quoted 8 lines
I think that it is a issue U-Boot, in mmc uclass in
mmc_of_parse():if (
dev_read_bool(dev, "cap-mmc-highspeed"))(quoted diff) +1
-1- cfg->host_caps |= MMC_CAP(MMC_HS); + cfg->host_caps |= MMC_CAP(MMC_HS) | MMC_CAP(MMC_HS_52);In U-Boot this capability is splitted in 2 bits = one for 26MHz one for 52MHz And for card side it is managed on card side by
mmc_get_capabilities()
I agree. I am preparing a patch to address this.
[snip]
Quoted 11 lines
2) some host caps can be added in device tree (they are supported by SOC and by Linux driver) but they are not supported by U-Boot driver, for example:
#define
MMC_MODE_DDR_52MHzMMC_CAP(MMC_DDR_52)
#defineMMC_MODE_HS200MMC_CAP(MMC_HS_200)
#defineMMC_MODE_HS400MMC_CAP(MMC_HS_400)
#defineMMC_MODE_HS400_ESMMC_CAP(MMC_HS_400_ES)I afraid (I don't sure) that this added caps change the mmc core behavior in U-Boot = U-Boot try to select the high speed mode even if not supported by driver....
Two issues here. The first is when devicetree enables an unsupported mode, say "mmc-hs400-1_2v". That's a devicetree bug, and not something we should fix in the code. Hypothetical exam: DT says
bus-width = <8>;
but only four lines are routed on the board.
The second issue is what happens when somebody plugs in a UHS SD card? UHS support is not enabled by default in the stm32mp1 defconfigs, so the mmc core won't try to run it at UHS.
Now if somebody were to enable UHS manually:
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
Then yes, the UHS switch will be attempted, fail, and the card will not be detected.
To work around that, one could implement a .wait_dat0() that returns an error other than -ENOSYS. This would cause mmc_switch_voltage() to fail, making the mmc core to leave the card at default speeds.
My argument is that it takes conscious effort to break things in the first place, so it's not a situation we should worry about.
Quoted 1 line
The
host_capsbitfield should be limited by the supported features in the driver (or remove the unsupported features)
[snip]
Quoted 3 lines
cfg->host_caps &= SDMMC_SUPPORTED_CAPS; or cfg->host_caps |= ~SDMMC_UNSUPPORTED_CAPS;
I think this sort of playing with the flags will cause more confusion. People would expect this to come from DT. For example, somebody sets "sd-uhs-ddr52" in devicetree. It's more confusing to check host_caps, and find that MMC_MODE_DDR_52MHz is not set than it is to see the driver trying to place the card in DDR52 and failing.
Alex
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Hi Alex,
Quoted 15 lines
From: Alex G. <[email protected]>
Sent: jeudi 10 septembre 2020 22:10Quoted 1 line · Patrick DELAUNAY
Hi Alexandru,
Hi
[snip]
Quoted 5 lines
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 685
Quoted 2 lines
drivers/mmc/stm32_sdmmc2.c +2
-0+ cfg->f_max =52000000 ; +mmc_of_parse (dev, cfg);Result of
mmc_of_parseis not tested ?
Quoted 7 lines
Review
Quoted 5 lines
I proposed:
(quoted diff) +3
-0+ ret = mmc_of_parse(dev, cfg); + if (ret) + return ret;You're right. I'll get that updated.
Thanks;
Quoted 11 lines
Quoted 3 lines
I test this patch with a trace in
stm32_sdmmc2_probeon STM32MP157C-EV1[snip]
Review
Quoted 5 lines
I think that it is a issue U-Boot, in mmc uclass in
mmc_of_parse():if (
dev_read_bool(dev, "cap-mmc-highspeed"))(quoted diff) +1
-1- cfg->host_caps |= MMC_CAP(MMC_HS); + cfg->host_caps |= MMC_CAP(MMC_HS) |
MMC_CAP(MMC_HS_52);Quoted 1 line
Quoted 5 lines
Quoted 3 lines
In U-Boot this capability is splitted in 2 bits = one for 26MHz one for 52MHz And for card side it is managed on card side by
mmc_get_capabilities()I agree. I am preparing a patch to address this.
Thanks;
Quoted 14 lines
[snip]
Quoted 1 line
2) some host caps can be added in device tree (they are supported by SOC and
by Linux driver)
Quoted 10 lines
but they are not supported by U-Boot driver, for example:
#define
MMC_MODE_DDR_52MHzMMC_CAP(MMC_DDR_52)
#defineMMC_MODE_HS200MMC_CAP(MMC_HS_200)
#defineMMC_MODE_HS400MMC_CAP(MMC_HS_400)
#defineMMC_MODE_HS400_ESMMC_CAP(MMC_HS_400_ES)I afraid (I don't sure) that this added caps change the mmc core behavior in U-Boot = U-Boot try to select the high speed mode even if not
Quoted 7 lines
supported by driver....
Two issues here. The first is when devicetree enables an unsupported mode, say "mmc-hs400-1_2v". That's a devicetree bug, and not something we should fix in the code. Hypothetical exam: DT says
bus-width = <8>;but only four lines are routed on the board.
Yes it is a device tree issue when the mode is not supported by board / SOC.
But high mode is supported by the STM32MP15x SOC but only if additional Operation are done (IO configuration to support higher speed)
It is not supported in U-Boot driver (yet ?) but it is supported by Linux driver...
Quoted 9 lines
The second issue is what happens when somebody plugs in a UHS SD card? UHS support is not enabled by default in the stm32mp1 defconfigs, so the mmc core won't try to run it at UHS.
Now if somebody were to enable UHS manually:
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
Then yes, the UHS switch will be attempted, fail, and the card will not be detected.
Quoted 7 lines
To work around that, one could implement a .wait_dat0() that returns an error other than
-ENOSYS. This would causemmc_switch_voltage()to fail, making the mmc core to leave the card at default speeds.My argument is that it takes conscious effort to break things in the first place, so it's not a situation we should worry about.
Yes we should have issue only if UHS defconfig was activated (CONFIG_MMC_UHS_SUPPORT, CONFIG_MMC_HS*_SUPPORT)....
And it is not the case today in stm32*defconfig
And my proposal is protection (over).
Quoted 7 lines
Quoted 1 line
The
host_capsbitfield should be limited by the supported features in the driver(or remove the unsupported features)
[snip]Quoted 3 lines
cfg->host_caps &= SDMMC_SUPPORTED_CAPS; or cfg->host_caps |= ~SDMMC_UNSUPPORTED_CAPS;
Quoted 5 lines
I think this sort of playing with the flags will cause more confusion. People would expect this to come from DT. For example, somebody sets "sd-uhs-ddr52" in devicetree. It's more confusing to check
host_caps, and find thatMMC_MODE_DDR_52MHzis not set than it is to see the driver trying to place the card in DDR52 and failing.
- card_caps = CARD capacity
For you
- host_caps is SOC capacity (read from DT)
For me
- host_caps is SOC capacity (read from DT) AND driver capacity
=> then in mmc u-class, the real capacity is host_caps | card_caps
I already see this kind of limitation in one driver
omap_hsmmc.c:1939: cfg->host_caps &= ~fixups->unsupported_caps;
But I agree it is today an over protection on host_caps and it can be confusing so you can forget this point....
Quoted 1 line
Alex
Regards
Patrick
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
In reply to Alexandru GagniucQuoted 30 lines · Alexandru Gagniuc
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/mmc/stm32_sdmmc2.c +0
-7@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ;
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 684
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +1
-9-/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ;
cfg->f_max can be also removed?
Best Regards,
Jaehoon Chung
Quoted 5 lines
drivers/mmc/stm32_sdmmc2.c +1
-0+mmc_of_parse (dev, cfg); upriv->mmc = &plat->mmc;
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Hi Jaehoon
Quoted 48 lines
From: Jaehoon Chung <[email protected]>
Sent: vendredi 11 septembre 2020 09:50Quoted 15 lines · Alexandru Gagniuc
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/mmc/stm32_sdmmc2.c +0
-0drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 679
Quoted 5 lines
drivers/mmc/stm32_sdmmc2.c +0
-1@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 |
MMC_VDD_165_195;Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +0
-6cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ;drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 684
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +1
-9-/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ;
cfg->f_maxcan be also removed?
Quoted 2 lines
Best Regards,
Jaehoon Chung
I don't think because " max-frequency" is optional in device tree (only "reg" is required)
Here 52MHz is a default value when it is absent in device tree That avoids cfg->f_max = 0 after mmc_of_parse() call.
Quoted 6 lines
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 688
Quoted 6 lines
drivers/mmc/stm32_sdmmc2.c +1
-0+mmc_of_parse (dev, cfg); upriv->mmc = &plat->mmc;
Patrick
PATCH 1/1 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Quoted 12 lines · Patrick DELAUNAY
Hi Jaehoon
Quoted 10 lines
From: Jaehoon Chung <[email protected]>
Sent: vendredi 11 septembre 2020 09:50Quoted 6 lines · Alexandru Gagniuc
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 55 lines
Quoted 38 lines
Quoted 9 lines
--- drivers/mmc/stm32_sdmmc2.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/mmc/stm32_sdmmc2.c +0
-0drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 679
Quoted 5 lines
drivers/mmc/stm32_sdmmc2.c +0
-1@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 |
MMC_VDD_165_195;Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +0
-6cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ;drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 684
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +1
-9-/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } + cfg->f_max =52000000 ;
cfg->f_maxcan be also removed?Quoted 2 lines
Best Regards,
Jaehoon ChungI don't think because " max-frequency" is optional in device tree (only "reg" is required)
Here 52MHz is a default value when it is absent in device tree That avoids
cfg->f_max= 0 aftermmc_of_parse()call.Quoted 6 lines
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 688
Quoted 6 lines
drivers/mmc/stm32_sdmmc2.c +1
-0+mmc_of_parse (dev, cfg); upriv->mmc = &plat->mmc;Patrick
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
In reply to Alexandru Gagniuc"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed" is used for MMC HS at both 26MHz and 52MHz.
Use the same approach and enable MMC_CAP(MMC_HS_52) host capability when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllers
--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/mmc-uclass.c +1 -1
@@ -198,7 +198,7 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)if (dev_read_bool (dev,"cap-sd-highspeed" )) cfg->host_caps |=MMC_CAP (SD_HS );if (dev_read_bool (dev,"cap-mmc-highspeed" )) - cfg->host_caps |=MMC_CAP (MMC_HS ); + cfg->host_caps |=MMC_CAP (MMC_HS ) |MMC_CAP (MMC_HS_52 );if (dev_read_bool (dev,"sd-uhs-sdr12" )) cfg->host_caps |=MMC_CAP (UHS_SDR12 );if (dev_read_bool (dev,"sd-uhs-sdr25" ))
Signature · 1 line
2.25.4
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
Hi,
Quoted 33 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed"
is used for MMC HS at both 26MHz and 52MHz.Use the same approach and enable
MMC_CAP(MMC_HS_52)host capability when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllersSigned-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/mmc-uclass.c index renamed from drivers/mmc/mmc-uclass.c +0
-0
90690c8d1e..6d2310eff3100644drivers/mmc/mmc-uclass.c +1
-1@@ -198,7 +198,7 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)if (dev_read_bool (dev,"cap-sd-highspeed" )) cfg->host_caps |=MMC_CAP (SD_HS );if (dev_read_bool (dev,"cap-mmc-highspeed" )) - cfg->host_caps |=MMC_CAP (MMC_HS ); + cfg->host_caps |=MMC_CAP (MMC_HS ) |MMC_CAP (MMC_HS_52 );if (dev_read_bool (dev,"sd-uhs-sdr12" ))drivers/mmc/mmc-uclass.c +0
-1cfg->host_caps |=MMC_CAP (UHS_SDR12 );if (dev_read_bool (dev,"sd-uhs-sdr25" )) --
Quoted 1 line
2.25.4
Tested on STM32MP157C-EV1, for mmc 1 = emmc with patch [1]
Mode: MMC High Speed (52MHz)
[1]: mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
http://patchwork.ozlabs.org/project/uboot/patch/20200909215402.366561-1-mr.nuke.me at gmail.com/
Thanks
Patrick
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
Hi Peng,
Quoted 26 lines
From: Uboot-stm32 <[email protected]> On Behalf Of Patrick DELAUNAY
Hi,
Quoted 12 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed" is used for MMC HS at both 26MHz and 52MHz.
Use the same approach and enable
MMC_CAP(MMC_HS_52)host capability when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllersQuoted 5 lines
Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Reviewed-by Patrick Delaunay <[email protected]>Tested-by Patrick Delaunay <[email protected]>
Quoted 7 lines
Tested on STM32MP157C-EV1, for mmc 1 = emmc with patch [1]
Mode: MMC High Speed (52MHz)
[1]: mmc:
stm32_sdmmc2: Usemmc_of_parse()to read host capabilitieshttp://patchwork.ozlabs.org/project/uboot/patch/20200909215402.366561-1-mr.nuke.me at gmail.com/
Today this patch is delegate to me in patchwork even it is a mmc core patch:
http://patchwork.ozlabs.org/project/uboot/list/?series=201912
You are OK if I integrate this patch in my stm32 pull request for v2020.01-rc1 or I delegate to you ?
Quoted 8 lines
Thanks
Patrick
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
Quoted 63 lines
Subject: RE: [PATCH 1/2] mmc:
mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"Hi Peng,
Quoted 1 line
From: Uboot-stm32
Quoted 12 lines
On Behalf Of Patrick DELAUNAY
Hi,
Quoted 8 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed" is used for MMC HS at both 26MHz and 52MHz.
Use the same approach and enable
MMC_CAP(MMC_HS_52)hostcapability
Quoted 13 lines
Quoted 9 lines
when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllers
Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Reviewed-by Patrick Delaunay <[email protected]>Tested-by Patrick Delaunay <[email protected]>Quoted 8 lines
Tested on STM32MP157C-EV1, for mmc 1 = emmc with patch [1]
Mode: MMC High Speed (52MHz)
[1]: mmc:
stm32_sdmmc2: Usemmc_of_parse()to read host capabilitieshttps://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
work.ozlabs.org%2Fproject%2Fuboot%2Fpatch%2F20200909215402.366561- 1-&a
Quoted 1 line
mp;data=02%7C01%7Cpeng.fan%40nxp.com%7C2242885f15fb4bc5a38508d
866d261cQuoted 1 line
e%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63737240105383 8309&
Quoted 1 line
sdata=NJ1fDTquBTBOQVMdxYf3gTExxkNEHeZ9mnazXAKY0GQ%3D&rese rved=0
Quoted 1 line
mr.nuke.me at gmail.com/
Today this patch is delegate to me in patchwork even it is a mmc core patch:
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchw
ork.ozlabs.org%2Fproject%2Fuboot%2Flist%2F%3Fseries%3D201912&da ta=02%7C01%7Cpeng.fan%40nxp.com%7C2242885f15fb4bc5a38508d866d2 61ce%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63737240105 3848304&sdata=J4b9Dy%2FnujRrpiYtaQbIq68w%2F2FfKlKoMheH8Mtae P8%3D&reserved=0
Quoted 2 lines
You are OK if I integrate this patch in my stm32 pull request for v2020.01-rc1 or I delegate to you ?
You could take that first. My PR will be later.
Thanks,
Peng.
Quoted 21 lines
Quoted 10 lines
Thanks
Patrick
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fst-md-mailman.stormreply.com%2Fmailman%2Flistinfo%2Fuboot-stm32&dat a=0
Quoted 1 line
2%7C01%7Cpeng.fan%40nxp.com%7C2242885f15fb4bc5a38508d866d261ce %7C686ea
Quoted 1 line
1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637372401053848304& sdata=DDw
Quoted 1 line
sEwf%2F%2B3JOeITkO2pnUjJFu4hpru5DqY5FUGNnXdM%3D&reserved= 0
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
In reply to Alexandru GagniucHi Alexndru
Quoted 19 lines · Alexandru Gagniuc
"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed" is used for MMC HS at both 26MHz and 52MHz.
Use the same approach and enable
MMC_CAP(MMC_HS_52)host capability when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllersSigned-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/mmc-uclass.c +0
-0
drivers/mmc/mmc-uclass.c int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg) · line 204
Quoted 8 lines
drivers/mmc/mmc-uclass.c +1
-1@@ -198,7 +198,7 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)if (dev_read_bool (dev,"cap-sd-highspeed" )) cfg->host_caps |=MMC_CAP (SD_HS );if (dev_read_bool (dev,"cap-mmc-highspeed" )) - cfg->host_caps |=MMC_CAP (MMC_HS ); + cfg->host_caps |=MMC_CAP (MMC_HS ) |MMC_CAP (MMC_HS_52 );if (dev_read_bool (dev,"sd-uhs-sdr12" )) cfg->host_caps |=MMC_CAP (UHS_SDR12 );if (dev_read_bool (dev,"sd-uhs-sdr25" ))
Thanks
PATCH 1/2 mmc: mmc_of_parse: Enable 52 MHz support with "cap-mmc-highspeed"
In reply to Alexandru GagniucHi Alexandru,
Quoted 19 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52
To: uboot-stm32 at st-md-mailman.stormreply.com; peng.fan at nxp.com
Cc: Alexandru Gagniuc <[email protected]>; Patrick DELAUNAY <[email protected]>; Patrice CHOTARD <[email protected]>; u- boot at lists.denx.de
Subject: [PATCH 1/2] mmc:mmc_of_parse: Enable 52 MHz support with "cap- mmc-highspeed"
Importance: High"cap-mmc-highspeed" enables support for 26 MHz MMC, but there is no additional flag to enable 52 MHz MMC. In Linux. "cap-mmc-highspeed"
is used for MMC HS at both 26MHz and 52MHz.Use the same approach and enable
MMC_CAP(MMC_HS_52)host capability when "cap-mmc-highspeed" is found in the devicetree. In the event an MMC card doesn't support 52 MHz, it will be clocked at a speed based on its EXT CSD, even on 52 MHz host controllers
Quoted 5 lines
Signed-off-by Alexandru Gagniuc <[email protected]>--- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-stm/master, thanks!
Regards
Patrick
PATCH v2 2/2 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
In reply to Alexandru Gagniucmmc_of_parse() can populate the 'f_max' and 'host_caps' fields of struct mmc_config from devicetree.
The same logic is duplicated in stm32_sdmmc2_probe(). Use mmc_of_parse(), which is more generic.
---
Changes from v1:
- Check the return value of mmc_of_parse().
- The call to mmc_of_parse() is moved further up. This means we can just 'return err' on error instead of exiting via goto.
drivers/mmc/stm32_sdmmc2.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
drivers/mmc/stm32_sdmmc2.c +6 -18
@@ -653,6 +653,12 @@ static int stm32_sdmmc2_probe(struct udevice *dev)if (priv->base ==FDT_ADDR_T_NONE )return -EINVAL ; + cfg->host_caps =0 ; + cfg->f_max =52000000 ; + ret =mmc_of_parse (dev, cfg); +if (ret <0 ) +return ret; +if (dev_read_bool (dev,"st,neg-edge" )) priv->clk_reg_msk |=SDMMC_CLKCR_NEGEDGE ;if (dev_read_bool (dev,"st,sig-dir" ))
@@ -676,28 +682,10 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; - cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ; -/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ; -break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } - upriv->mmc = &plat->mmc;/* SDMMC init */
Signature · 1 line
2.25.4
PATCH v2 2/2 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
Hi,
Quoted 9 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>
Quoted 9 lines
---
Changes from v1:
- Check the return value ofmmc_of_parse().
- The call tommc_of_parse()is moved further up. This means we can just 'return err' on error instead of exiting via goto.drivers/mmc/stm32_sdmmc2.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
Thanks
Patrick
PATCH v2 2/2 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
In reply to Alexandru GagniucHi Alexandru
Quoted 51 lines · Alexandru Gagniuc
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>---
Changes from v1:
- Check the return value ofmmc_of_parse().
- The call tommc_of_parse()is moved further up. This means we can just 'return err' on error instead of exiting via goto.drivers/mmc/stm32_sdmmc2.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)drivers/mmc/stm32_sdmmc2.c +6
-11@@ -653,6 +653,12 @@ static int stm32_sdmmc2_probe(struct udevice *dev)if (priv->base ==FDT_ADDR_T_NONE )return -EINVAL ; + cfg->host_caps =0 ; + cfg->f_max =52000000 ; + ret =mmc_of_parse (dev, cfg); +if (ret <0 ) +return ret; +if (dev_read_bool (dev,"st,neg-edge" )) priv->clk_reg_msk |=SDMMC_CLKCR_NEGEDGE ;if (dev_read_bool (dev,"st,sig-dir" ))@@ -676,28 +682,10 @@ static int stm32_sdmmc2_probe(struct udevice *dev) GPIOD_IS_IN); cfg->f_min =400000 ; - cfg->f_max =dev_read_u32_default (dev,"max-frequency" ,52000000 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; cfg->name ="STM32 SD/MMC" ; - cfg->host_caps =0 ; -if (cfg->f_max >25000000 ) - cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ; - -switch (dev_read_u32_default (dev,"bus-width" ,1 )) { -case 8 : - cfg->host_caps |=MMC_MODE_8BIT ; -/* fall through */ -case 4 : - cfg->host_caps |=MMC_MODE_4BIT ;
drivers/mmc/stm32_sdmmc2.c static int stm32_sdmmc2_probe(struct udevice *dev) · line 691
Quoted 10 lines
drivers/mmc/stm32_sdmmc2.c +0
-7-break ; -case 1 : -break ; -default : -pr_err ("invalid \"bus-width\" property, force to 1\n" ); - } - upriv->mmc = &plat->mmc;/* SDMMC init */
Thanks
PATCH v2 2/2 mmc: stm32_sdmmc2: Use mmc_of_parse() to read host capabilities
In reply to Alexandru GagniucHi Alexandru,
Quoted 9 lines
From: Alexandru Gagniuc <[email protected]>
Sent: mardi 15 septembre 2020 21:52
mmc_of_parse()can populate the 'f_max' and 'host_caps' fields of structmmc_configfrom devicetree.
The same logic is duplicated instm32_sdmmc2_probe(). Usemmc_of_parse(), which is more generic.Signed-off-by Alexandru Gagniuc <[email protected]>
Quoted 9 lines
---
Changes from v1:
- Check the return value ofmmc_of_parse().
- The call tommc_of_parse()is moved further up. This means we can just 'return err' on error instead of exiting via goto.drivers/mmc/stm32_sdmmc2.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
Applied to u-boot-stm/master, thanks!
Regards
Patrick