tools: kwboot: Refactor and fix writing buffer

[J-u-boot.git] / common / usb_hub.c

diff --git a/common/usb_hub.c b/common/usb_hub.c
index b46dfa16ccf1285d5ff9f2f142461f6146dd06ab..ba11a188ca64f0eb45213cbbd724f7754532ff7a 100644 (file)
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Most of this source has been derived from the Linux USB
  * project:
@@ -13,8 +14,6 @@
  *
  * Adapted for U-Boot:
  * (C) Copyright 2001 Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /****************************************************************************
@@ -25,11 +24,15 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <env.h>
 #include <errno.h>
+#include <log.h>
+#include <malloc.h>
 #include <memalign.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
+#include <linux/delay.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
@@ -37,8 +40,6 @@
 #endif
 #include <asm/unaligned.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #include <usb.h>
 
 #define USB_BUFSIZ     512
@@ -67,7 +68,7 @@ static inline bool usb_hub_is_superspeed(struct usb_device *hdev)
        return hdev->descriptor.bDeviceProtocol == 3;
 }
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
 bool usb_hub_is_root_hub(struct udevice *hub)
 {
        if (device_get_uclass_id(hub->parent) != UCLASS_USB_HUB)
@@ -128,7 +129,7 @@ int usb_get_port_status(struct usb_device *dev, int port, void *data)
                        USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
                        data, sizeof(struct usb_port_status), USB_CNTL_TIMEOUT);
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
        if (ret < 0)
                return ret;
 
@@ -143,7 +144,8 @@ int usb_get_port_status(struct usb_device *dev, int port, void *data)
 
        if (!usb_hub_is_root_hub(dev->dev) && usb_hub_is_superspeed(dev)) {
                struct usb_port_status *status = (struct usb_port_status *)data;
-               u16 tmp = (status->wPortStatus) & USB_SS_PORT_STAT_MASK;
+               u16 tmp = le16_to_cpu(status->wPortStatus) &
+                       USB_SS_PORT_STAT_MASK;
 
                if (status->wPortStatus & USB_SS_PORT_STAT_POWER)
                        tmp |= USB_PORT_STAT_POWER;
@@ -151,7 +153,7 @@ int usb_get_port_status(struct usb_device *dev, int port, void *data)
                    USB_SS_PORT_STAT_SPEED_5GBPS)
                        tmp |= USB_PORT_STAT_SUPER_SPEED;
 
-               status->wPortStatus = tmp;
+               status->wPortStatus = cpu_to_le16(tmp);
        }
 #endif
 
@@ -212,7 +214,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
              max(100, (int)pgood_delay) + 1000);
 }
 
-#ifndef CONFIG_DM_USB
+#if !CONFIG_IS_ENABLED(DM_USB)
 static struct usb_hub_device hub_dev[USB_MAX_HUB];
 static int usb_hub_index;
 
@@ -236,26 +238,18 @@ static struct usb_hub_device *usb_hub_allocate(void)
 
 #define MAX_TRIES 5
 
-static inline char *portspeed(int portstatus)
+static inline const char *portspeed(int portstatus)
 {
-       char *speed_str;
-
        switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
        case USB_PORT_STAT_SUPER_SPEED:
-               speed_str = "5 Gb/s";
-               break;
+               return "5 Gb/s";
        case USB_PORT_STAT_HIGH_SPEED:
-               speed_str = "480 Mb/s";
-               break;
+               return "480 Mb/s";
        case USB_PORT_STAT_LOW_SPEED:
-               speed_str = "1.5 Mb/s";
-               break;
+               return "1.5 Mb/s";
        default:
-               speed_str = "12 Mb/s";
-               break;
+               return "12 Mb/s";
        }
-
-       return speed_str;
 }
 
 /**
@@ -276,7 +270,7 @@ static int usb_hub_port_reset(struct usb_device *dev, int port,
        unsigned short portstatus, portchange;
        int delay = HUB_SHORT_RESET_TIME; /* start with short reset delay */
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
        debug("%s: resetting '%s' port %d...\n", __func__, dev->dev->name,
              port + 1);
 #else
@@ -397,7 +391,7 @@ int usb_hub_port_connect_change(struct usb_device *dev, int port)
                break;
        }
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
        struct udevice *child;
 
        ret = usb_scan_device(dev->dev, port + 1, speed, &child);
@@ -607,7 +601,7 @@ static struct usb_hub_device *usb_get_hub_device(struct usb_device *dev)
 {
        struct usb_hub_device *hub;
 
-#ifndef CONFIG_DM_USB
+#if !CONFIG_IS_ENABLED(DM_USB)
        /* "allocate" Hub device */
        hub = usb_hub_allocate();
 #else
@@ -791,7 +785,7 @@ static int usb_hub_configure(struct usb_device *dev)
              (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
              "" : "no ");
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
        /*
         * Update USB host controller's internal representation of this hub
         * after the hub descriptor is fetched.
@@ -933,7 +927,7 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
        return ret;
 }
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
 int usb_hub_scan(struct udevice *hub)
 {
        struct usb_device *udev = dev_get_parent_priv(hub);
@@ -965,9 +959,9 @@ UCLASS_DRIVER(usb_hub) = {
        .post_bind      = dm_scan_fdt_dev,
        .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),
-       .per_device_auto_alloc_size = sizeof(struct usb_hub_device),
+       .per_child_auto = sizeof(struct usb_device),
+       .per_child_plat_auto    = sizeof(struct usb_dev_plat),
+       .per_device_auto        = sizeof(struct usb_hub_device),
 };
 
 static const struct usb_device_id hub_id_table[] = {