[U-Boot] [PATCH 00/13] dm: DM_FLAG_PRE

Discussion:

[U-Boot] [PATCH 00/13] dm: DM_FLAG_PRE_RELOC flag clean up

Bin Meng

2018-10-24 13:36:27 UTC

Permalink

--
2.7.4

Bin Meng

2018-10-24 13:36:28 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:33 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Patrick DELAUNAY

2018-10-29 17:15:08 UTC

Permalink

Sent: mercredi 24 octobre 2018 15:36
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
- 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
---
arch/arm/mach-stm32mp/bsec.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 0e152ef..d087a31 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -417,7 +417,6 @@ U_BOOT_DRIVER(stm32mp_bsec) = {
.ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata),
.ops = &stm32mp_bsec_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
/* bsec IP is not present in device tee, manage IP address by platdata */
--
2.7.4
_______________________________________________
U-Boot mailing list
https://lists.denx.de/listinfo/u-boot

Reviewed-by: Patrick Delaunay <***@st.com>

s***@google.com

2018-11-06 22:42:26 UTC

Permalink

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:34 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:50 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:17 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:29 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:37 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:24 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:32 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:45 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:21 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:30 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:40 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Patrick DELAUNAY

2018-10-29 17:20:59 UTC

Permalink

Sent: mercredi 24 octobre 2018 15:37
Subject: [U-Boot] [PATCH 03/13] 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
- 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
---
drivers/gpio/omap_gpio.c | 2 ++
drivers/gpio/stm32f7_gpio.c | 2 +-
drivers/gpio/tegra186_gpio.c | 1 -
drivers/gpio/tegra_gpio.c | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index
555eba2..0031415 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -372,7 +372,9 @@ U_BOOT_DRIVER(gpio_omap) = {
.ops = &gpio_omap_ops,
.probe = omap_gpio_probe,
.priv_auto_alloc_size = sizeof(struct gpio_bank),
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif /* CONFIG_DM_GPIO */
diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32f7_gpio.c index
4c0786f..b903dc4 100644
--- a/drivers/gpio/stm32f7_gpio.c
+++ b/drivers/gpio/stm32f7_gpio.c
@@ -123,6 +123,6 @@ U_BOOT_DRIVER(gpio_stm32) = {
.of_match = stm32_gpio_ids,
.probe = gpio_stm32_probe,
.ops = &gpio_stm32_ops,
- .flags = DM_FLAG_PRE_RELOC | DM_UC_FLAG_SEQ_ALIAS,
+ .flags = DM_UC_FLAG_SEQ_ALIAS,
.priv_auto_alloc_size = sizeof(struct stm32_gpio_priv),
};
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c index
1f0e8d5..6626b54 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -281,5 +281,4 @@ U_BOOT_DRIVER(tegra186_gpio) = {
.bind = tegra186_gpio_bind,
.probe = tegra186_gpio_probe,
.ops = &tegra186_gpio_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index
302efdd..a730f5c 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -378,5 +378,4 @@ U_BOOT_DRIVER(gpio_tegra) = {
.probe = gpio_tegra_probe,
.priv_auto_alloc_size = sizeof(struct tegra_port_info),
.ops = &gpio_tegra_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
--
2.7.4

Reviewed-by: Patrick Delaunay <***@st.com>

s***@google.com

2018-11-06 22:42:23 UTC

Permalink

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:35 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:53 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:16 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:33 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:47 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:18 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:37 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:29:01 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:13 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:38 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:29:04 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:12 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:36 UTC

Permalink

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 <***@gmail.com>
---

drivers/serial/altera_jtag_uart.c | 1 -
drivers/serial/altera_uart.c | 1 -
drivers/serial/arm_dcc.c | 1 -
drivers/serial/atmel_usart.c | 2 ++
drivers/serial/ns16550.c | 2 ++
drivers/serial/serial_ar933x.c | 1 -
drivers/serial/serial_arc.c | 1 -
drivers/serial/serial_bcm283x_mu.c | 2 ++
drivers/serial/serial_bcm283x_pl011.c | 2 ++
drivers/serial/serial_bcm6345.c | 1 -
drivers/serial/serial_efi.c | 1 -
drivers/serial/serial_intel_mid.c | 1 -
drivers/serial/serial_lpuart.c | 1 -
drivers/serial/serial_meson.c | 1 -
drivers/serial/serial_mvebu_a3700.c | 1 -
drivers/serial/serial_mxc.c | 2 ++
drivers/serial/serial_omap.c | 2 ++
drivers/serial/serial_owl.c | 1 -
drivers/serial/serial_pic32.c | 1 -
drivers/serial/serial_pl01x.c | 2 ++
drivers/serial/serial_s5p.c | 1 -
drivers/serial/serial_sh.c | 2 ++
drivers/serial/serial_sti_asc.c | 1 -
drivers/serial/serial_stm32.c | 2 ++
drivers/serial/serial_xuartlite.c | 1 -
drivers/serial/serial_zynq.c | 1 -
26 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 61052a9..86c3de4 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -121,7 +121,6 @@ U_BOOT_DRIVER(altera_jtaguart) = {
.platdata_auto_alloc_size = sizeof(struct altera_jtaguart_platdata),
.probe = altera_jtaguart_probe,
.ops = &altera_jtaguart_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_ALTERA_JTAGUART
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index b7b0a13..67d4719 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -117,7 +117,6 @@ U_BOOT_DRIVER(altera_uart) = {
.platdata_auto_alloc_size = sizeof(struct altera_uart_platdata),
.probe = altera_uart_probe,
.ops = &altera_uart_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_ALTERA_UART
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 43e8691..dfcb6fd 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -155,7 +155,6 @@ U_BOOT_DRIVER(serial_dcc) = {
.id = UCLASS_SERIAL,
.of_match = arm_dcc_ids,
.ops = &arm_dcc_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_ARM_DCC
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 9414f5f..aa8cdff 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -294,7 +294,9 @@ U_BOOT_DRIVER(serial_atmel) = {
#endif
.probe = atmel_serial_probe,
.ops = &atmel_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct atmel_serial_priv),
};
#endif
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index f9041aa..3c8bc2b 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -473,7 +473,9 @@ U_BOOT_DRIVER(ns16550_serial) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,
.ops = &ns16550_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif
#endif /* SERIAL_PRESENT */
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index e91a5f7..5249c55 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -189,7 +189,6 @@ U_BOOT_DRIVER(serial_ar933x) = {
.priv_auto_alloc_size = sizeof(struct ar933x_serial_priv),
.probe = ar933x_serial_probe,
.ops = &ar933x_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_AR933X
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 925f0c2..980b38d 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -128,7 +128,6 @@ U_BOOT_DRIVER(serial_arc) = {
.ofdata_to_platdata = arc_serial_ofdata_to_platdata,
.probe = arc_serial_probe,
.ops = &arc_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_ARC_SERIAL
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 1f87f0c..bd1d89e 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -199,6 +199,8 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = {
.platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata),
.probe = bcm283x_mu_serial_probe,
.ops = &bcm283x_mu_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv),
};
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 54fc9b5..2527bb8 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -90,6 +90,8 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = {
.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
.probe = pl01x_serial_probe,
.ops = &bcm283x_pl011_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct pl01x_priv),
};
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index ee5d561..a0e709a 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -264,7 +264,6 @@ U_BOOT_DRIVER(bcm6345_serial) = {
.probe = bcm6345_serial_probe,
.priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv),
.ops = &bcm6345_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_BCM6345
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 1b54d18..dd3e511 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -152,5 +152,4 @@ U_BOOT_DRIVER(serial_efi) = {
.priv_auto_alloc_size = sizeof(struct serial_efi_priv),
.probe = serial_efi_probe,
.ops = &serial_efi_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index bdb5adb..39bd40e 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -64,5 +64,4 @@ U_BOOT_DRIVER(serial_intel_mid) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = mid_serial_probe,
.ops = &ns16550_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 1212b72..816cedd 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -455,5 +455,4 @@ U_BOOT_DRIVER(serial_lpuart) = {
.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
.probe = lpuart_serial_probe,
.ops = &lpuart_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index dbb8537..b3dad77 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -132,7 +132,6 @@ U_BOOT_DRIVER(serial_meson) = {
.of_match = meson_serial_ids,
.probe = meson_serial_probe,
.ops = &meson_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
.ofdata_to_platdata = meson_serial_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct meson_serial_platdata),
};
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index ce26d2b..7e4cd6c 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -129,7 +129,6 @@ U_BOOT_DRIVER(serial_mvebu) = {
.platdata_auto_alloc_size = sizeof(struct mvebu_platdata),
.probe = mvebu_serial_probe,
.ops = &mvebu_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_MVEBU_A3700_UART
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 4f1f822..2cc63da 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -353,7 +353,9 @@ U_BOOT_DRIVER(serial_mxc) = {
#endif
.probe = mxc_serial_probe,
.ops = &mxc_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif

diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index af3c755..ee6ad9c 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -121,7 +121,9 @@ U_BOOT_DRIVER(omap_serial) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,
.ops = &ns16550_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif
#endif /* DM_SERIAL */
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 6fd97e2..7ead73e 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -132,5 +132,4 @@ U_BOOT_DRIVER(serial_owl) = {
.priv_auto_alloc_size = sizeof(struct owl_serial_priv),
.probe = owl_serial_probe,
.ops = &owl_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index ba73978..84600b1 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -176,7 +176,6 @@ U_BOOT_DRIVER(pic32_serial) = {
.of_match = pic32_uart_ids,
.probe = pic32_uart_probe,
.ops = &pic32_uart_ops,
- .flags = DM_FLAG_PRE_RELOC,
.priv_auto_alloc_size = sizeof(struct pic32_uart_priv),
};

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 2a5f256..12512f6 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -363,7 +363,9 @@ U_BOOT_DRIVER(serial_pl01x) = {
.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
.probe = pl01x_serial_probe,
.ops = &pl01x_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct pl01x_priv),
};

diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index faea6d4..e3160cf 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -211,7 +211,6 @@ U_BOOT_DRIVER(serial_s5p) = {
.platdata_auto_alloc_size = sizeof(struct s5p_serial_platdata),
.probe = s5p_serial_probe,
.ops = &s5p_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#endif

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index b153498..c934d5f 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -247,7 +247,9 @@ U_BOOT_DRIVER(serial_sh) = {
.platdata_auto_alloc_size = sizeof(struct sh_serial_platdata),
.probe = sh_serial_probe,
.ops = &sh_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct uart_port),
};

diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 5dfc617..c972f1e 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -205,6 +205,5 @@ U_BOOT_DRIVER(serial_sti_asc) = {
.ops = &sti_asc_serial_ops,
.probe = sti_asc_serial_probe,
.priv_auto_alloc_size = sizeof(struct sti_asc_serial),
- .flags = DM_FLAG_PRE_RELOC,
};

diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 66e02d5..31b43ee 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -230,7 +230,9 @@ U_BOOT_DRIVER(serial_stm32) = {
.platdata_auto_alloc_size = sizeof(struct stm32x7_serial_platdata),
.ops = &stm32_serial_ops,
.probe = stm32_serial_probe,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};

#ifdef CONFIG_DEBUG_UART_STM32
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index cead3c6..1be777b 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -109,7 +109,6 @@ U_BOOT_DRIVER(serial_uartlite) = {
.platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
.probe = uartlite_serial_probe,
.ops = &uartlite_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_UARTLITE
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index f689015..7e486a6 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -210,7 +210,6 @@ U_BOOT_DRIVER(serial_zynq) = {
.platdata_auto_alloc_size = sizeof(struct zynq_uart_platdata),
.probe = zynq_serial_probe,
.ops = &zynq_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};

#ifdef CONFIG_DEBUG_UART_ZYNQ

--
2.7.4

Simon Glass

2018-10-25 03:28:58 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:16 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Igor Opaniuk

2018-12-10 17:26:23 UTC

Permalink

Hi Bin,

This particular commit leads to a constant Poplar board restart (git
bisect pointed to it).
U-boot is built with the default poplar_config from the latest master
(btw, is uses r), and U-boot is used as default BL33 image (setup:
vanilla ATF + vanilla OP-TEE(BL32, S-EL1 payload) + U-boot).

When BL32 (OP-TEE) tries to make a switch to non-secure bootloader, it
leads to restart (I'll compile ATF with verbose output and send you
more details if there are any):
=====================================
I/TC: OP-TEE version: 3.3.0-110-g7309438-dev #1 понеділок, 10 грудня
2018 12:53:15 +0000 aarch64
D/TC:0 0 check_ta_store:529 TA store: "early TA"
D/TC:0 0 check_ta_store:529 TA store: "Secure Storage TA"
D/TC:0 0 check_ta_store:529 TA store: "REE"
D/TC:0 0 early_ta_init:225 Early TA
023f8f1a-292a-432b-8fc4-de8471358067 size 21735 (compressed,
uncompressed 99680)
D/TC:0 0 mobj_mapped_shm_init:709 Shared memory address range: 4000000, 6000000
I/TC: Initialized
D/TC:0 0 init_primary_helper:1033 Primary CPU switching to normal world boot

Bootrom start
Boot Media: eMMC
Entry usb bootstrap
USB: Recv CC:4
Usb disk(1):
====================================

btw, for Poplar board serial_pl01x driver is used.

Could you please provide (I just started digging into your patch
series) your ideas why it can happen?

Thanks

Post by Bin Meng
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
- 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
---
drivers/serial/altera_jtag_uart.c | 1 -
drivers/serial/altera_uart.c | 1 -
drivers/serial/arm_dcc.c | 1 -
drivers/serial/atmel_usart.c | 2 ++
drivers/serial/ns16550.c | 2 ++
drivers/serial/serial_ar933x.c | 1 -
drivers/serial/serial_arc.c | 1 -
drivers/serial/serial_bcm283x_mu.c | 2 ++
drivers/serial/serial_bcm283x_pl011.c | 2 ++
drivers/serial/serial_bcm6345.c | 1 -
drivers/serial/serial_efi.c | 1 -
drivers/serial/serial_intel_mid.c | 1 -
drivers/serial/serial_lpuart.c | 1 -
drivers/serial/serial_meson.c | 1 -
drivers/serial/serial_mvebu_a3700.c | 1 -
drivers/serial/serial_mxc.c | 2 ++
drivers/serial/serial_omap.c | 2 ++
drivers/serial/serial_owl.c | 1 -
drivers/serial/serial_pic32.c | 1 -
drivers/serial/serial_pl01x.c | 2 ++
drivers/serial/serial_s5p.c | 1 -
drivers/serial/serial_sh.c | 2 ++
drivers/serial/serial_sti_asc.c | 1 -
drivers/serial/serial_stm32.c | 2 ++
drivers/serial/serial_xuartlite.c | 1 -
drivers/serial/serial_zynq.c | 1 -
26 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 61052a9..86c3de4 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -121,7 +121,6 @@ U_BOOT_DRIVER(altera_jtaguart) = {
.platdata_auto_alloc_size = sizeof(struct altera_jtaguart_platdata),
.probe = altera_jtaguart_probe,
.ops = &altera_jtaguart_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_ALTERA_JTAGUART
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index b7b0a13..67d4719 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -117,7 +117,6 @@ U_BOOT_DRIVER(altera_uart) = {
.platdata_auto_alloc_size = sizeof(struct altera_uart_platdata),
.probe = altera_uart_probe,
.ops = &altera_uart_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_ALTERA_UART
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 43e8691..dfcb6fd 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -155,7 +155,6 @@ U_BOOT_DRIVER(serial_dcc) = {
.id = UCLASS_SERIAL,
.of_match = arm_dcc_ids,
.ops = &arm_dcc_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_ARM_DCC
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 9414f5f..aa8cdff 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -294,7 +294,9 @@ U_BOOT_DRIVER(serial_atmel) = {
#endif
.probe = atmel_serial_probe,
.ops = &atmel_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct atmel_serial_priv),
};
#endif
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index f9041aa..3c8bc2b 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -473,7 +473,9 @@ U_BOOT_DRIVER(ns16550_serial) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,
.ops = &ns16550_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif
#endif /* SERIAL_PRESENT */
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index e91a5f7..5249c55 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -189,7 +189,6 @@ U_BOOT_DRIVER(serial_ar933x) = {
.priv_auto_alloc_size = sizeof(struct ar933x_serial_priv),
.probe = ar933x_serial_probe,
.ops = &ar933x_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_AR933X
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 925f0c2..980b38d 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -128,7 +128,6 @@ U_BOOT_DRIVER(serial_arc) = {
.ofdata_to_platdata = arc_serial_ofdata_to_platdata,
.probe = arc_serial_probe,
.ops = &arc_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_ARC_SERIAL
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 1f87f0c..bd1d89e 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -199,6 +199,8 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = {
.platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata),
.probe = bcm283x_mu_serial_probe,
.ops = &bcm283x_mu_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv),
};
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 54fc9b5..2527bb8 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -90,6 +90,8 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = {
.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
.probe = pl01x_serial_probe,
.ops = &bcm283x_pl011_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct pl01x_priv),
};
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index ee5d561..a0e709a 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -264,7 +264,6 @@ U_BOOT_DRIVER(bcm6345_serial) = {
.probe = bcm6345_serial_probe,
.priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv),
.ops = &bcm6345_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_BCM6345
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 1b54d18..dd3e511 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -152,5 +152,4 @@ U_BOOT_DRIVER(serial_efi) = {
.priv_auto_alloc_size = sizeof(struct serial_efi_priv),
.probe = serial_efi_probe,
.ops = &serial_efi_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index bdb5adb..39bd40e 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -64,5 +64,4 @@ U_BOOT_DRIVER(serial_intel_mid) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = mid_serial_probe,
.ops = &ns16550_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 1212b72..816cedd 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -455,5 +455,4 @@ U_BOOT_DRIVER(serial_lpuart) = {
.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
.probe = lpuart_serial_probe,
.ops = &lpuart_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index dbb8537..b3dad77 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -132,7 +132,6 @@ U_BOOT_DRIVER(serial_meson) = {
.of_match = meson_serial_ids,
.probe = meson_serial_probe,
.ops = &meson_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
.ofdata_to_platdata = meson_serial_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct meson_serial_platdata),
};
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index ce26d2b..7e4cd6c 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -129,7 +129,6 @@ U_BOOT_DRIVER(serial_mvebu) = {
.platdata_auto_alloc_size = sizeof(struct mvebu_platdata),
.probe = mvebu_serial_probe,
.ops = &mvebu_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_MVEBU_A3700_UART
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 4f1f822..2cc63da 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -353,7 +353,9 @@ U_BOOT_DRIVER(serial_mxc) = {
#endif
.probe = mxc_serial_probe,
.ops = &mxc_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index af3c755..ee6ad9c 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -121,7 +121,9 @@ U_BOOT_DRIVER(omap_serial) = {
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,
.ops = &ns16550_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#endif
#endif /* DM_SERIAL */
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 6fd97e2..7ead73e 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -132,5 +132,4 @@ U_BOOT_DRIVER(serial_owl) = {
.priv_auto_alloc_size = sizeof(struct owl_serial_priv),
.probe = owl_serial_probe,
.ops = &owl_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index ba73978..84600b1 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -176,7 +176,6 @@ U_BOOT_DRIVER(pic32_serial) = {
.of_match = pic32_uart_ids,
.probe = pic32_uart_probe,
.ops = &pic32_uart_ops,
- .flags = DM_FLAG_PRE_RELOC,
.priv_auto_alloc_size = sizeof(struct pic32_uart_priv),
};
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 2a5f256..12512f6 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -363,7 +363,9 @@ U_BOOT_DRIVER(serial_pl01x) = {
.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
.probe = pl01x_serial_probe,
.ops = &pl01x_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct pl01x_priv),
};
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index faea6d4..e3160cf 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -211,7 +211,6 @@ U_BOOT_DRIVER(serial_s5p) = {
.platdata_auto_alloc_size = sizeof(struct s5p_serial_platdata),
.probe = s5p_serial_probe,
.ops = &s5p_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#endif
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index b153498..c934d5f 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -247,7 +247,9 @@ U_BOOT_DRIVER(serial_sh) = {
.platdata_auto_alloc_size = sizeof(struct sh_serial_platdata),
.probe = sh_serial_probe,
.ops = &sh_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct uart_port),
};
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 5dfc617..c972f1e 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -205,6 +205,5 @@ U_BOOT_DRIVER(serial_sti_asc) = {
.ops = &sti_asc_serial_ops,
.probe = sti_asc_serial_probe,
.priv_auto_alloc_size = sizeof(struct sti_asc_serial),
- .flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 66e02d5..31b43ee 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -230,7 +230,9 @@ U_BOOT_DRIVER(serial_stm32) = {
.platdata_auto_alloc_size = sizeof(struct stm32x7_serial_platdata),
.ops = &stm32_serial_ops,
.probe = stm32_serial_probe,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
};
#ifdef CONFIG_DEBUG_UART_STM32
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index cead3c6..1be777b 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -109,7 +109,6 @@ U_BOOT_DRIVER(serial_uartlite) = {
.platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
.probe = uartlite_serial_probe,
.ops = &uartlite_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_UARTLITE
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index f689015..7e486a6 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -210,7 +210,6 @@ U_BOOT_DRIVER(serial_zynq) = {
.platdata_auto_alloc_size = sizeof(struct zynq_uart_platdata),
.probe = zynq_serial_probe,
.ops = &zynq_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
};
#ifdef CONFIG_DEBUG_UART_ZYNQ
--
2.7.4
_______________________________________________
U-Boot mailing list
https://lists.denx.de/listinfo/u-boot

--
Regards,
Igor Opaniuk

Bin Meng

2018-10-24 13:36:31 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:28:42 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:22 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:40 UTC

Permalink

This post might be inappropriate. Click to display it.

Simon Glass

2018-10-25 03:29:10 UTC

Permalink

Post by Bin Meng
Add some description about pre-relocation driver binding, including
usage of DM_FLAG_PRE_RELOC flag and caveats.
---
doc/driver-model/README.txt | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:11 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Bin Meng

2018-10-24 13:36:39 UTC

Permalink

--
2.7.4

Simon Glass

2018-10-25 03:29:07 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

s***@google.com

2018-11-06 22:42:11 UTC

Permalink

Reviewed-by: Simon Glass <***@chromium.org>

Applied to u-boot-dm/master, thanks!

Stephen Warren

2018-10-24 16:26:39 UTC

Permalink

Tested-by: Stephen Warren <***@nvidia.com>

(I tested this on top of both u-boot/master and u-boot-dm/master just to
be sure).

Adam Ford

2018-10-28 13:30:51 UTC

Permalink

This works just fine for me on the am3517_evm and the omap3_logic boards.

Tested-by Adam Ford <***@gmailcom>

adam

Bin Meng

2018-11-02 02:25:33 UTC

Permalink

Post by Adam Ford

This works just fine for me on the am3517_evm and the omap3_logic boards.

Thanks Adam and Stephen's testing.

Simon,

Looks we don't have too much time before release, would you please
test and send the PR?

Another series (http://patchwork.ozlabs.org/project/uboot/list/?series=70686)
needs to be pulled in to unblock x86 too.

Regards,
Bin

Simon Glass

2018-11-03 06:08:28 UTC

Permalink

Hi Bin,

Post by Bin Meng

Post by Adam Ford

This works just fine for me on the am3517_evm and the omap3_logic boards.

Thanks Adam and Stephen's testing.
Simon,
Looks we don't have too much time before release, would you please
test and send the PR?
Another series (http://patchwork.ozlabs.org/project/uboot/list/?series=70686)
needs to be pulled in to unblock x86 too.

I had assumed we could wait to the next release.

Could you please explain what you are wanting me to do here?

Regards,
Simon

Bin Meng

2018-11-03 09:48:35 UTC

Permalink

Hi Simon,

Post by Simon Glass
Hi Bin,

Post by Bin Meng

Post by Adam Ford

This works just fine for me on the am3517_evm and the omap3_logic boards.

Thanks Adam and Stephen's testing.
Simon,
Looks we don't have too much time before release, would you please
test and send the PR?
Another series (http://patchwork.ozlabs.org/project/uboot/list/?series=70686)
needs to be pulled in to unblock x86 too.

I had assumed we could wait to the next release.
Could you please explain what you are wanting me to do here?

Short version:
As I mentioned in this series' cover letter, "This series should be
applied on top of u-boot-dm/master, for v2018.11 release.". The other
x86 series should be applied for this release too.

The long story:

In [1] I said: "It looks that I have to send out a fix to correct
Tegra in this release now, and leave other clean ups in next
release.", was because I think the clean up changes are massive and
only Stephen reported the Tegra was broken by previous series [2]
which was applied in *u-boot-dm/master* so initially I only wanted to
send out the Tegra fixes. However later Stefan reported in [3] that
some x86 boards just don't boot with *u-boot/mater*. Then I had a look
and suggested adding DM_FLAG_PRE_RELOC flag to x86 CPU drivers, which
was the x86 fixes series [4] I mentioned above. However the issue is
that without my fix in series [2], the x86 fix just doesn't work. Then
I mentioned that in [5] I said "I spent some time to clean up all
driver usage about DM_FLAG_PRE_RELOC flag" and it should fix Tegra
(reported) as well as other potential (un-reported) broken.

[1] https://lists.denx.de/pipermail/u-boot/2018-October/345085.html
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=70150&state=*&q=&archive=both
[3] https://lists.denx.de/pipermail/u-boot/2018-October/344266.html
[4] http://patchwork.ozlabs.org/project/uboot/list/?series=70686
[5] https://lists.denx.de/pipermail/u-boot/2018-October/345479.html

Note both my previous series [2] and x86 fix series [4] are attempting
to fix the side effect brought up by c0434407b595 ("board_f: Use
static print_cpuinfo if CONFIG_CPU is active") which was part of the
MPC83xx CPU uclass driver support. So the root cause is the MPC83xx
changes. But I am not sure if we can revert that patch easily now, as
I suspect many later commits are dependent on that one, and we may
break some more stuff if we revert that. Up to now, I see some
'Tested-by' tags were provided for this series, I think we are good to
go.

Does this make sense?

Regards,
Bin

Simon Glass

2018-11-04 22:00:39 UTC

Permalink

Hi Bin,

Post by Bin Meng
Hi Simon,

Post by Simon Glass
Hi Bin,

Post by Bin Meng

Post by Adam Ford

This works just fine for me on the am3517_evm and the omap3_logic boards.

Thanks Adam and Stephen's testing.
Simon,
Looks we don't have too much time before release, would you please
test and send the PR?
Another series (http://patchwork.ozlabs.org/project/uboot/list/?series=70686)
needs to be pulled in to unblock x86 too.

I had assumed we could wait to the next release.
Could you please explain what you are wanting me to do here?

As I mentioned in this series' cover letter, "This series should be
applied on top of u-boot-dm/master, for v2018.11 release.". The other
x86 series should be applied for this release too.
In [1] I said: "It looks that I have to send out a fix to correct
Tegra in this release now, and leave other clean ups in next
release.", was because I think the clean up changes are massive and
only Stephen reported the Tegra was broken by previous series [2]
which was applied in *u-boot-dm/master* so initially I only wanted to
send out the Tegra fixes. However later Stefan reported in [3] that
some x86 boards just don't boot with *u-boot/mater*. Then I had a look
and suggested adding DM_FLAG_PRE_RELOC flag to x86 CPU drivers, which
was the x86 fixes series [4] I mentioned above. However the issue is
that without my fix in series [2], the x86 fix just doesn't work. Then
I mentioned that in [5] I said "I spent some time to clean up all
driver usage about DM_FLAG_PRE_RELOC flag" and it should fix Tegra
(reported) as well as other potential (un-reported) broken.
[1] https://lists.denx.de/pipermail/u-boot/2018-October/345085.html
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=70150&state=*&q=&archive=both
[3] https://lists.denx.de/pipermail/u-boot/2018-October/344266.html
[4] http://patchwork.ozlabs.org/project/uboot/list/?series=70686
[5] https://lists.denx.de/pipermail/u-boot/2018-October/345479.html
Note both my previous series [2] and x86 fix series [4] are attempting
to fix the side effect brought up by c0434407b595 ("board_f: Use
static print_cpuinfo if CONFIG_CPU is active") which was part of the
MPC83xx CPU uclass driver support. So the root cause is the MPC83xx
changes. But I am not sure if we can revert that patch easily now, as
I suspect many later commits are dependent on that one, and we may
break some more stuff if we revert that. Up to now, I see some
'Tested-by' tags were provided for this series, I think we are good to
go.
Does this make sense?

OK yes I get it. I've pulled these into dm/testing and will do a pull
request tomorrow for Tom.

Regards,
Simon