aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-24 08:36:29 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commite25080664adaecbd2bf0001ca3e66978fd6766b4 (patch)
treedcfff48d5236c7b942f379b3a78f81ed7144b1c4
parent4854ebc57e88f371963b5fa12587a3dd5e116e79 (diff)
downloadu-boot-e25080664adaecbd2bf0001ca3e66978fd6766b4.tar.gz
u-boot-e25080664adaecbd2bf0001ca3e66978fd6766b4.tar.xz
u-boot-e25080664adaecbd2bf0001ca3e66978fd6766b4.zip
clk: 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>
-rw-r--r--drivers/clk/altera/clk-arria10.c1
-rw-r--r--drivers/clk/clk_pic32.c1
-rw-r--r--drivers/clk/clk_zynq.c1
-rw-r--r--drivers/clk/exynos/clk-exynos7420.c3
-rw-r--r--drivers/clk/owl/clk_s900.c1
5 files changed, 0 insertions, 7 deletions
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 78102c760d..612a1718dc 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -352,7 +352,6 @@ static const struct udevice_id socfpga_a10_clk_match[] = {
352U_BOOT_DRIVER(socfpga_a10_clk) = { 352U_BOOT_DRIVER(socfpga_a10_clk) = {
353 .name = "clk-a10", 353 .name = "clk-a10",
354 .id = UCLASS_CLK, 354 .id = UCLASS_CLK,
355 .flags = DM_FLAG_PRE_RELOC,
356 .of_match = socfpga_a10_clk_match, 355 .of_match = socfpga_a10_clk_match,
357 .ops = &socfpga_a10_clk_ops, 356 .ops = &socfpga_a10_clk_ops,
358 .bind = socfpga_a10_clk_bind, 357 .bind = socfpga_a10_clk_bind,
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index fdf95a12da..b3ac0d5a92 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -418,7 +418,6 @@ U_BOOT_DRIVER(pic32_clk) = {
418 .name = "pic32_clk", 418 .name = "pic32_clk",
419 .id = UCLASS_CLK, 419 .id = UCLASS_CLK,
420 .of_match = pic32_clk_ids, 420 .of_match = pic32_clk_ids,
421 .flags = DM_FLAG_PRE_RELOC,
422 .ops = &pic32_pic32_clk_ops, 421 .ops = &pic32_pic32_clk_ops,
423 .probe = pic32_clk_probe, 422 .probe = pic32_clk_probe,
424 .priv_auto_alloc_size = sizeof(struct pic32_clk_priv), 423 .priv_auto_alloc_size = sizeof(struct pic32_clk_priv),
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index d647e0a01e..482f0937cb 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -480,7 +480,6 @@ U_BOOT_DRIVER(zynq_clk) = {
480 .name = "zynq_clk", 480 .name = "zynq_clk",
481 .id = UCLASS_CLK, 481 .id = UCLASS_CLK,
482 .of_match = zynq_clk_ids, 482 .of_match = zynq_clk_ids,
483 .flags = DM_FLAG_PRE_RELOC,
484 .ops = &zynq_clk_ops, 483 .ops = &zynq_clk_ops,
485 .priv_auto_alloc_size = sizeof(struct zynq_clk_priv), 484 .priv_auto_alloc_size = sizeof(struct zynq_clk_priv),
486 .probe = zynq_clk_probe, 485 .probe = zynq_clk_probe,
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index 763567b17c..aa86c7ca44 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -201,7 +201,6 @@ U_BOOT_DRIVER(exynos7420_clk_topc) = {
201 .probe = exynos7420_clk_topc_probe, 201 .probe = exynos7420_clk_topc_probe,
202 .priv_auto_alloc_size = sizeof(struct exynos7420_clk_topc_priv), 202 .priv_auto_alloc_size = sizeof(struct exynos7420_clk_topc_priv),
203 .ops = &exynos7420_clk_topc_ops, 203 .ops = &exynos7420_clk_topc_ops,
204 .flags = DM_FLAG_PRE_RELOC,
205}; 204};
206 205
207static const struct udevice_id exynos7420_clk_top0_compat[] = { 206static const struct udevice_id exynos7420_clk_top0_compat[] = {
@@ -216,7 +215,6 @@ U_BOOT_DRIVER(exynos7420_clk_top0) = {
216 .probe = exynos7420_clk_top0_probe, 215 .probe = exynos7420_clk_top0_probe,
217 .priv_auto_alloc_size = sizeof(struct exynos7420_clk_top0_priv), 216 .priv_auto_alloc_size = sizeof(struct exynos7420_clk_top0_priv),
218 .ops = &exynos7420_clk_top0_ops, 217 .ops = &exynos7420_clk_top0_ops,
219 .flags = DM_FLAG_PRE_RELOC,
220}; 218};
221 219
222static const struct udevice_id exynos7420_clk_peric1_compat[] = { 220static const struct udevice_id exynos7420_clk_peric1_compat[] = {
@@ -229,5 +227,4 @@ U_BOOT_DRIVER(exynos7420_clk_peric1) = {
229 .id = UCLASS_CLK, 227 .id = UCLASS_CLK,
230 .of_match = exynos7420_clk_peric1_compat, 228 .of_match = exynos7420_clk_peric1_compat,
231 .ops = &exynos7420_clk_peric1_ops, 229 .ops = &exynos7420_clk_peric1_ops,
232 .flags = DM_FLAG_PRE_RELOC,
233}; 230};
diff --git a/drivers/clk/owl/clk_s900.c b/drivers/clk/owl/clk_s900.c
index 2b39bb99af..a7c15d2812 100644
--- a/drivers/clk/owl/clk_s900.c
+++ b/drivers/clk/owl/clk_s900.c
@@ -134,5 +134,4 @@ U_BOOT_DRIVER(clk_owl) = {
134 .ops = &owl_clk_ops, 134 .ops = &owl_clk_ops,
135 .priv_auto_alloc_size = sizeof(struct owl_clk_priv), 135 .priv_auto_alloc_size = sizeof(struct owl_clk_priv),
136 .probe = owl_clk_probe, 136 .probe = owl_clk_probe,
137 .flags = DM_FLAG_PRE_RELOC,
138}; 137};