mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-03 11:23:22 +09:00
![Bin Meng](/assets/img/avatar_default.png)
Current emulator select logic in usb_emul_find_devnum() is to test the USB address. The USB address of the device being enumerated is initialized to zero at the beginning of the enumeration process in usb_setup_device(). At this point, the saved USB address in the platform data has not been assigned to any valid USB address either. This means: the logic will select an emulator device according to its sequence of declaring order in the device tree. Take test.dts for example, flash-stick@0 will be selected before flash-stick@1. But unfortunately such logic is wrong. In fact USB devices show up in a random order during the enumeration which means usb_emul_find_devnum() may be called on port 3 for keyb@3 before on port 0 for flash-stick@0. To fix this, we introduce a new emulator uclass specific platdata to store the USB device's port number on its parent hub, and update the logic to test the port number instead. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
161 lines
3.8 KiB
C
161 lines
3.8 KiB
C
/*
|
|
* (C) Copyright 2015 Google, Inc
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <usb.h>
|
|
#include <dm/root.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
struct sandbox_usb_ctrl {
|
|
int rootdev;
|
|
};
|
|
|
|
static void usbmon_trace(struct udevice *bus, ulong pipe,
|
|
struct devrequest *setup, struct udevice *emul)
|
|
{
|
|
static const char types[] = "ZICB";
|
|
int type;
|
|
|
|
type = (pipe & USB_PIPE_TYPE_MASK) >> USB_PIPE_TYPE_SHIFT;
|
|
debug("0 0 S %c%c:%d:%03ld:%ld", types[type],
|
|
pipe & USB_DIR_IN ? 'i' : 'o',
|
|
bus->seq,
|
|
(pipe & USB_PIPE_DEV_MASK) >> USB_PIPE_DEV_SHIFT,
|
|
(pipe & USB_PIPE_EP_MASK) >> USB_PIPE_EP_SHIFT);
|
|
if (setup) {
|
|
debug(" s %02x %02x %04x %04x %04x", setup->requesttype,
|
|
setup->request, setup->value, setup->index,
|
|
setup->length);
|
|
}
|
|
debug(" %s", emul ? emul->name : "(no emul found)");
|
|
|
|
debug("\n");
|
|
}
|
|
|
|
static int sandbox_submit_control(struct udevice *bus,
|
|
struct usb_device *udev,
|
|
unsigned long pipe,
|
|
void *buffer, int length,
|
|
struct devrequest *setup)
|
|
{
|
|
struct sandbox_usb_ctrl *ctrl = dev_get_priv(bus);
|
|
struct udevice *emul;
|
|
int ret;
|
|
|
|
/* Just use child of dev as emulator? */
|
|
debug("%s: bus=%s\n", __func__, bus->name);
|
|
ret = usb_emul_find(bus, pipe, udev->portnr, &emul);
|
|
usbmon_trace(bus, pipe, setup, emul);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (usb_pipedevice(pipe) == ctrl->rootdev) {
|
|
if (setup->request == USB_REQ_SET_ADDRESS) {
|
|
debug("%s: Set root hub's USB address\n", __func__);
|
|
ctrl->rootdev = le16_to_cpu(setup->value);
|
|
}
|
|
}
|
|
|
|
ret = usb_emul_control(emul, udev, pipe, buffer, length, setup);
|
|
if (ret < 0) {
|
|
debug("ret=%d\n", ret);
|
|
udev->status = ret;
|
|
udev->act_len = 0;
|
|
} else {
|
|
udev->status = 0;
|
|
udev->act_len = ret;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int sandbox_submit_bulk(struct udevice *bus, struct usb_device *udev,
|
|
unsigned long pipe, void *buffer, int length)
|
|
{
|
|
struct udevice *emul;
|
|
int ret;
|
|
|
|
/* Just use child of dev as emulator? */
|
|
debug("%s: bus=%s\n", __func__, bus->name);
|
|
ret = usb_emul_find(bus, pipe, udev->portnr, &emul);
|
|
usbmon_trace(bus, pipe, NULL, emul);
|
|
if (ret)
|
|
return ret;
|
|
ret = usb_emul_bulk(emul, udev, pipe, buffer, length);
|
|
if (ret < 0) {
|
|
debug("ret=%d\n", ret);
|
|
udev->status = ret;
|
|
udev->act_len = 0;
|
|
} else {
|
|
udev->status = 0;
|
|
udev->act_len = ret;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,
|
|
unsigned long pipe, void *buffer, int length,
|
|
int interval)
|
|
{
|
|
struct udevice *emul;
|
|
int ret;
|
|
|
|
/* Just use child of dev as emulator? */
|
|
debug("%s: bus=%s\n", __func__, bus->name);
|
|
ret = usb_emul_find(bus, pipe, udev->portnr, &emul);
|
|
usbmon_trace(bus, pipe, NULL, emul);
|
|
if (ret)
|
|
return ret;
|
|
ret = usb_emul_int(emul, udev, pipe, buffer, length, interval);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int sandbox_alloc_device(struct udevice *dev, struct usb_device *udev)
|
|
{
|
|
struct sandbox_usb_ctrl *ctrl = dev_get_priv(dev);
|
|
|
|
/*
|
|
* Root hub will be the first device to be initailized.
|
|
* If this device is a root hub, initialize its device speed
|
|
* to high speed as we are a USB 2.0 controller.
|
|
*/
|
|
if (ctrl->rootdev == 0)
|
|
udev->speed = USB_SPEED_HIGH;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sandbox_usb_probe(struct udevice *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static const struct dm_usb_ops sandbox_usb_ops = {
|
|
.control = sandbox_submit_control,
|
|
.bulk = sandbox_submit_bulk,
|
|
.interrupt = sandbox_submit_int,
|
|
.alloc_device = sandbox_alloc_device,
|
|
};
|
|
|
|
static const struct udevice_id sandbox_usb_ids[] = {
|
|
{ .compatible = "sandbox,usb" },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(usb_sandbox) = {
|
|
.name = "usb_sandbox",
|
|
.id = UCLASS_USB,
|
|
.of_match = sandbox_usb_ids,
|
|
.probe = sandbox_usb_probe,
|
|
.ops = &sandbox_usb_ops,
|
|
.priv_auto_alloc_size = sizeof(struct sandbox_usb_ctrl),
|
|
};
|