V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: reset: Allow reset_walk() to return 

Add a new reset_walk_halt() function to cause a reset and then halt on
failure. The reset_walk() function returns an error code.

This is needed for testing since otherwise U-Boot will halt in the middle
of a test.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-07-06 12:54:27 -06:00
parent dc6f4d3a55
commit 1704d083b3
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/misc/reset-uclass.c
View File

@ -25,23 +25,34 @@ int reset_request(struct udevice *dev, enum reset_t type)
return ops->request(dev, type); return ops->request(dev, type);
} }
void reset_walk(enum reset_t type) int reset_walk(enum reset_t type)
{ {
struct udevice *dev; struct udevice *dev;
int ret = 0; int ret = -ENOSYS;
while (ret != -EINPROGRESS && type < RESET_COUNT) { while (ret != -EINPROGRESS && type < RESET_COUNT) {
for (uclass_first_device(UCLASS_RESET, &dev); for (uclass_first_device(UCLASS_RESET, &dev);
dev; dev;
uclass_next_device(&dev)) { uclass_next_device(&dev)) {
ret = reset_request(dev, type); ret = reset_request(dev, type);
if (ret == -EINPROGRESS) if (ret == -EINPROGRESS)
break; break;
} }
type++;
} }
return ret;
}
void reset_walk_halt(enum reset_t type)
{
int ret;
ret = reset_walk(type);
/* Wait for the reset to take effect */ /* Wait for the reset to take effect */
mdelay(100); if (ret == -EINPROGRESS)
mdelay(100);
/* Still no reset? Give up */ /* Still no reset? Give up */
printf("Reset not supported on this platform\n"); printf("Reset not supported on this platform\n");
@ -53,7 +64,15 @@ void reset_walk(enum reset_t type)
*/ */
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
{ {
reset_walk(RESET_WARM); reset_walk_halt(RESET_WARM);
}
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
reset_walk_halt(RESET_WARM);
return 0;
} }
UCLASS_DRIVER(reset) = { UCLASS_DRIVER(reset) = {

11
include/reset.h
View File

@ -51,8 +51,17 @@ int reset_request(struct udevice *dev, enum reset_t type);
* If this function fails to reset, it will display a message and halt * If this function fails to reset, it will display a message and halt
* *
* @type: Reset type to request * @type: Reset type to request
* @return -EINPROGRESS if a reset is in progress, -ENOSYS if not available
*/ */
void reset_walk(enum reset_t type); int reset_walk(enum reset_t type);
/**
* reset_walk_halt() - try to reset, otherwise halt
*
* This calls reset_walk(). If it returns, indicating that reset is not
* supported, it prints a message and halts.
*/
void reset_walk_halt(enum reset_t type);
/** /**
* reset_cpu() - calls reset_walk(RESET_WARM) * reset_cpu() - calls reset_walk(RESET_WARM)