dm: treewide: Rename auto_alloc_size members to be shorter

[platform/kernel/u-boot.git] / drivers / usb / host / usb-sandbox.c

diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index c5f9822..e5442e7 100644 (file)
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -1,16 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (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 <log.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)
@@ -40,15 +42,24 @@ static int sandbox_submit_control(struct udevice *bus,
                                      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, &emul);
+       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);
@@ -70,7 +81,7 @@ static int sandbox_submit_bulk(struct udevice *bus, struct usb_device *udev,
 
        /* Just use child of dev as emulator? */
        debug("%s: bus=%s\n", __func__, bus->name);
-       ret = usb_emul_find(bus, pipe, &emul);
+       ret = usb_emul_find(bus, pipe, udev->portnr, &emul);
        usbmon_trace(bus, pipe, NULL, emul);
        if (ret)
                return ret;
@@ -87,8 +98,37 @@ static int sandbox_submit_bulk(struct udevice *bus, struct usb_device *udev,
        return ret;
 }
 
+static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,
+                             unsigned long pipe, void *buffer, int length,
+                             int interval, bool nonblock)
+{
+       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,
+                          nonblock);
+
+       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;
 }
 
@@ -100,6 +140,7 @@ static int sandbox_usb_probe(struct udevice *dev)
 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,
 };
 
@@ -114,4 +155,5 @@ U_BOOT_DRIVER(usb_sandbox) = {
        .of_match = sandbox_usb_ids,
        .probe = sandbox_usb_probe,
        .ops    = &sandbox_usb_ops,
+       .priv_auto      = sizeof(struct sandbox_usb_ctrl),
 };