timer: 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>
This commit is contained in:
parent
05e424818b
commit
d7a184d4a7
@ -115,5 +115,4 @@ U_BOOT_DRIVER(altera_timer) = {
|
||||
.platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata),
|
||||
.probe = atftmr_timer_probe,
|
||||
.ops = &ag101p_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -92,5 +92,4 @@ U_BOOT_DRIVER(altera_timer) = {
|
||||
.platdata_auto_alloc_size = sizeof(struct altera_timer_platdata),
|
||||
.probe = altera_timer_probe,
|
||||
.ops = &altera_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -107,6 +107,5 @@ U_BOOT_DRIVER(arc_timer) = {
|
||||
.of_match = arc_timer_ids,
|
||||
.probe = arc_timer_probe,
|
||||
.ops = &arc_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
.priv_auto_alloc_size = sizeof(struct arc_timer_priv),
|
||||
};
|
||||
|
@ -90,5 +90,4 @@ U_BOOT_DRIVER(ast_timer) = {
|
||||
.priv_auto_alloc_size = sizeof(struct ast_timer_priv),
|
||||
.ofdata_to_platdata = ast_timer_ofdata_to_platdata,
|
||||
.ops = &ast_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -110,5 +110,4 @@ U_BOOT_DRIVER(atcpit100_timer) = {
|
||||
.platdata_auto_alloc_size = sizeof(struct atcpit_timer_platdata),
|
||||
.probe = atcpit_timer_probe,
|
||||
.ops = &atcpit_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -85,5 +85,4 @@ U_BOOT_DRIVER(atmel_pit) = {
|
||||
.platdata_auto_alloc_size = sizeof(struct atmel_pit_platdata),
|
||||
.probe = atmel_pit_probe,
|
||||
.ops = &atmel_pit_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -111,5 +111,4 @@ U_BOOT_DRIVER(cadence_ttc) = {
|
||||
.priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
|
||||
.probe = cadence_ttc_probe,
|
||||
.ops = &cadence_ttc_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -83,7 +83,6 @@ U_BOOT_DRIVER(dw_apb_timer) = {
|
||||
.id = UCLASS_TIMER,
|
||||
.ops = &dw_apb_timer_ops,
|
||||
.probe = dw_apb_timer_probe,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
.of_match = dw_apb_timer_ids,
|
||||
.ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
|
||||
.priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv),
|
||||
|
@ -244,6 +244,5 @@ U_BOOT_DRIVER(mpc83xx_timer) = {
|
||||
.of_match = mpc83xx_timer_ids,
|
||||
.probe = mpc83xx_timer_probe,
|
||||
.ops = &mpc83xx_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
.priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv),
|
||||
};
|
||||
|
@ -104,5 +104,4 @@ U_BOOT_DRIVER(omap_timer) = {
|
||||
.priv_auto_alloc_size = sizeof(struct omap_timer_priv),
|
||||
.probe = omap_timer_probe,
|
||||
.ops = &omap_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -163,7 +163,6 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = {
|
||||
.of_match = rockchip_timer_ids,
|
||||
.probe = rockchip_timer_probe,
|
||||
.ops = &rockchip_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
.priv_auto_alloc_size = sizeof(struct rockchip_timer_priv),
|
||||
#if CONFIG_IS_ENABLED(OF_PLATDATA)
|
||||
.platdata_auto_alloc_size = sizeof(struct rockchip_timer_plat),
|
||||
|
@ -74,5 +74,4 @@ U_BOOT_DRIVER(sti_timer) = {
|
||||
.priv_auto_alloc_size = sizeof(struct sti_timer_priv),
|
||||
.probe = sti_timer_probe,
|
||||
.ops = &sti_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
@ -132,6 +132,5 @@ U_BOOT_DRIVER(stm32_timer) = {
|
||||
.priv_auto_alloc_size = sizeof(struct stm32_timer_priv),
|
||||
.probe = stm32_timer_probe,
|
||||
.ops = &stm32_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
||||
|
@ -424,5 +424,4 @@ U_BOOT_DRIVER(tsc_timer) = {
|
||||
.of_match = tsc_timer_ids,
|
||||
.probe = tsc_timer_probe,
|
||||
.ops = &tsc_timer_ops,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user