From c480bbd92b3273ecff5396da9221e7bcb08774ba Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Jul 2026 18:43:32 +0200 Subject: drivers: sysreset: revert support for args in request This reverts: - commit e49c84f7bb7b ("doc: usage: cmd: reset: specify when the -edl option is available") - commit 1076feb8a3f9 ("cmd: boot: fix edl being shown when not supported") - commit 63c806ba0e12 ("qcom_defconfig: enable psci based sysreset") - commit ef06c5d76ff4 ("cmd: boot: Add '-edl' option to reset command documentation") - commit 32825eaddc37 ("sysreset: Implement PSCI based reset to EDL mode for QCOM SoCs") - commit fcb48b89813b ("drivers: sysreset: Add sysreset op that can take arguments") There was a conflict reverting commit 63c806ba0e12 ("qcom_defconfig: enable psci based sysreset") due to commit 02ef1859b44f ("configs: Resync with savedefconfig"), but the conflict resolution was trivial. The args support for the sysreset uclass contains a logic bug. The first sysreset device implementing the request_arg callback will consume the args, not support the specified arg and thus return -EPROTONOSUPPORT which will stop the iteration over all sysreset devices. This is an issue if one has multiple sysreset devices and each with support for different (valid) args. If a sysreset device implements a -dummy argument and another -foo and a user calls reset -dummy from the U-Boot CLI, it'll depend on which sysreset device will be attempted first. If it is the one implementing -foo, it'll return it doesn't support the argument with -EPROTONOSUPPORT in which case the device implementing -dummy will never be attempted and instead we'll do a cold reset which is very likely not what's expected from the user. Casey suggested[1] we revert this and start from scratch again with a different implementation instead. [1] https://lore.kernel.org/u-boot/77ff0f56-5c3b-42e7-bdd1-bf90296da900@linaro.org/ Acked-by: Casey Connolly Signed-off-by: Quentin Schulz --- drivers/sysreset/sysreset-uclass.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'drivers/sysreset/sysreset-uclass.c') diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index f25e09e9cd0..536ac727142 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -32,18 +32,6 @@ int sysreset_request(struct udevice *dev, enum sysreset_t type) return ops->request(dev, type); } -#if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET_ARGS) -int sysreset_request_arg(struct udevice *dev, int argc, char * const argv[]) -{ - struct sysreset_ops *ops = sysreset_get_ops(dev); - - if (!ops->request_arg) - return -ENOSYS; - - return ops->request_arg(dev, argc, argv); -} -#endif /* CONFIG_SYSRESET_CMD_RESET_ARGS */ - int sysreset_get_status(struct udevice *dev, char *buf, int size) { struct sysreset_ops *ops = sysreset_get_ops(dev); @@ -83,26 +71,6 @@ int sysreset_walk(enum sysreset_t type) return ret; } -#if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET_ARGS) -int sysreset_walk_arg(int argc, char * const argv[]) -{ - struct udevice *dev; - int ret = -ENOSYS; - - while (ret != -EINPROGRESS && ret != -EPROTONOSUPPORT) { - for (uclass_first_device(UCLASS_SYSRESET, &dev); - dev; - uclass_next_device(&dev)) { - ret = sysreset_request_arg(dev, argc, argv); - if (ret == -EINPROGRESS || ret == -EPROTONOSUPPORT) - break; - } - } - - return ret; -} -#endif /* CONFIG_SYSRESET_CMD_RESET_ARGS */ - int sysreset_get_last_walk(void) { struct udevice *dev; @@ -164,11 +132,6 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) printf("resetting ...\n"); mdelay(100); -#if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET_ARGS) - if (argc > 1 && sysreset_walk_arg(argc, argv) == -EINPROGRESS) - return 0; -#endif - sysreset_walk_halt(reset_type); return 0; -- cgit v1.3.1