2012-02-13 18:58:17 +00:00
|
|
|
/*
|
|
|
|
* Most of this source has been derived from the Linux USB
|
|
|
|
* project:
|
|
|
|
* (C) Copyright Linus Torvalds 1999
|
|
|
|
* (C) Copyright Johannes Erdfelt 1999-2001
|
|
|
|
* (C) Copyright Andreas Gal 1999
|
|
|
|
* (C) Copyright Gregory P. Smith 1999
|
|
|
|
* (C) Copyright Deti Fliegl 1999 (new USB architecture)
|
|
|
|
* (C) Copyright Randy Dunlap 2000
|
|
|
|
* (C) Copyright David Brownell 2000 (kernel hotplug, usb_device_id)
|
|
|
|
* (C) Copyright Yggdrasil Computing, Inc. 2000
|
|
|
|
* (usb_device_id matching changes by Adam J. Richter)
|
|
|
|
*
|
|
|
|
* Adapted for U-Boot:
|
|
|
|
* (C) Copyright 2001 Denis Peter, MPL AG Switzerland
|
|
|
|
*
|
2013-07-08 07:37:19 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
2012-02-13 18:58:17 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
* HUB "Driver"
|
|
|
|
* Probes device for being a hub and configurate it
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
2015-03-25 18:22:10 +00:00
|
|
|
#include <dm.h>
|
2015-03-25 18:22:01 +00:00
|
|
|
#include <errno.h>
|
2015-09-02 23:24:58 +00:00
|
|
|
#include <memalign.h>
|
2012-02-13 18:58:17 +00:00
|
|
|
#include <asm/processor.h>
|
2012-09-06 06:00:13 +00:00
|
|
|
#include <asm/unaligned.h>
|
2012-02-13 18:58:17 +00:00
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <asm/byteorder.h>
|
|
|
|
#include <asm/unaligned.h>
|
2015-03-25 18:22:10 +00:00
|
|
|
#include <dm/root.h>
|
|
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
#include <usb.h>
|
|
|
|
#ifdef CONFIG_4xx
|
|
|
|
#include <asm/4xx_pci.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define USB_BUFSIZ 512
|
|
|
|
|
2015-03-25 18:22:10 +00:00
|
|
|
/* TODO(sjg@chromium.org): Remove this when CONFIG_DM_USB is defined */
|
2012-02-13 18:58:17 +00:00
|
|
|
static struct usb_hub_device hub_dev[USB_MAX_HUB];
|
|
|
|
static int usb_hub_index;
|
|
|
|
|
2013-08-01 19:06:01 +00:00
|
|
|
__weak void usb_hub_reset_devices(int port)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
static int usb_get_hub_descriptor(struct usb_device *dev, void *data, int size)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
|
|
|
|
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
|
|
|
|
USB_DT_HUB << 8, 0, data, size, USB_CNTL_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_clear_port_feature(struct usb_device *dev, int port, int feature)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
|
|
|
|
USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature,
|
|
|
|
port, NULL, 0, USB_CNTL_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_set_port_feature(struct usb_device *dev, int port, int feature)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
|
|
|
|
USB_REQ_SET_FEATURE, USB_RT_PORT, feature,
|
|
|
|
port, NULL, 0, USB_CNTL_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_get_hub_status(struct usb_device *dev, void *data)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
|
|
|
|
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
|
|
|
|
data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
2015-05-04 17:30:54 +00:00
|
|
|
int usb_get_port_status(struct usb_device *dev, int port, void *data)
|
2012-02-13 18:58:17 +00:00
|
|
|
{
|
|
|
|
return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
|
|
|
|
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
|
|
|
|
data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void usb_hub_power_on(struct usb_hub_device *hub)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct usb_device *dev;
|
2011-12-21 00:01:09 +00:00
|
|
|
unsigned pgood_delay = hub->desc.bPwrOn2PwrGood * 2;
|
2015-04-08 19:21:12 +00:00
|
|
|
const char *env;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
dev = hub->pusb_dev;
|
2013-04-24 02:50:11 +00:00
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("enabling power on all ports\n");
|
2013-04-24 02:50:11 +00:00
|
|
|
for (i = 0; i < dev->maxchild; i++) {
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d returns %lX\n", i + 1, dev->status);
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
2011-12-21 00:01:09 +00:00
|
|
|
|
2014-05-19 20:21:17 +00:00
|
|
|
/*
|
|
|
|
* Wait for power to become stable,
|
|
|
|
* plus spec-defined max time for device to connect
|
2015-04-08 19:21:12 +00:00
|
|
|
* but allow this time to be increased via env variable as some
|
|
|
|
* devices break the spec and require longer warm-up times
|
2014-05-19 20:21:17 +00:00
|
|
|
*/
|
2015-04-08 19:21:12 +00:00
|
|
|
env = getenv("usb_pgood_delay");
|
|
|
|
if (env)
|
|
|
|
pgood_delay = max(pgood_delay,
|
|
|
|
(unsigned)simple_strtol(env, NULL, 0));
|
|
|
|
debug("pgood_delay=%dms\n", pgood_delay);
|
2014-05-19 20:21:18 +00:00
|
|
|
mdelay(pgood_delay + 1000);
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void usb_hub_reset(void)
|
|
|
|
{
|
|
|
|
usb_hub_index = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct usb_hub_device *usb_hub_allocate(void)
|
|
|
|
{
|
|
|
|
if (usb_hub_index < USB_MAX_HUB)
|
|
|
|
return &hub_dev[usb_hub_index++];
|
|
|
|
|
|
|
|
printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAX_TRIES 5
|
|
|
|
|
|
|
|
static inline char *portspeed(int portstatus)
|
|
|
|
{
|
2013-04-24 02:50:12 +00:00
|
|
|
char *speed_str;
|
|
|
|
|
|
|
|
switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
|
|
|
|
case USB_PORT_STAT_SUPER_SPEED:
|
|
|
|
speed_str = "5 Gb/s";
|
|
|
|
break;
|
|
|
|
case USB_PORT_STAT_HIGH_SPEED:
|
|
|
|
speed_str = "480 Mb/s";
|
|
|
|
break;
|
|
|
|
case USB_PORT_STAT_LOW_SPEED:
|
|
|
|
speed_str = "1.5 Mb/s";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
speed_str = "12 Mb/s";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return speed_str;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
2015-03-25 18:22:04 +00:00
|
|
|
int legacy_hub_port_reset(struct usb_device *dev, int port,
|
2012-02-13 18:58:17 +00:00
|
|
|
unsigned short *portstat)
|
|
|
|
{
|
2015-05-10 12:10:15 +00:00
|
|
|
int err, tries;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
unsigned short portstatus, portchange;
|
|
|
|
|
2015-03-25 18:22:10 +00:00
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
debug("%s: resetting '%s' port %d...\n", __func__, dev->dev->name,
|
|
|
|
port + 1);
|
|
|
|
#else
|
|
|
|
debug("%s: resetting port %d...\n", __func__, port + 1);
|
|
|
|
#endif
|
2012-02-13 18:58:17 +00:00
|
|
|
for (tries = 0; tries < MAX_TRIES; tries++) {
|
2015-05-10 12:10:15 +00:00
|
|
|
err = usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(200);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2012-04-03 09:26:06 +00:00
|
|
|
if (usb_get_port_status(dev, port + 1, portsts) < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("get_port_status failed status %lX\n",
|
|
|
|
dev->status);
|
2012-02-13 18:58:17 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2012-04-03 09:26:06 +00:00
|
|
|
portstatus = le16_to_cpu(portsts->wPortStatus);
|
|
|
|
portchange = le16_to_cpu(portsts->wPortChange);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("portstatus %x, change %x, %s\n", portstatus, portchange,
|
|
|
|
portspeed(portstatus));
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \
|
|
|
|
" USB_PORT_STAT_ENABLE %d\n",
|
|
|
|
(portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0,
|
|
|
|
(portstatus & USB_PORT_STAT_CONNECTION) ? 1 : 0,
|
|
|
|
(portstatus & USB_PORT_STAT_ENABLE) ? 1 : 0);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
usb: hub: don't check CONNECTION in hub_port_reset()
One specific USB 3.0 device behaves strangely when reset by
usb_new_device()'s call to hub_port_reset(). For some reason, the device
appears to briefly drop off the bus when this second bus reset is
executed, yet if we retry this loop, it'll eventually come back after
another two resets.
If USB bus reset is executed over and over within usb_new_device()'s call
to hub_port_reset(), I see the following sequence of results, which
repeats as long as you want:
1) STAT_C_CONNECTION = 1 STAT_CONNECTION = 0 USB_PORT_STAT_ENABLE 0
2) STAT_C_CONNECTION = 1 STAT_CONNECTION = 1 USB_PORT_STAT_ENABLE 0
3) STAT_C_CONNECTION = 1 STAT_CONNECTION = 1 USB_PORT_STAT_ENABLE 1
The device in question is a SanDisk Ultra USB 3.0 16GB memory stick with
USB VID/PID 0x0781/0x5581.
In order to allow this device to work with U-Boot, ignore the
{C_,}CONNECTION bits in the status/change registers, and only use the
ENABLE bit to determine if the reset was successful.
To be honest, extensive investigation has failed to determine why this
problem occurs. I'd love to know! I don't know if it's caused by:
* A HW bug in the device
* A HW bug in the Tegra USB controller
* A SW bug in the U-Boot Tegra USB driver
* A SW bug in the U-Boot USB core
This issue only occurs when the device's USB3 pins are attached to the
host; if only the USB2 pins are connected the issue does not occur. The
USB3 controller on Tegra is in reset, so is not actively communicating
with the device at all - a USB3 analyzer confirms this. Slightly
unplugging the device (so the USB3 pins don't contact) or using a USB2
cable or hub as an intermediary avoids the problem. For some reason,
the Linux kernel (either on the same Tegra board, or on an x86 host)
has no issue with the device, and I observe no disconnections during
reset.
This change won't affect any USB device that already works, since such
devices could not currently be triggering the error return this patch
removes, or they wouldn't be working currently.
However, this patch is quite reliable in practice, hence I hope it's
acceptable to solve the problem.
The only potential fallout I can see from this patch is:
* A broken device that triggers C_CONNECTION/!CONNECTION now causes the
loop in hub_port_reset() to run multiple times. If it never succeeds,
this will cause "usb start" to take roughly 1s extra to execute.
* If the user unplugs a device while hub_port_reset() is executing, and
very quickly swaps in a new device, hub_port_reset() might succeed on
the new device. This would mean that any information cached about the
original device (from the descriptor read in usb_new_device(), which
simply caches the max packet size) might be invalid, which would cause
problems talking to the new device. However, without this change, the
new device wouldn't work anyway, so this is probably not much of a
loss.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-08-07 23:07:59 +00:00
|
|
|
/*
|
|
|
|
* Perhaps we should check for the following here:
|
|
|
|
* - C_CONNECTION hasn't been set.
|
|
|
|
* - CONNECTION is still set.
|
|
|
|
*
|
|
|
|
* Doing so would ensure that the device is still connected
|
|
|
|
* to the bus, and hasn't been unplugged or replaced while the
|
|
|
|
* USB bus reset was going on.
|
|
|
|
*
|
|
|
|
* However, if we do that, then (at least) a San Disk Ultra
|
|
|
|
* USB 3.0 16GB device fails to reset on (at least) an NVIDIA
|
|
|
|
* Tegra Jetson TK1 board. For some reason, the device appears
|
|
|
|
* to briefly drop off the bus when this second bus reset is
|
|
|
|
* executed, yet if we retry this loop, it'll eventually come
|
|
|
|
* back after another reset or two.
|
|
|
|
*/
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
if (portstatus & USB_PORT_STAT_ENABLE)
|
|
|
|
break;
|
|
|
|
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(200);
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (tries == MAX_TRIES) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Cannot enable port %i after %i retries, " \
|
|
|
|
"disabling port.\n", port + 1, MAX_TRIES);
|
|
|
|
debug("Maybe the USB cable is bad?\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_RESET);
|
|
|
|
*portstat = portstatus;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-25 18:22:10 +00:00
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
int hub_port_reset(struct udevice *dev, int port, unsigned short *portstat)
|
|
|
|
{
|
2015-09-29 05:32:01 +00:00
|
|
|
struct usb_device *udev = dev_get_parent_priv(dev);
|
2015-03-25 18:22:10 +00:00
|
|
|
|
|
|
|
return legacy_hub_port_reset(udev, port, portstat);
|
|
|
|
}
|
|
|
|
#endif
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2015-03-25 18:22:01 +00:00
|
|
|
int usb_hub_port_connect_change(struct usb_device *dev, int port)
|
2012-02-13 18:58:17 +00:00
|
|
|
{
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
unsigned short portstatus;
|
2015-03-25 18:22:01 +00:00
|
|
|
int ret, speed;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
/* Check status */
|
2015-03-25 18:22:01 +00:00
|
|
|
ret = usb_get_port_status(dev, port + 1, portsts);
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("get_port_status failed\n");
|
2015-03-25 18:22:01 +00:00
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
2012-04-03 09:26:06 +00:00
|
|
|
portstatus = le16_to_cpu(portsts->wPortStatus);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("portstatus %x, change %x, %s\n",
|
|
|
|
portstatus,
|
|
|
|
le16_to_cpu(portsts->wPortChange),
|
|
|
|
portspeed(portstatus));
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
/* Clear the connection change status */
|
|
|
|
usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_CONNECTION);
|
|
|
|
|
|
|
|
/* Disconnect any existing devices under this port */
|
|
|
|
if (((!(portstatus & USB_PORT_STAT_CONNECTION)) &&
|
2015-03-25 18:22:10 +00:00
|
|
|
(!(portstatus & USB_PORT_STAT_ENABLE))) ||
|
|
|
|
usb_device_has_child_on_port(dev, port)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_disconnect(&hub->children[port]);\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
/* Return now if nothing is connected */
|
|
|
|
if (!(portstatus & USB_PORT_STAT_CONNECTION))
|
2015-03-25 18:22:01 +00:00
|
|
|
return -ENOTCONN;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(200);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
/* Reset the port */
|
2015-03-25 18:22:04 +00:00
|
|
|
ret = legacy_hub_port_reset(dev, port, &portstatus);
|
2015-03-25 18:22:01 +00:00
|
|
|
if (ret < 0) {
|
2015-05-10 12:10:16 +00:00
|
|
|
if (ret != -ENXIO)
|
|
|
|
printf("cannot reset port %i!?\n", port + 1);
|
2015-03-25 18:22:01 +00:00
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(200);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2013-04-24 02:50:12 +00:00
|
|
|
switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
|
|
|
|
case USB_PORT_STAT_SUPER_SPEED:
|
2015-03-25 18:22:01 +00:00
|
|
|
speed = USB_SPEED_SUPER;
|
2013-04-24 02:50:12 +00:00
|
|
|
break;
|
|
|
|
case USB_PORT_STAT_HIGH_SPEED:
|
2015-03-25 18:22:01 +00:00
|
|
|
speed = USB_SPEED_HIGH;
|
2013-04-24 02:50:12 +00:00
|
|
|
break;
|
|
|
|
case USB_PORT_STAT_LOW_SPEED:
|
2015-03-25 18:22:01 +00:00
|
|
|
speed = USB_SPEED_LOW;
|
2013-04-24 02:50:12 +00:00
|
|
|
break;
|
|
|
|
default:
|
2015-03-25 18:22:01 +00:00
|
|
|
speed = USB_SPEED_FULL;
|
2013-04-24 02:50:12 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2015-03-25 18:22:10 +00:00
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
struct udevice *child;
|
|
|
|
|
|
|
|
ret = usb_scan_device(dev->dev, port + 1, speed, &child);
|
|
|
|
#else
|
|
|
|
struct usb_device *usb;
|
|
|
|
|
2015-03-25 18:22:01 +00:00
|
|
|
ret = usb_alloc_new_device(dev->controller, &usb);
|
|
|
|
if (ret) {
|
|
|
|
printf("cannot create new device: ret=%d", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-02-13 18:58:17 +00:00
|
|
|
dev->children[port] = usb;
|
2015-03-25 18:22:01 +00:00
|
|
|
usb->speed = speed;
|
2012-02-13 18:58:17 +00:00
|
|
|
usb->parent = dev;
|
|
|
|
usb->portnr = port + 1;
|
|
|
|
/* Run it through the hoops (find a driver, etc) */
|
2015-03-25 18:22:01 +00:00
|
|
|
ret = usb_new_device(usb);
|
|
|
|
if (ret < 0) {
|
2012-02-13 18:58:17 +00:00
|
|
|
/* Woops, disable the port */
|
2015-03-25 18:22:01 +00:00
|
|
|
usb_free_device(dev->controller);
|
2012-12-13 01:55:28 +00:00
|
|
|
dev->children[port] = NULL;
|
2015-03-25 18:22:10 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("hub: disabling port %d\n", port + 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
|
|
|
|
}
|
2015-03-25 18:22:01 +00:00
|
|
|
|
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int usb_hub_configure(struct usb_device *dev)
|
|
|
|
{
|
2013-07-19 20:12:08 +00:00
|
|
|
int i, length;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, USB_BUFSIZ);
|
|
|
|
unsigned char *bitmap;
|
2012-09-06 06:00:13 +00:00
|
|
|
short hubCharacteristics;
|
2012-02-13 18:58:17 +00:00
|
|
|
struct usb_hub_descriptor *descriptor;
|
|
|
|
struct usb_hub_device *hub;
|
2013-04-12 11:04:33 +00:00
|
|
|
__maybe_unused struct usb_hub_status *hubsts;
|
2015-03-25 18:22:09 +00:00
|
|
|
int ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
/* "allocate" Hub device */
|
|
|
|
hub = usb_hub_allocate();
|
|
|
|
if (hub == NULL)
|
2015-03-25 18:22:09 +00:00
|
|
|
return -ENOMEM;
|
2012-02-13 18:58:17 +00:00
|
|
|
hub->pusb_dev = dev;
|
|
|
|
/* Get the the hub descriptor */
|
2015-03-25 18:22:09 +00:00
|
|
|
ret = usb_get_hub_descriptor(dev, buffer, 4);
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_hub_configure: failed to get hub " \
|
|
|
|
"descriptor, giving up %lX\n", dev->status);
|
2015-03-25 18:22:09 +00:00
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
descriptor = (struct usb_hub_descriptor *)buffer;
|
|
|
|
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
length = min_t(int, descriptor->bLength,
|
|
|
|
sizeof(struct usb_hub_descriptor));
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2015-03-25 18:22:09 +00:00
|
|
|
ret = usb_get_hub_descriptor(dev, buffer, length);
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_hub_configure: failed to get hub " \
|
|
|
|
"descriptor 2nd giving up %lX\n", dev->status);
|
2015-03-25 18:22:09 +00:00
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
2013-07-19 20:12:08 +00:00
|
|
|
memcpy((unsigned char *)&hub->desc, buffer, length);
|
2012-02-13 18:58:17 +00:00
|
|
|
/* adjust 16bit values */
|
2012-09-06 06:00:13 +00:00
|
|
|
put_unaligned(le16_to_cpu(get_unaligned(
|
|
|
|
&descriptor->wHubCharacteristics)),
|
|
|
|
&hub->desc.wHubCharacteristics);
|
2012-02-13 18:58:17 +00:00
|
|
|
/* set the bitmap */
|
|
|
|
bitmap = (unsigned char *)&hub->desc.DeviceRemovable[0];
|
|
|
|
/* devices not removable by default */
|
|
|
|
memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8);
|
|
|
|
bitmap = (unsigned char *)&hub->desc.PortPowerCtrlMask[0];
|
|
|
|
memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8); /* PowerMask = 1B */
|
|
|
|
|
|
|
|
for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
|
|
|
|
hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i];
|
|
|
|
|
|
|
|
for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
|
|
|
|
hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i];
|
|
|
|
|
|
|
|
dev->maxchild = descriptor->bNbrPorts;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("%d ports detected\n", dev->maxchild);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2012-09-06 06:00:13 +00:00
|
|
|
hubCharacteristics = get_unaligned(&hub->desc.wHubCharacteristics);
|
|
|
|
switch (hubCharacteristics & HUB_CHAR_LPSM) {
|
2012-02-13 18:58:17 +00:00
|
|
|
case 0x00:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("ganged power switching\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
case 0x01:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("individual port power switching\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
case 0x02:
|
|
|
|
case 0x03:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("unknown reserved power switching mode\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-09-06 06:00:13 +00:00
|
|
|
if (hubCharacteristics & HUB_CHAR_COMPOUND)
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("part of a compound device\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
else
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("standalone hub\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
|
2012-09-06 06:00:13 +00:00
|
|
|
switch (hubCharacteristics & HUB_CHAR_OCPM) {
|
2012-02-13 18:58:17 +00:00
|
|
|
case 0x00:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("global over-current protection\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
case 0x08:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("individual port over-current protection\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
case 0x10:
|
|
|
|
case 0x18:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("no over-current protection\n");
|
2012-02-13 18:58:17 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("power on to power good time: %dms\n",
|
|
|
|
descriptor->bPwrOn2PwrGood * 2);
|
|
|
|
debug("hub controller current requirement: %dmA\n",
|
|
|
|
descriptor->bHubContrCurrent);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
for (i = 0; i < dev->maxchild; i++)
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d is%s removable\n", i + 1,
|
|
|
|
hub->desc.DeviceRemovable[(i + 1) / 8] & \
|
|
|
|
(1 << ((i + 1) % 8)) ? " not" : "");
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
if (sizeof(struct usb_hub_status) > USB_BUFSIZ) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_hub_configure: failed to get Status - " \
|
|
|
|
"too long: %d\n", descriptor->bLength);
|
2015-03-25 18:22:09 +00:00
|
|
|
return -EFBIG;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
2015-03-25 18:22:09 +00:00
|
|
|
ret = usb_get_hub_status(dev, buffer);
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_hub_configure: failed to get Status %lX\n",
|
|
|
|
dev->status);
|
2015-03-25 18:22:09 +00:00
|
|
|
return ret;
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
#ifdef DEBUG
|
2012-02-13 18:58:17 +00:00
|
|
|
hubsts = (struct usb_hub_status *)buffer;
|
|
|
|
#endif
|
2013-04-12 11:04:33 +00:00
|
|
|
|
|
|
|
debug("get_hub_status returned status %X, change %X\n",
|
|
|
|
le16_to_cpu(hubsts->wHubStatus),
|
|
|
|
le16_to_cpu(hubsts->wHubChange));
|
|
|
|
debug("local power source is %s\n",
|
|
|
|
(le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_LOCAL_POWER) ? \
|
|
|
|
"lost (inactive)" : "good");
|
|
|
|
debug("%sover-current condition exists\n",
|
|
|
|
(le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
|
|
|
|
"" : "no ");
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_hub_power_on(hub);
|
|
|
|
|
2013-08-01 19:06:01 +00:00
|
|
|
/*
|
|
|
|
* Reset any devices that may be in a bad state when applying
|
|
|
|
* the power. This is a __weak function. Resetting of the devices
|
|
|
|
* should occur in the board file of the device.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < dev->maxchild; i++)
|
|
|
|
usb_hub_reset_devices(i + 1);
|
|
|
|
|
2012-02-13 18:58:17 +00:00
|
|
|
for (i = 0; i < dev->maxchild; i++) {
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
unsigned short portstatus, portchange;
|
2012-12-13 10:55:53 +00:00
|
|
|
int ret;
|
|
|
|
ulong start = get_timer(0);
|
|
|
|
|
2015-03-25 18:22:10 +00:00
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
debug("\n\nScanning '%s' port %d\n", dev->dev->name, i + 1);
|
|
|
|
#else
|
2015-03-25 18:22:09 +00:00
|
|
|
debug("\n\nScanning port %d\n", i + 1);
|
2015-03-25 18:22:10 +00:00
|
|
|
#endif
|
2012-12-13 10:55:53 +00:00
|
|
|
/*
|
|
|
|
* Wait for (whichever finishes first)
|
|
|
|
* - A maximum of 10 seconds
|
|
|
|
* This is a purely observational value driven by connecting
|
|
|
|
* a few broken pen drives and taking the max * 1.5 approach
|
|
|
|
* - connection_change and connection state to report same
|
|
|
|
* state
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
ret = usb_get_port_status(dev, i + 1, portsts);
|
|
|
|
if (ret < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("get_port_status failed\n");
|
2012-12-13 10:55:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
portstatus = le16_to_cpu(portsts->wPortStatus);
|
|
|
|
portchange = le16_to_cpu(portsts->wPortChange);
|
|
|
|
|
usb: Fix device detection code
The code in question polls an USB port status via USB_REQ_GET_STATUS
to determine whether there is a device on the port or not. The way to
figure that out is to check two bits. Those are wPortChange[0] and
wPortStatus[0].
The wPortChange[0] indicates whether some kind of a connection status
change happened on a port (a device was plugged or unplugged). The
wPortStatus[0] bit indicates the status of the connection (plugged or
unplugged).
The current code tests whether wPortChange[0] == wPortStatus[0] and
if that's the case, considers the loop polling for the presence of a
USB device on port finished.
This works for most USB sticks, since they come up really quickly and
trigger the USB port change detection before the first iteration of the
detection loop happens. Thus, both wPortChange[0] and wPortStatus[0]
are set to 1 and thus equal. The loop is existed in it's first iteration
and the stick is detected correctly.
The problem is with some obscure USB sticks, which take some time before
they pop up on the bus after the port was enabled. In this case, both
the wPortChange[0] and wPortStatus[0] are 0. They are equal again, so
the loop again exits in the first iteration, but this is incorrect, as
such USB stick didn't have the opportunity to get detected on the bus.
Rework the code such, that it checks for wPortChange[0] first to test
if any connection change happened at all. If no change occured, keep
polling. If a change did occur, test the wPortStatus[0] to see there is
some device present on the port and only if this is the case, break out
of the polling loop.
This patch also trims down the duration of the polling loop from 10s
per port to 1s per port. This is still annoyingly long, but there is
no better option in case of U-Boot unfortunatelly. This change will
most likely increase the duration of 'usb start' on some platforms,
but this is needed to fix a bug.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Hans de Goede <hdegoede@redhat.com>
2015-08-05 01:19:22 +00:00
|
|
|
/* No connection change happened, wait a bit more. */
|
|
|
|
if (!(portchange & USB_PORT_STAT_C_CONNECTION))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Test if the connection came up, and if so, exit. */
|
|
|
|
if (portstatus & USB_PORT_STAT_CONNECTION)
|
2012-12-13 10:55:53 +00:00
|
|
|
break;
|
|
|
|
|
usb: Fix device detection code
The code in question polls an USB port status via USB_REQ_GET_STATUS
to determine whether there is a device on the port or not. The way to
figure that out is to check two bits. Those are wPortChange[0] and
wPortStatus[0].
The wPortChange[0] indicates whether some kind of a connection status
change happened on a port (a device was plugged or unplugged). The
wPortStatus[0] bit indicates the status of the connection (plugged or
unplugged).
The current code tests whether wPortChange[0] == wPortStatus[0] and
if that's the case, considers the loop polling for the presence of a
USB device on port finished.
This works for most USB sticks, since they come up really quickly and
trigger the USB port change detection before the first iteration of the
detection loop happens. Thus, both wPortChange[0] and wPortStatus[0]
are set to 1 and thus equal. The loop is existed in it's first iteration
and the stick is detected correctly.
The problem is with some obscure USB sticks, which take some time before
they pop up on the bus after the port was enabled. In this case, both
the wPortChange[0] and wPortStatus[0] are 0. They are equal again, so
the loop again exits in the first iteration, but this is incorrect, as
such USB stick didn't have the opportunity to get detected on the bus.
Rework the code such, that it checks for wPortChange[0] first to test
if any connection change happened at all. If no change occured, keep
polling. If a change did occur, test the wPortStatus[0] to see there is
some device present on the port and only if this is the case, break out
of the polling loop.
This patch also trims down the duration of the polling loop from 10s
per port to 1s per port. This is still annoyingly long, but there is
no better option in case of U-Boot unfortunatelly. This change will
most likely increase the duration of 'usb start' on some platforms,
but this is needed to fix a bug.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Hans de Goede <hdegoede@redhat.com>
2015-08-05 01:19:22 +00:00
|
|
|
} while (get_timer(start) < CONFIG_SYS_HZ * 1);
|
2012-12-13 10:55:53 +00:00
|
|
|
|
|
|
|
if (ret < 0)
|
2012-02-13 18:58:17 +00:00
|
|
|
continue;
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Port %d Status %X Change %X\n",
|
|
|
|
i + 1, portstatus, portchange);
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
if (portchange & USB_PORT_STAT_C_CONNECTION) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d connection change\n", i + 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_hub_port_connect_change(dev, i);
|
|
|
|
}
|
|
|
|
if (portchange & USB_PORT_STAT_C_ENABLE) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d enable change, status %x\n",
|
|
|
|
i + 1, portstatus);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_clear_port_feature(dev, i + 1,
|
|
|
|
USB_PORT_FEAT_C_ENABLE);
|
2013-05-15 07:29:23 +00:00
|
|
|
/*
|
|
|
|
* The following hack causes a ghost device problem
|
|
|
|
* to Faraday EHCI
|
|
|
|
*/
|
|
|
|
#ifndef CONFIG_USB_EHCI_FARADAY
|
2012-02-13 18:58:17 +00:00
|
|
|
/* EM interference sometimes causes bad shielded USB
|
|
|
|
* devices to be shutdown by the hub, this hack enables
|
|
|
|
* them again. Works at least with mouse driver */
|
|
|
|
if (!(portstatus & USB_PORT_STAT_ENABLE) &&
|
|
|
|
(portstatus & USB_PORT_STAT_CONNECTION) &&
|
2015-03-25 18:22:10 +00:00
|
|
|
usb_device_has_child_on_port(dev, i)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("already running port %i " \
|
|
|
|
"disabled by hub (EMI?), " \
|
|
|
|
"re-enabling...\n", i + 1);
|
|
|
|
usb_hub_port_connect_change(dev, i);
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
2013-05-15 07:29:23 +00:00
|
|
|
#endif
|
2012-02-13 18:58:17 +00:00
|
|
|
}
|
|
|
|
if (portstatus & USB_PORT_STAT_SUSPEND) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d suspend change\n", i + 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_clear_port_feature(dev, i + 1,
|
|
|
|
USB_PORT_FEAT_SUSPEND);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d over-current change\n", i + 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_clear_port_feature(dev, i + 1,
|
|
|
|
USB_PORT_FEAT_C_OVER_CURRENT);
|
|
|
|
usb_hub_power_on(hub);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (portchange & USB_PORT_STAT_C_RESET) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("port %d reset change\n", i + 1);
|
2012-02-13 18:58:17 +00:00
|
|
|
usb_clear_port_feature(dev, i + 1,
|
|
|
|
USB_PORT_FEAT_C_RESET);
|
|
|
|
}
|
|
|
|
} /* end for i all ports */
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-25 18:22:09 +00:00
|
|
|
static int usb_hub_check(struct usb_device *dev, int ifnum)
|
2012-02-13 18:58:17 +00:00
|
|
|
{
|
|
|
|
struct usb_interface *iface;
|
2015-03-25 18:22:09 +00:00
|
|
|
struct usb_endpoint_descriptor *ep = NULL;
|
2012-02-13 18:58:17 +00:00
|
|
|
|
|
|
|
iface = &dev->config.if_desc[ifnum];
|
|
|
|
/* Is it a hub? */
|
|
|
|
if (iface->desc.bInterfaceClass != USB_CLASS_HUB)
|
2015-03-25 18:22:09 +00:00
|
|
|
goto err;
|
2012-02-13 18:58:17 +00:00
|
|
|
/* Some hubs have a subclass of 1, which AFAICT according to the */
|
|
|
|
/* specs is not defined, but it works */
|
|
|
|
if ((iface->desc.bInterfaceSubClass != 0) &&
|
|
|
|
(iface->desc.bInterfaceSubClass != 1))
|
2015-03-25 18:22:09 +00:00
|
|
|
goto err;
|
2012-02-13 18:58:17 +00:00
|
|
|
/* Multiple endpoints? What kind of mutant ninja-hub is this? */
|
|
|
|
if (iface->desc.bNumEndpoints != 1)
|
2015-03-25 18:22:09 +00:00
|
|
|
goto err;
|
2012-02-13 18:58:17 +00:00
|
|
|
ep = &iface->ep_desc[0];
|
|
|
|
/* Output endpoint? Curiousier and curiousier.. */
|
|
|
|
if (!(ep->bEndpointAddress & USB_DIR_IN))
|
2015-03-25 18:22:09 +00:00
|
|
|
goto err;
|
2012-02-13 18:58:17 +00:00
|
|
|
/* If it's not an interrupt endpoint, we'd better punt! */
|
|
|
|
if ((ep->bmAttributes & 3) != 3)
|
2015-03-25 18:22:09 +00:00
|
|
|
goto err;
|
2012-02-13 18:58:17 +00:00
|
|
|
/* We found a hub */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("USB hub found\n");
|
2015-03-25 18:22:09 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
debug("USB hub not found: bInterfaceClass=%d, bInterfaceSubClass=%d, bNumEndpoints=%d\n",
|
|
|
|
iface->desc.bInterfaceClass, iface->desc.bInterfaceSubClass,
|
|
|
|
iface->desc.bNumEndpoints);
|
|
|
|
if (ep) {
|
|
|
|
debug(" bEndpointAddress=%#x, bmAttributes=%d",
|
|
|
|
ep->bEndpointAddress, ep->bmAttributes);
|
|
|
|
}
|
|
|
|
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
int usb_hub_probe(struct usb_device *dev, int ifnum)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = usb_hub_check(dev, ifnum);
|
|
|
|
if (ret)
|
|
|
|
return 0;
|
2012-02-13 18:58:17 +00:00
|
|
|
ret = usb_hub_configure(dev);
|
|
|
|
return ret;
|
|
|
|
}
|
2015-03-25 18:22:10 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
int usb_hub_scan(struct udevice *hub)
|
|
|
|
{
|
2015-09-29 05:32:01 +00:00
|
|
|
struct usb_device *udev = dev_get_parent_priv(hub);
|
2015-03-25 18:22:10 +00:00
|
|
|
|
|
|
|
return usb_hub_configure(udev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_hub_post_bind(struct udevice *dev)
|
|
|
|
{
|
|
|
|
/* Scan the bus for devices */
|
|
|
|
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_hub_post_probe(struct udevice *dev)
|
|
|
|
{
|
|
|
|
debug("%s\n", __func__);
|
|
|
|
return usb_hub_scan(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct udevice_id usb_hub_ids[] = {
|
|
|
|
{ .compatible = "usb-hub" },
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
U_BOOT_DRIVER(usb_generic_hub) = {
|
|
|
|
.name = "usb_hub",
|
|
|
|
.id = UCLASS_USB_HUB,
|
|
|
|
.of_match = usb_hub_ids,
|
|
|
|
.flags = DM_FLAG_ALLOC_PRIV_DMA,
|
|
|
|
};
|
|
|
|
|
|
|
|
UCLASS_DRIVER(usb_hub) = {
|
|
|
|
.id = UCLASS_USB_HUB,
|
|
|
|
.name = "usb_hub",
|
|
|
|
.post_bind = usb_hub_post_bind,
|
|
|
|
.post_probe = usb_hub_post_probe,
|
|
|
|
.child_pre_probe = usb_child_pre_probe,
|
|
|
|
.per_child_auto_alloc_size = sizeof(struct usb_device),
|
|
|
|
.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct usb_device_id hub_id_table[] = {
|
|
|
|
{
|
|
|
|
.match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS,
|
|
|
|
.bDeviceClass = USB_CLASS_HUB
|
|
|
|
},
|
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
|
|
|
|
2015-07-06 22:47:51 +00:00
|
|
|
U_BOOT_USB_DEVICE(usb_generic_hub, hub_id_table);
|
2015-03-25 18:22:10 +00:00
|
|
|
|
|
|
|
#endif
|