aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-24 08:36:30 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commit695c4994ac1d997b34e278e4e04ffd63b2aa6aed (patch)
treeb554cb3b8f3fcaf85e833c1bc5a900c884c86b66 /drivers
parente25080664adaecbd2bf0001ca3e66978fd6766b4 (diff)
downloadu-boot-695c4994ac1d997b34e278e4e04ffd63b2aa6aed.tar.gz
u-boot-695c4994ac1d997b34e278e4e04ffd63b2aa6aed.tar.xz
u-boot-695c4994ac1d997b34e278e4e04ffd63b2aa6aed.zip
gpio: Remove DM_FLAG_PRE_RELOC flag in various drivers
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> Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/omap_gpio.c2
-rw-r--r--drivers/gpio/stm32f7_gpio.c2
-rw-r--r--drivers/gpio/tegra186_gpio.c1
-rw-r--r--drivers/gpio/tegra_gpio.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 555eba2662..0031415d03 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -372,7 +372,9 @@ U_BOOT_DRIVER(gpio_omap) = {
372 .ops = &gpio_omap_ops, 372 .ops = &gpio_omap_ops,
373 .probe = omap_gpio_probe, 373 .probe = omap_gpio_probe,
374 .priv_auto_alloc_size = sizeof(struct gpio_bank), 374 .priv_auto_alloc_size = sizeof(struct gpio_bank),
375#if !CONFIG_IS_ENABLED(OF_CONTROL)
375 .flags = DM_FLAG_PRE_RELOC, 376 .flags = DM_FLAG_PRE_RELOC,
377#endif
376}; 378};
377 379
378#endif /* CONFIG_DM_GPIO */ 380#endif /* CONFIG_DM_GPIO */
diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32f7_gpio.c
index 4c0786fff8..b903dc46b3 100644
--- a/drivers/gpio/stm32f7_gpio.c
+++ b/drivers/gpio/stm32f7_gpio.c
@@ -123,6 +123,6 @@ U_BOOT_DRIVER(gpio_stm32) = {
123 .of_match = stm32_gpio_ids, 123 .of_match = stm32_gpio_ids,
124 .probe = gpio_stm32_probe, 124 .probe = gpio_stm32_probe,
125 .ops = &gpio_stm32_ops, 125 .ops = &gpio_stm32_ops,
126 .flags = DM_FLAG_PRE_RELOC | DM_UC_FLAG_SEQ_ALIAS, 126 .flags = DM_UC_FLAG_SEQ_ALIAS,
127 .priv_auto_alloc_size = sizeof(struct stm32_gpio_priv), 127 .priv_auto_alloc_size = sizeof(struct stm32_gpio_priv),
128}; 128};
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index 1f0e8d51da..6626b5415a 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -281,5 +281,4 @@ U_BOOT_DRIVER(tegra186_gpio) = {
281 .bind = tegra186_gpio_bind, 281 .bind = tegra186_gpio_bind,
282 .probe = tegra186_gpio_probe, 282 .probe = tegra186_gpio_probe,
283 .ops = &tegra186_gpio_ops, 283 .ops = &tegra186_gpio_ops,
284 .flags = DM_FLAG_PRE_RELOC,
285}; 284};
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 302efddc27..a730f5c4fe 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -378,5 +378,4 @@ U_BOOT_DRIVER(gpio_tegra) = {
378 .probe = gpio_tegra_probe, 378 .probe = gpio_tegra_probe,
379 .priv_auto_alloc_size = sizeof(struct tegra_port_info), 379 .priv_auto_alloc_size = sizeof(struct tegra_port_info),
380 .ops = &gpio_tegra_ops, 380 .ops = &gpio_tegra_ops,
381 .flags = DM_FLAG_PRE_RELOC,
382}; 381};