This has no useful meaning in U-Boot. Use -ENOMEM since that appears to be what has gone wrong in this case. We want to reserve this flag for internal driver model use.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

drivers/smem/msm_smem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c index 597d425d11f..26462151b3a 100644 --- a/drivers/smem/msm_smem.c +++ b/drivers/smem/msm_smem.c @@ -437,7 +437,7 @@ static int qcom_smem_alloc(unsigned int host, unsigned int item, size_t size) int ret;

if (!__smem) - return -EPROBE_DEFER; + return -ENOMEM;

if (item < SMEM_ITEM_LAST_FIXED) { dev_err(__smem->dev, @@ -559,7 +559,7 @@ static void *qcom_smem_get(unsigned int host, unsigned int item, size_t *size) { struct smem_partition_header *phdr; size_t cacheln; - void *ptr = ERR_PTR(-EPROBE_DEFER); + void *ptr = ERR_PTR(-ENOMEM);

if (!__smem) return ptr; @@ -597,7 +597,7 @@ static int qcom_smem_get_free_space(unsigned int host) unsigned int ret;

if (!__smem) - return -EPROBE_DEFER; + return -ENOMEM;

if (host < SMEM_HOST_COUNT && __smem->partitions[host]) { phdr = __smem->partitions[host];

This flag has the word 'REMOVE' in it which means it conflicts with the DM_REMOVE flags. Rename it to DM_FLAG_LEAVE_PD_ON which seems to indicate its purpose well enough.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

drivers/core/device-remove.c | 2 +- drivers/video/meson/meson_vpu.c | 2 +- drivers/watchdog/rti_wdt.c | 2 +- include/dm/device.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 7e8f3afb2d6..7874d53c843 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -200,7 +200,7 @@ int device_remove(struct udevice *dev, uint flags)

if (!(flags & DM_REMOVE_NO_PD) && !(drv->flags & - (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_REMOVE_WITH_PD_ON)) && + (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_LEAVE_PD_ON)) && dev != gd->cur_serial_dev) dev_power_domain_off(dev);

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index ca6933a6c54..558f9ba766c 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -212,5 +212,5 @@ U_BOOT_DRIVER(meson_vpu) = { .probe = meson_vpu_probe, .bind = meson_vpu_bind, .priv_auto = sizeof(struct meson_vpu_priv), - .flags = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON, + .flags = DM_FLAG_PRE_RELOC | DM_FLAG_LEAVE_PD_ON, }; diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index f64a39f6579..8335b20ae84 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -119,5 +119,5 @@ U_BOOT_DRIVER(rti_wdt) = { .ops = &rti_wdt_ops, .probe = rti_wdt_probe, .priv_auto = sizeof(struct rti_wdt_priv), - .flags = DM_FLAG_REMOVE_WITH_PD_ON, + .flags = DM_FLAG_LEAVE_PD_ON, }; diff --git a/include/dm/device.h b/include/dm/device.h index f5b4cd6876e..a52bbdc3a63 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -71,7 +71,7 @@ struct driver_info; * Device is removed without switching off its power domain. This might * be required, i. e. for serial console (debug) output when booting OS. */ -#define DM_FLAG_REMOVE_WITH_PD_ON (1 << 13) +#define DM_FLAG_LEAVE_PD_ON (1 << 13)

/* * One or multiple of these flags are passed to device_remove() so that

At present the uclass pre-remove method is called before the children are removed. But the children may refused to be removed, in whch case the uclass is in a tricky situation. At present we handle this by calling the uclass' post_probe() method. But it seems better to avoid doing anything with the uclass in this case.

Switch the ordering so that we make sure the children can be removed before advising the uclass.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

drivers/core/device-remove.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 7874d53c843..35b625e7b1f 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -172,13 +172,13 @@ int device_remove(struct udevice *dev, uint flags) drv = dev->driver; assert(drv);

- ret = uclass_pre_remove_device(dev); + ret = device_chld_remove(dev, NULL, flags); if (ret) return ret;

- ret = device_chld_remove(dev, NULL, flags); + ret = uclass_pre_remove_device(dev); if (ret) - goto err; + return ret;

/* * Remove the device if called with the "normal" remove flag set, @@ -216,12 +216,6 @@ err_remove: /* We can't put the children back */ dm_warn("%s: Device '%s' failed to remove, but children are gone\n", __func__, dev->name); -err: - ret = uclass_post_probe_device(dev); - if (ret) { - dm_warn("%s: Device '%s' failed to post_probe on error path\n", - __func__, dev->name); - }

return ret; }

From: Marek Vasut marek.vasut@gmail.com

Add another flag to the DM core which could be assigned to drivers and which makes those drivers call their remove callbacks last, just before booting OS and after all the other drivers finished with their remove callbacks. This is necessary for things like clock drivers, where the other drivers might depend on the clock driver in their remove callbacks. Prime example is the mmc subsystem, which can reconfigure a card from HS mode to slower modes in the remove callback and for that it needs to reconfigure the controller clock.

Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v4: - Use 'vital' rather than 'late' as the description - Invert the removal flag to DM_REMOVE_NON_VITAL, to avoid the need for two-pass processing in the bowels of driver model - Simplify the test to only test 'vital' - Drop the change to uclass_destroy()

drivers/core/device-remove.c | 14 ++++++++--- drivers/core/root.c | 2 ++ include/dm/device-internal.h | 10 +++++--- include/dm/device.h | 10 +++++++- test/dm/core.c | 47 ++++++++++++++++++++++++++++++++++++ test/dm/test-driver.c | 11 +++++++++ 6 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index aca0f98a94b..ad5e1b5b299 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -47,20 +47,24 @@ int device_chld_remove(struct udevice *dev, struct driver *drv, uint flags) { struct udevice *pos, *n; - int ret; + int result = 0;

assert(dev);

list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { + int ret; + if (drv && (pos->driver != drv)) continue;

ret = device_remove(pos, flags); - if (ret && ret != -EKEYREJECTED) + if (ret == -EPROBE_DEFER) + result = ret; + else if (ret && ret != -EKEYREJECTED) return ret; }

- return 0; + return result; }

int device_unbind(struct udevice *dev) @@ -160,11 +164,15 @@ void device_free(struct udevice *dev) * -EKEYREJECTED if @flags includes a flag in DM_REMOVE_ACTIVE_ALL but * @drv_flags does not (indicates that this device has nothing to do for * DMA shutdown or OS prepare) + * -EPROBE_DEFER if @flags is DM_REMOVE_NON_VITAL but @drv_flags contains + * DM_FLAG_VITAL (indicates the device is vital and should not be removed) */ static int flags_remove(uint flags, uint drv_flags) { if (flags & DM_REMOVE_NORMAL) return 0; + if (flags & DM_REMOVE_NON_VITAL) + return drv_flags & DM_FLAG_VITAL ? -EPROBE_DEFER : 0; if (flags && (drv_flags & DM_REMOVE_ACTIVE_ALL)) return 0;

diff --git a/drivers/core/root.c b/drivers/core/root.c index 78de7cdf875..f5f8a1f7c6f 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -159,6 +159,8 @@ int dm_init(bool of_live)

int dm_uninit(void) { + /* Remove non-vital devices first */ + device_remove(dm_root(), DM_REMOVE_NON_VITAL); device_remove(dm_root(), DM_REMOVE_NORMAL); device_unbind(dm_root()); gd->dm_root = NULL; diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index b513b6861a6..39406c3f352 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -123,7 +123,8 @@ int device_probe(struct udevice *dev); * * @dev: Pointer to device to remove * @flags: Flags for selective device removal (DM_REMOVE_...) - * @return 0 if OK, -EKEYREJECTED if not removed due to flags, other -ve on + * @return 0 if OK, -EKEYREJECTED if not removed due to flags, -EPROBE_DEFER if + * this is a vital device and flags is DM_REMOVE_NON_VITAL, other -ve on * error (such an error here is normally a very bad thing) */ #if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) @@ -178,12 +179,15 @@ static inline int device_chld_unbind(struct udevice *dev, struct driver *drv) * This continues through all children recursively stopping part-way through if * an error occurs. Return values of -EKEYREJECTED are ignored and processing * continues, since they just indicate that the child did not elect to be - * removed based on the value of @flags. + * removed based on the value of @flags. Return values of -EPROBE_DEFER cause + * processing of other children to continue, but the function will return + * -EPROBE_DEFER. * * @dev: The device whose children are to be removed * @drv: The targeted driver * @flags: Flag, if this functions is called in the pre-OS stage - * @return 0 on success, -ve on error + * @return 0 on success, -EPROBE_DEFER if any child failed to remove, other + * -ve on error */ #if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) int device_chld_remove(struct udevice *dev, struct driver *drv, diff --git a/include/dm/device.h b/include/dm/device.h index 2554f679277..5f5df770ce1 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -73,6 +73,13 @@ struct driver_info; */ #define DM_FLAG_LEAVE_PD_ON (1 << 13)

+/* + * Device is vital to the operation of other devices. It is possible to remove + * removed this device after all regular devices are removed. This is useful + * e.g. for clock, which need to be active during the device-removal phase. + */ +#define DM_FLAG_VITAL (1 << 14) + /* * One or multiple of these flags are passed to device_remove() so that * a selective device removal as specified by the remove-stage and the @@ -91,7 +98,8 @@ enum { /* Remove devices which need some final OS preparation steps */ DM_REMOVE_OS_PREPARE = DM_FLAG_OS_PREPARE,

- /* Add more use cases here */ + /* Remove only devices that are not marked vital */ + DM_REMOVE_NON_VITAL = DM_FLAG_VITAL,

/* Remove devices with any active flag */ DM_REMOVE_ACTIVE_ALL = DM_REMOVE_ACTIVE_DMA | DM_REMOVE_OS_PREPARE, diff --git a/test/dm/core.c b/test/dm/core.c index 1f5ca570dc7..aa84bc5e733 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -72,6 +72,10 @@ static struct driver_info driver_info_act_dma = { .name = "test_act_dma_drv", };

+static struct driver_info driver_info_act_vital_clk = { + .name = "test_act_vital_clk_drv", +}; + void dm_leak_check_start(struct unit_test_state *uts) { uts->start = mallinfo(); @@ -883,6 +887,49 @@ static int dm_test_remove_active_dma(struct unit_test_state *uts) } DM_TEST(dm_test_remove_active_dma, 0);

+/* Test removal of 'vital' devices */ +static int dm_test_remove_vital(struct unit_test_state *uts) +{ + struct dm_test_state *dms = uts->priv; + struct udevice *normal, *vital; + + /* Skip the behaviour in test_post_probe() */ + dms->skip_post_probe = 1; + + ut_assertok(device_bind_by_name(dms->root, false, + &driver_info_act_vital_clk, &vital)); + ut_assertnonnull(vital); + + ut_assertok(device_bind_by_name(dms->root, false, &driver_info_manual, + &normal)); + ut_assertnonnull(normal); + + /* Probe the devices */ + ut_assertok(device_probe(vital)); + ut_assertok(device_probe(normal)); + + /* Check that devices are active right now */ + ut_asserteq(true, device_active(vital)); + ut_asserteq(true, device_active(normal)); + + /* Remove normal devices via selective remove flag */ + dm_remove_devices_flags(DM_REMOVE_NON_VITAL); + + /* Check that normal devices are inactive right now */ + ut_asserteq(true, device_active(vital)); + ut_asserteq(false, device_active(normal)); + + /* Remove vital devices via normal remove flag */ + dm_remove_devices_flags(DM_REMOVE_NORMAL); + + /* Check that all devices are inactive right now */ + ut_asserteq(false, device_active(vital)); + ut_asserteq(false, device_active(normal)); + + return 0; +} +DM_TEST(dm_test_remove_vital, 0); + static int dm_test_uclass_before_ready(struct unit_test_state *uts) { struct uclass *uc; diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index a67f5d3f982..a7930204c80 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -170,3 +170,14 @@ U_BOOT_DRIVER(test_act_dma_drv) = { .unbind = test_manual_unbind, .flags = DM_FLAG_ACTIVE_DMA, }; + +U_BOOT_DRIVER(test_act_vital_clk_drv) = { + .name = "test_act_vital_clk_drv", + .id = UCLASS_TEST, + .ops = &test_manual_ops, + .bind = test_manual_bind, + .probe = test_manual_probe, + .remove = test_manual_remove, + .unbind = test_manual_unbind, + .flags = DM_FLAG_VITAL, +};