Quentin SchulzandTom Rini
c480bbd92b
This reverts: - commite49c84f7bb("doc: usage: cmd: reset: specify when the -edl option is available") - commit1076feb8a3("cmd: boot: fix edl being shown when not supported") - commit63c806ba0e("qcom_defconfig: enable psci based sysreset") - commitef06c5d76f("cmd: boot: Add '-edl' option to reset command documentation") - commit32825eaddc("sysreset: Implement PSCI based reset to EDL mode for QCOM SoCs") - commitfcb48b8981("drivers: sysreset: Add sysreset op that can take arguments") There was a conflict reverting commit63c806ba0e("qcom_defconfig: enable psci based sysreset") due to commit02ef1859b4("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 <casey.connolly@linaro.org> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
73 lines
1.5 KiB
C
73 lines
1.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2000-2003
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*/
|
|
|
|
/*
|
|
* Misc boot support
|
|
*/
|
|
#include <command.h>
|
|
#include <net.h>
|
|
#include <vsprintf.h>
|
|
|
|
#ifdef CONFIG_CMD_GO
|
|
|
|
/* Allow ports to override the default behavior */
|
|
__attribute__((weak))
|
|
unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
|
|
char *const argv[])
|
|
{
|
|
return entry (argc, argv);
|
|
}
|
|
|
|
static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
ulong addr, rc;
|
|
int rcode = 0;
|
|
|
|
if (argc < 2)
|
|
return CMD_RET_USAGE;
|
|
|
|
addr = hextoul(argv[1], NULL);
|
|
|
|
printf ("## Starting application at 0x%08lX ...\n", addr);
|
|
flush();
|
|
|
|
/*
|
|
* pass address parameter as argv[0] (aka command name),
|
|
* and all remaining args
|
|
*/
|
|
rc = do_go_exec ((void *)addr, argc - 1, argv + 1);
|
|
if (rc != 0) rcode = 1;
|
|
|
|
printf ("## Application terminated, rc = 0x%lX\n", rc);
|
|
return rcode;
|
|
}
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
U_BOOT_CMD(
|
|
go, CONFIG_SYS_MAXARGS, 1, do_go,
|
|
"start application at address 'addr'",
|
|
"addr [arg ...]\n - start application at address 'addr'\n"
|
|
" passing 'arg' as arguments"
|
|
);
|
|
|
|
#endif
|
|
|
|
U_BOOT_CMD(
|
|
reset, 2, 0, do_reset,
|
|
"Perform RESET of the CPU",
|
|
"- cold boot without level specifier\n"
|
|
"reset -w - warm reset if implemented"
|
|
);
|
|
|
|
#ifdef CONFIG_CMD_POWEROFF
|
|
U_BOOT_CMD(
|
|
poweroff, 1, 0, do_poweroff,
|
|
"Perform POWEROFF of the device",
|
|
""
|
|
);
|
|
#endif
|