* [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph
@ 2017-09-19 3:05 Suneel Garapati
2017-09-19 3:14 ` Bin Meng
2017-09-19 4:52 ` Stefan Roese
0 siblings, 2 replies; 4+ messages in thread
From: Suneel Garapati @ 2017-09-19 3:05 UTC (permalink / raw)
To: u-boot
add blk child devices to ignore list while displaying
usb tree graph, otherwise usb tree and info commands
may cause crash treating blk as usb device.
Signed-off-by: Suneel Garapati <suneelglinux@gmail.com>
---
Changes v2:
- remove check on parent uclass
Changes v1:
- add separate check on blk uclass
- modify description
- add separate check on parent uclass as usb
cmd/usb.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/cmd/usb.c b/cmd/usb.c
index d95bcf5..eb31353 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -414,8 +414,12 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre)
udev = dev_get_parent_priv(child);
- /* Ignore emulators, we only want real devices */
- if (device_get_uclass_id(child) != UCLASS_USB_EMUL) {
+ /*
+ * Ignore emulators and block child devices, with check on
+ * parent uclass as usb, we only want real devices
+ */
+ if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) &&
+ (device_get_uclass_id(child) != UCLASS_BLK)) {
usb_show_tree_graph(udev, pre);
pre[index] = 0;
}
@@ -605,7 +609,8 @@ static void usb_show_info(struct usb_device *udev)
for (device_find_first_child(udev->dev, &child);
child;
device_find_next_child(&child)) {
- if (device_active(child)) {
+ if (device_active(child) &&
+ (device_get_uclass_id(child) != UCLASS_BLK)) {
udev = dev_get_parent_priv(child);
usb_show_info(udev);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph
2017-09-19 3:05 [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph Suneel Garapati
@ 2017-09-19 3:14 ` Bin Meng
2017-09-19 4:52 ` Stefan Roese
1 sibling, 0 replies; 4+ messages in thread
From: Bin Meng @ 2017-09-19 3:14 UTC (permalink / raw)
To: u-boot
Hi Suneel,
On Tue, Sep 19, 2017 at 11:05 AM, Suneel Garapati
<suneelglinux@gmail.com> wrote:
> add blk child devices to ignore list while displaying
> usb tree graph, otherwise usb tree and info commands
> may cause crash treating blk as usb device.
>
> Signed-off-by: Suneel Garapati <suneelglinux@gmail.com>
> ---
>
> Changes v2:
> - remove check on parent uclass
> Changes v1:
> - add separate check on blk uclass
> - modify description
> - add separate check on parent uclass as usb
>
> cmd/usb.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/cmd/usb.c b/cmd/usb.c
> index d95bcf5..eb31353 100644
> --- a/cmd/usb.c
> +++ b/cmd/usb.c
> @@ -414,8 +414,12 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre)
>
> udev = dev_get_parent_priv(child);
>
> - /* Ignore emulators, we only want real devices */
> - if (device_get_uclass_id(child) != UCLASS_USB_EMUL) {
> + /*
> + * Ignore emulators and block child devices, with check on
> + * parent uclass as usb, we only want real devices
nits: please remove the comment of "with check on parent uclass as usb".
> + */
> + if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) &&
> + (device_get_uclass_id(child) != UCLASS_BLK)) {
> usb_show_tree_graph(udev, pre);
> pre[index] = 0;
> }
> @@ -605,7 +609,8 @@ static void usb_show_info(struct usb_device *udev)
> for (device_find_first_child(udev->dev, &child);
> child;
> device_find_next_child(&child)) {
> - if (device_active(child)) {
> + if (device_active(child) &&
> + (device_get_uclass_id(child) != UCLASS_BLK)) {
> udev = dev_get_parent_priv(child);
> usb_show_info(udev);
> }
> --
Regards,
Bin
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph
2017-09-19 3:05 [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph Suneel Garapati
2017-09-19 3:14 ` Bin Meng
@ 2017-09-19 4:52 ` Stefan Roese
2017-09-19 5:58 ` Suneel Garapati
1 sibling, 1 reply; 4+ messages in thread
From: Stefan Roese @ 2017-09-19 4:52 UTC (permalink / raw)
To: u-boot
On 19.09.2017 05:05, Suneel Garapati wrote:
> add blk child devices to ignore list while displaying
> usb tree graph, otherwise usb tree and info commands
> may cause crash treating blk as usb device.
>
> Signed-off-by: Suneel Garapati <suneelglinux@gmail.com>
This patch fixes the crash I've experienced with "usb tree" sometimes,
so:
Tested-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph
2017-09-19 4:52 ` Stefan Roese
@ 2017-09-19 5:58 ` Suneel Garapati
0 siblings, 0 replies; 4+ messages in thread
From: Suneel Garapati @ 2017-09-19 5:58 UTC (permalink / raw)
To: u-boot
Thanks Bin and Stefan. I have sent the v3.
Regards,
Suneel
On Mon, Sep 18, 2017 at 9:52 PM, Stefan Roese <sr@denx.de> wrote:
> On 19.09.2017 05:05, Suneel Garapati wrote:
>>
>> add blk child devices to ignore list while displaying
>> usb tree graph, otherwise usb tree and info commands
>> may cause crash treating blk as usb device.
>>
>> Signed-off-by: Suneel Garapati <suneelglinux@gmail.com>
>
>
> This patch fixes the crash I've experienced with "usb tree" sometimes,
> so:
>
> Tested-by: Stefan Roese <sr@denx.de>
>
> Thanks,
> Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-19 5:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-19 3:05 [U-Boot] [PATCH v2] cmd: usb: add blk devices to ignore list in tree graph Suneel Garapati
2017-09-19 3:14 ` Bin Meng
2017-09-19 4:52 ` Stefan Roese
2017-09-19 5:58 ` Suneel Garapati
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.