From 2138fd6d5d358bcfef6631300763c16a70f2af3d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 3 Jul 2016 20:22:04 +0200 Subject: usb: dm: Add a usb_for_each_root_dev() helper function Iterating over usb-root devs and doing something for all of them is a bit tricky with dm, factor out the proven usb_show_tree() for this into a helper function. Signed-off-by: Hans de Goede --- cmd/usb.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cmd/usb.c b/cmd/usb.c index 58d9db29d7..5453c0d4c5 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -438,9 +438,11 @@ static void usb_show_subtree(struct usb_device *dev) usb_show_tree_graph(dev, &preamble[0]); } -void usb_show_tree(void) -{ #ifdef CONFIG_DM_USB +typedef void (*usb_dev_func_t)(struct usb_device *udev); + +static void usb_for_each_root_dev(usb_dev_func_t func) +{ struct udevice *bus; for (uclass_find_first_device(UCLASS_USB, &bus); @@ -455,9 +457,16 @@ void usb_show_tree(void) device_find_first_child(bus, &dev); if (dev && device_active(dev)) { udev = dev_get_parent_priv(dev); - usb_show_subtree(udev); + func(udev); } } +} +#endif + +void usb_show_tree(void) +{ +#ifdef CONFIG_DM_USB + usb_for_each_root_dev(usb_show_subtree); #else struct usb_device *udev; int i; -- cgit v1.2.1 From e6e188f5623e3db7fcba785f4246d16425dd2104 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 3 Jul 2016 20:22:05 +0200 Subject: usb: dm: Make "usb info" use usb_for_each_root_dev() The old dm "usb info" implementation has several issues: 1) NULL pointer deref when a bus has no children 2) Not showing usb devices on busses without an emulated root-hub (otg host) 3) Attempting to show devices on inactive busses 4) "usb info" Would cause some hosts to get re-probed something which only "usb reset" should do TL;DR: proper iterating over usb bus root devs is hard, use the helper for it. Reported-by: Bernhard Nortmann Signed-off-by: Hans de Goede --- cmd/usb.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/cmd/usb.c b/cmd/usb.c index 5453c0d4c5..455127c844 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -593,39 +593,20 @@ static void do_usb_start(void) } #ifdef CONFIG_DM_USB -static void show_info(struct udevice *dev) +static void usb_show_info(struct usb_device *udev) { struct udevice *child; - struct usb_device *udev; - udev = dev_get_parent_priv(dev); usb_display_desc(udev); usb_display_config(udev); - for (device_find_first_child(dev, &child); + for (device_find_first_child(udev->dev, &child); child; device_find_next_child(&child)) { - if (device_active(child)) - show_info(child); - } -} - -static int usb_device_info(void) -{ - struct udevice *bus; - - for (uclass_first_device(UCLASS_USB, &bus); - bus; - uclass_next_device(&bus)) { - struct udevice *hub; - - device_find_first_child(bus, &hub); - if (device_get_uclass_id(hub) == UCLASS_USB_HUB && - device_active(hub)) { - show_info(hub); + if (device_active(child)) { + udev = dev_get_parent_priv(child); + usb_show_info(udev); } } - - return 0; } #endif @@ -681,7 +662,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (strncmp(argv[1], "inf", 3) == 0) { if (argc == 2) { #ifdef CONFIG_DM_USB - usb_device_info(); + usb_for_each_root_dev(usb_show_info); #else int d; for (d = 0; d < USB_MAX_DEVICE; d++) { -- cgit v1.2.1 From 12c67d7522d77c5aa5ee1e5ec4147b569ccb7666 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 5 Jul 2016 17:40:27 +0200 Subject: powerpc: mpc85xx: Do not build errata command in SPL The errata command is useless in SPL, so don't build it. This fixes multiple build failures on PowerPC. Signed-off-by: Marek Vasut Cc: York Sun Fixes: 92623672f9d3 ("fsl: usb: make errata function common for PPC and ARM") --- arch/powerpc/cpu/mpc85xx/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 65c26c093c..f4c4fe2602 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -26,7 +26,9 @@ else obj-$(CONFIG_MP) += release.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_ERRATA) += cmd_errata.o +endif obj-$(CONFIG_CPM2) += commproc.o obj-$(CONFIG_CPM2) += ether_fcc.o -- cgit v1.2.1 From eb364c3dc28d59d33e823470d07746b22a8e6fee Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 6 Jul 2016 16:39:51 -0700 Subject: powerpc: mpc85xx: kmp204x: Fix compiling error for usb errata Commit 9262367 moves USB errata workaround into a C file. This causes compiling error for kmcoge4 and kmlion1. To enable the errata workaround, define CONFIG_USB_EHCI_FSL in common header. Signed-off-by: York Sun Cc: Marek Vasut Cc: Ed Swarthout Cc: Sriram Dash Fixes: 92623672f9d3 ("fsl: usb: make errata function common for PPC and ARM") --- include/configs/km/kmp204x-common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 028623d1ee..5bdda2264b 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -406,6 +406,7 @@ int get_scl(void); #endif #define __USB_PHY_TYPE utmi +#define CONFIG_USB_EHCI_FSL /* * Environment Configuration -- cgit v1.2.1