aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-24 08:36:32 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commit223b10ca7a6b1d35db9c775033895969b132ad56 (patch)
tree5ee23d4067e5c30e4985a248496b0d74a9f47052 /drivers
parente0cfc20984a7ffbe5cb86a0c95ab5bf6287602b4 (diff)
downloadu-boot-223b10ca7a6b1d35db9c775033895969b132ad56.tar.gz
u-boot-223b10ca7a6b1d35db9c775033895969b132ad56.tar.xz
u-boot-223b10ca7a6b1d35db9c775033895969b132ad56.zip
mmc: omap: Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check
When a driver declares DM_FLAG_PRE_RELOC flag, it wishes to be bound before relocation. However due to a bug in the DM core, the flag only takes effect when devices are statically declared via U_BOOT_DEVICE(). This bug has been fixed recently by commit "dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()", but with the fix, it has a side effect that all existing drivers that declared DM_FLAG_PRE_RELOC flag will be bound before relocation now. This may expose potential boot failure on some boards due to insufficient memory during the pre-relocation stage. To mitigate this potential impact, the following changes are implemented: - Remove DM_FLAG_PRE_RELOC flag in the driver, if the driver only supports configuration from device tree (OF_CONTROL) - Keep DM_FLAG_PRE_RELOC flag in the driver only if the device is statically declared via U_BOOT_DEVICE() - Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check, for drivers that support both statically declared devices and configuration from device tree Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/omap_hsmmc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index ec853d063f..5cb97eb02a 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -1953,6 +1953,8 @@ U_BOOT_DRIVER(omap_hsmmc) = {
1953 .ops = &omap_hsmmc_ops, 1953 .ops = &omap_hsmmc_ops,
1954 .probe = omap_hsmmc_probe, 1954 .probe = omap_hsmmc_probe,
1955 .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), 1955 .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
1956#if !CONFIG_IS_ENABLED(OF_CONTROL)
1956 .flags = DM_FLAG_PRE_RELOC, 1957 .flags = DM_FLAG_PRE_RELOC,
1958#endif
1957}; 1959};
1958#endif 1960#endif