Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[u-boot] / drivers / usb / gadget / designware_udc.c

diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index 3c20f3d0033b326b5fa698d1a3f96e9feebf0f77..a25f5019e8a70b482f9f3a6fe35e7340053bef2e 100644 (file)
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -5,23 +5,7 @@
  * (C) Copyright 2009
  * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -30,6 +14,7 @@
 #include <usbdevice.h>
 #include "ep0.h"
 #include <usb/designware_udc.h>
+#include <usb/udc.h>
 #include <asm/arch/hardware.h>
 
 #define UDC_INIT_MDELAY                80      /* Device settle delay */
@@ -202,6 +187,7 @@ static int usbgetpckfromfifo(int epNum, u8 *bufp, u32 len)
        u32 i, nw, nb;
        u32 *wrdp;
        u8 *bytp;
+       u32 tmp[128];
 
        if (readl(&udc_regs_p->dev_stat) & DEV_STAT_RXFIFO_EMPTY)
                return -1;
@@ -209,7 +195,12 @@ static int usbgetpckfromfifo(int epNum, u8 *bufp, u32 len)
        nw = len / sizeof(u32);
        nb = len % sizeof(u32);
 
-       wrdp = (u32 *)bufp;
+       /* use tmp buf if bufp is not word aligned */
+       if ((int)bufp & 0x3)
+               wrdp = (u32 *)&tmp[0];
+       else
+               wrdp = (u32 *)bufp;
+
        for (i = 0; i < nw; i++) {
                writel(readl(fifo_ptr), wrdp);
                wrdp++;
@@ -223,6 +214,10 @@ static int usbgetpckfromfifo(int epNum, u8 *bufp, u32 len)
        }
        readl(&outep_regs_p[epNum].write_done);
 
+       /* copy back tmp buffer to bufp if bufp is not word aligned */
+       if ((int)bufp & 0x3)
+               memcpy(bufp, tmp, len);
+
        return 0;
 }
 
@@ -274,8 +269,8 @@ static void dw_write_noniso_tx_fifo(struct usb_endpoint_instance
                UDCDBGA("urb->buffer %p, buffer_length %d, actual_length %d",
                        urb->buffer, urb->buffer_length, urb->actual_length);
 
-               last = MIN(urb->actual_length - endpoint->sent,
-                          endpoint->tx_packetSize);
+               last = min_t(u32, urb->actual_length - endpoint->sent,
+                            endpoint->tx_packetSize);
 
                if (last) {
                        u8 *cp = urb->buffer + endpoint->sent;
@@ -290,7 +285,7 @@ static void dw_write_noniso_tx_fifo(struct usb_endpoint_instance
 
                        align = ((ulong)cp % sizeof(int));
                        if (align)
-                               last = MIN(last, sizeof(int) - align);
+                               last = min(last, sizeof(int) - align);
 
                        UDCDBGA("endpoint->sent %d, tx_packetSize %d, last %d",
                                endpoint->sent, endpoint->tx_packetSize, last);
@@ -566,8 +561,13 @@ int udc_init(void)
        writel(~0x0, &udc_regs_p->dev_int_mask);
        writel(~0x0, &udc_regs_p->endp_int_mask);
 
+#ifndef CONFIG_USBD_HS
        writel(DEV_CONF_FS_SPEED | DEV_CONF_REMWAKEUP | DEV_CONF_SELFPOW |
               DEV_CONF_PHYINT_16, &udc_regs_p->dev_conf);
+#else
+       writel(DEV_CONF_HS_SPEED | DEV_CONF_REMWAKEUP | DEV_CONF_SELFPOW |
+                       DEV_CONF_PHYINT_16, &udc_regs_p->dev_conf);
+#endif
 
        writel(DEV_CNTL_SOFTDISCONNECT, &udc_regs_p->dev_cntl);
 
@@ -577,6 +577,11 @@ int udc_init(void)
        return 0;
 }
 
+int is_usbd_high_speed(void)
+{
+       return (readl(&udc_regs_p->dev_stat) & DEV_STAT_ENUM) ? 0 : 1;
+}
+
 /*
  * udc_setup_ep - setup endpoint
  * Associate a physical endpoint with endpoint_instance
@@ -596,7 +601,7 @@ void udc_setup_ep(struct usb_device_instance *device,
        if ((ep != 0) && (udc_device->device_state < STATE_ADDRESSED))
                return;
 
-       tt = getenv("usbtty");
+       tt = env_get("usbtty");
        if (!tt)
                tt = "generic";
 
@@ -792,7 +797,7 @@ void udc_startup_events(struct usb_device_instance *device)
 /*
  * Plug detection interrupt handling
  */
-void dw_udc_plug_irq(void)
+static void dw_udc_plug_irq(void)
 {
        if (readl(&plug_regs_p->plug_state) & PLUG_STATUS_ATTACHED) {
                /*
@@ -816,7 +821,7 @@ void dw_udc_plug_irq(void)
 /*
  * Device interrupt handling
  */
-void dw_udc_dev_irq(void)
+static void dw_udc_dev_irq(void)
 {
        if (readl(&udc_regs_p->dev_int) & DEV_INT_USBRESET) {
                writel(~0x0, &udc_regs_p->endp_int_mask);
@@ -886,7 +891,7 @@ void dw_udc_dev_irq(void)
 /*
  * Endpoint interrupt handling
  */
-void dw_udc_endpoint_irq(void)
+static void dw_udc_endpoint_irq(void)
 {
        while (readl(&udc_regs_p->endp_int) & ENDP0_INT_CTRLOUT) {