common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled

[oweals/u-boot.git] / drivers / usb / gadget / f_sdp.c

diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 0fae66beabab06b1d884a9543bd096509119a286..ae97ab2b497399ae8840fb12327b7f61c6581736 100644 (file)
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_sdp.c -- USB HID Serial Download Protocol
  *
@@ -13,8 +14,6 @@
  * SKIP_DCD_HEADER are only stubs.
  *
  * Parts of the implementation are based on f_dfu and f_thor.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <errno.h>
@@ -32,6 +31,7 @@
 #include <spl.h>
 #include <image.h>
 #include <imximage.h>
+#include <watchdog.h>
 
 #define HID_REPORT_ID_MASK     0x000000ff
 
@@ -100,6 +100,7 @@ struct f_sdp {
        enum sdp_state                  state;
        enum sdp_state                  next_state;
        u32                             dnl_address;
+       u32                             dnl_bytes;
        u32                             dnl_bytes_remaining;
        u32                             jmp_address;
        bool                            always_send_status;
@@ -229,6 +230,11 @@ static struct usb_gadget_strings *sdp_generic_strings[] = {
        NULL,
 };
 
+static inline void *sdp_ptr(u32 val)
+{
+       return (void *)(uintptr_t)val;
+}
+
 static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
 {
        struct f_sdp *sdp = req->context;
@@ -237,12 +243,12 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
        u8 report = data[0];
 
        if (status != 0) {
-               error("Status: %d", status);
+               pr_err("Status: %d\n", status);
                return;
        }
 
        if (report != 1) {
-               error("Unexpected report %d", report);
+               pr_err("Unexpected report %d\n", report);
                return;
        }
 
@@ -271,6 +277,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
                sdp->state = SDP_STATE_RX_FILE_DATA;
                sdp->dnl_address = be32_to_cpu(cmd->addr);
                sdp->dnl_bytes_remaining = be32_to_cpu(cmd->cnt);
+               sdp->dnl_bytes = sdp->dnl_bytes_remaining;
                sdp->next_state = SDP_STATE_IDLE;
 
                printf("Downloading file of size %d to 0x%08x... ",
@@ -309,7 +316,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
                sdp->next_state = SDP_STATE_IDLE;
                break;
        default:
-               error("Unknown command: %04x\n", be16_to_cpu(cmd->cmd));
+               pr_err("Unknown command: %04x\n", be16_to_cpu(cmd->cmd));
        }
 }
 
@@ -322,12 +329,12 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
        int datalen = req->length - 1;
 
        if (status != 0) {
-               error("Status: %d", status);
+               pr_err("Status: %d\n", status);
                return;
        }
 
        if (report != 2) {
-               error("Unexpected report %d", report);
+               pr_err("Unexpected report %d\n", report);
                return;
        }
 
@@ -343,13 +350,16 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
        }
 
        if (sdp->state == SDP_STATE_RX_FILE_DATA) {
-               memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
+               memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1, datalen);
                sdp->dnl_address += datalen;
        }
 
        if (sdp->dnl_bytes_remaining)
                return;
 
+#ifndef CONFIG_SPL_BUILD
+       env_set_hex("filesize", sdp->dnl_bytes);
+#endif
        printf("done\n");
 
        switch (sdp->state) {
@@ -360,7 +370,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
                sdp->state = SDP_STATE_TX_SEC_CONF;
                break;
        default:
-               error("Invalid state: %d", sdp->state);
+               pr_err("Invalid state: %d\n", sdp->state);
        }
 }
 
@@ -370,7 +380,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)
        int status = req->status;
 
        if (status != 0) {
-               error("Status: %d", status);
+               pr_err("Status: %d\n", status);
                return;
        }
 
@@ -393,7 +403,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)
                        sdp->state = SDP_STATE_IDLE;
                break;
        default:
-               error("Wrong State: %d", sdp->state);
+               pr_err("Wrong State: %d\n", sdp->state);
                sdp->state = SDP_STATE_IDLE;
                break;
        }
@@ -602,6 +612,8 @@ int sdp_init(int controller_index)
                        puts("\rCTRL+C - Operation aborted.\n");
                        return 1;
                }
+
+               WATCHDOG_RESET();
                usb_gadget_handle_interrupts(controller_index);
        }
 
@@ -619,7 +631,7 @@ static u32 sdp_jump_imxheader(void *address)
        }
 
        printf("Jumping to 0x%08x\n", headerv2->entry);
-       entry = (void *)headerv2->entry;
+       entry = sdp_ptr(headerv2->entry);
        entry();
 
        /* The image probably never returns hence we won't reach that point */
@@ -662,7 +674,7 @@ static void sdp_handle_in_ep(void)
                if (datalen > 64)
                        datalen = 64;
 
-               memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
+               memcpy(&data[1], sdp_ptr(sdp_func->dnl_address), datalen);
                sdp_func->in_req->length = 65;
 
                sdp_func->dnl_bytes_remaining -= datalen;
@@ -673,7 +685,7 @@ static void sdp_handle_in_ep(void)
                break;
        case SDP_STATE_JUMP:
                printf("Jumping to header at 0x%08x\n", sdp_func->jmp_address);
-               status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
+               status = sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
 
                /* If imx header fails, try some U-Boot specific headers */
                if (status) {
@@ -712,6 +724,7 @@ void sdp_handle(int controller_index)
                        return;
                }
 
+               WATCHDOG_RESET();
                usb_gadget_handle_interrupts(controller_index);
 
                sdp_handle_in_ep();