Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstd: Keep track of use of usb stop

Browse source 
When 'usb stop' is run, doing 'bootflow scan' does not run the USB hunter
again so does not see any devices. Fix this by telling bootstd about the
state of USB.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-09-20 07:29:49 -06:00 committed by Bin Meng
parent 8c11d19e75
commit 1b1d36ec58
3 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
boot/bootdev-uclass.c
View file

@ -830,6 +830,33 @@ int bootdev_hunt(const char *spec, bool show)
return result;
}
int bootdev_unhunt(enum uclass_id id)
{
struct bootdev_hunter *start;
int n_ent, i;
start = ll_entry_start(struct bootdev_hunter, bootdev_hunter);
n_ent = ll_entry_count(struct bootdev_hunter, bootdev_hunter);
for (i = 0; i < n_ent; i++) {
struct bootdev_hunter *info = start + i;
if (info->uclass == id) {
struct bootstd_priv *std;
int ret;
ret = bootstd_get_priv(&std);
if (ret)
return log_msg_ret("std", ret);
if (!(std->hunters_used & BIT(i)))
return -EALREADY;
std->hunters_used &= ~BIT(i);
return 0;
}
}
return -ENOENT;
}
int bootdev_hunt_prio(enum bootdev_prio_t prio, bool show)
{
struct bootdev_hunter *start;

8
drivers/usb/host/usb-uclass.c
View file

@ -9,6 +9,7 @@
#define LOG_CATEGORY UCLASS_USB
#include <common.h>
#include <bootdev.h>
#include <dm.h>
#include <errno.h>
#include <log.h>
@ -208,6 +209,13 @@ int usb_stop(void)
#ifdef CONFIG_USB_STORAGE
usb_stor_reset();
#endif
if (CONFIG_IS_ENABLED(BOOTSTD)) {
int ret;
ret = bootdev_unhunt(UCLASS_USB);
if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && ret && ret != -EALREADY)
printf("failed to unhunt USB (err=%dE)\n", ret);
}
uc_priv->companion_device_count = 0;
usb_started = 0;

9
include/bootdev.h
View file

@ -320,6 +320,15 @@ int bootdev_hunt(const char *spec, bool show);
*/
int bootdev_hunt_prio(enum bootdev_prio_t prio, bool show);
/**
* bootdev_unhunt() - Mark a device as needing to be hunted again
*
* @id: uclass ID to update
* Return: 0 if done, -EALREADY if already in this state, -ENOENT if no hunter
* found for that uclass
*/
int bootdev_unhunt(enum uclass_id id);
/**
* bootdev_hunt_and_find_by_label() - Hunt for bootdevs by label
*