From patchwork Thu Feb 15 06:08:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 873661 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sQw0lYKR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zhm7W5LTGz9sRV for ; Thu, 15 Feb 2018 17:09:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C739EC2202D; Thu, 15 Feb 2018 06:09:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 50EFEC21E18; Thu, 15 Feb 2018 06:09:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5D727C21E18; Thu, 15 Feb 2018 06:09:00 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id F3E55C21C3F for ; Thu, 15 Feb 2018 06:08:59 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id 34so2143559wre.13 for ; Wed, 14 Feb 2018 22:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/gCJUfb9kOxccdnToNNwWTUUa9iigldgutXCq6IsOHw=; b=sQw0lYKR/z4QTEk9gptEGLe4FPJVV/H9FGgtIotVp2+eIsuOCG0epp4jjo1IJf/bUS YN9mg22Xn0rOK9lLQQRNeZLo29gYwgKFqWTGhb+fE03Dd6+r4e3z7qKK0dp5JfuZ7Hfm 9JLdq3iDaeFiki0C5waIjtxJ3b0LbxpmmG94ExWE2YyuvgxxSDWPr135qovxtmqYN8g8 BeOi4k1Fniq0DPFaqPMkicy549Ppe762Xxe1GmpWIuYpmqMzlXyxToZT/9EoOHq3FTu8 3D+9jCo9/PwBD5r5MJ8Abjs7SUml061KgxJRop1fEwn/B/aBWsN82XMIYg9/o668sUYH u10g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/gCJUfb9kOxccdnToNNwWTUUa9iigldgutXCq6IsOHw=; b=B2/neBVYQnts/IKgXkdkiEeWd6dxV1DNNOpzmd8wDSH4qep3LZ+S/wSGQRJQqedAbl 0d2+DX/hIfDQeBqfJILe/42xQUuKooIV7druCc0UVyccuA03wpCjvHpqYT5baywhB14F QZyA+OCQt0Z0lzjF/nqifi48jVdbpznpvyNQziNYA9qUusI32eIgBVC9eQeX+zeMaB6b CjKolCL15feMRBajgPyCiuYVQL0YlnqGOfnQvsfG0H1pIFgMZXViarvVwimPrnTbS6do Kp6xqa7ORqKVZ6Y9niE9yRXPqvh/n4UCulO3KU7aZgkwM1lRRoLIj5xBcgGHv/dip1CI 26EQ== X-Gm-Message-State: APf1xPBNoHP/fA2VjzoeL9Ky8snr3/xWwASCr4MVas7nhFUzdu/3C4Lg CTYAxRixviNdSc+UYtQcYYM8LA== X-Google-Smtp-Source: AH8x226HqZhDkMOuaqls8PAOV5pWGQeJMk7vje7OiTEng7bzypASyTjpFqiYIvaKOljF1wVu8hsXDA== X-Received: by 10.223.198.69 with SMTP id u5mr1438201wrg.69.1518674939162; Wed, 14 Feb 2018 22:08:59 -0800 (PST) Received: from mamamia.internal (a89-182-101-87.net-htp.de. [89.182.101.87]) by smtp.gmail.com with ESMTPSA id h13sm20858445wrc.89.2018.02.14.22.08.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 22:08:58 -0800 (PST) From: Andre Heider To: u-boot@lists.denx.de Date: Thu, 15 Feb 2018 07:08:55 +0100 Message-Id: <20180215060856.6740-1-a.heider@gmail.com> X-Mailer: git-send-email 2.16.1 Cc: Marek Vasut Subject: [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Cosmetic change. Signed-off-by: Andre Heider Reviewed-by: Lukasz Majewski Acked-by: Stefan Agner --- cmd/usb_gadget_sdp.c | 4 ++-- common/spl/spl_sdp.c | 4 ++-- drivers/usb/gadget/f_sdp.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c index ae4d73c125..97d00ec545 100644 --- a/cmd/usb_gadget_sdp.c +++ b/cmd/usb_gadget_sdp.c @@ -28,13 +28,13 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ret = sdp_init(controller_index); if (ret) { - pr_err("SDP init failed: %d", ret); + pr_err("SDP init failed: %d\n", ret); goto exit; } /* This command typically does not return but jumps to an image */ sdp_handle(controller_index); - pr_err("SDP ended"); + pr_err("SDP ended\n"); exit: g_dnl_unregister(); diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 333d518f4d..0c4603a3db 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, ret = sdp_init(controller_index); if (ret) { - pr_err("SDP init failed: %d", ret); + pr_err("SDP init failed: %d\n", ret); return -ENODEV; } /* This command typically does not return but jumps to an image */ sdp_handle(controller_index); - pr_err("SDP ended"); + pr_err("SDP ended\n"); return -EINVAL; } diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index dd7b9cddb1..6da0530095 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -238,12 +238,12 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req) u8 report = data[0]; if (status != 0) { - pr_err("Status: %d", status); + pr_err("Status: %d\n", status); return; } if (report != 1) { - pr_err("Unexpected report %d", report); + pr_err("Unexpected report %d\n", report); return; } @@ -323,12 +323,12 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req) int datalen = req->length - 1; if (status != 0) { - pr_err("Status: %d", status); + pr_err("Status: %d\n", status); return; } if (report != 2) { - pr_err("Unexpected report %d", report); + pr_err("Unexpected report %d\n", report); return; } @@ -361,7 +361,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req) sdp->state = SDP_STATE_TX_SEC_CONF; break; default: - pr_err("Invalid state: %d", sdp->state); + pr_err("Invalid state: %d\n", sdp->state); } } @@ -371,7 +371,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req) int status = req->status; if (status != 0) { - pr_err("Status: %d", status); + pr_err("Status: %d\n", status); return; } @@ -394,7 +394,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req) sdp->state = SDP_STATE_IDLE; break; default: - pr_err("Wrong State: %d", sdp->state); + pr_err("Wrong State: %d\n", sdp->state); sdp->state = SDP_STATE_IDLE; break; } From patchwork Thu Feb 15 06:08:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 873662 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aojasJQ9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zhm8N3hhgz9sRV for ; Thu, 15 Feb 2018 17:09:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 262CEC22087; Thu, 15 Feb 2018 06:09:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 151DEC22050; Thu, 15 Feb 2018 06:09:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F6DEC21F42; Thu, 15 Feb 2018 06:09:01 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id EF887C21C3F for ; Thu, 15 Feb 2018 06:09:00 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id u15so2174504wrg.3 for ; Wed, 14 Feb 2018 22:09:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vKBytHX6Lg4w8JO97QyjXDlz3AvmCSVebly4OkSqq2s=; b=aojasJQ9/XRdtEHjTFwnNAkb0o7Ihf/C0HQM7EjDKlzibN4HGcoUDF2F1+dCalFuT3 EHRgtiKYoD6kCXKEdTyWwp5GanIxa/IFLSQpIoqUwLQq9MQ+Gm/oaEFffSnhgN6jbaWJ aJLiECF2VUCfkzICjGI+FQAWmLibSw2z1y7MibhIC59/qNMOFU7aiuDW1Dt4kwA9UqgL usw0KwR8owTDDgJRSitPB+qL7t0Fx05DxBPxJj8skr+R+VLWSMi8ObYv4Y/uHQChaEqi jv2UJN7L5NEmCxXU0hmFbhoZ7fwYswECqFUSXHB7ijNRbnuuVcQgPvdf907Awh+fOQKg 9gkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vKBytHX6Lg4w8JO97QyjXDlz3AvmCSVebly4OkSqq2s=; b=gTiUoHmEEtrDdq5CETP32DA/t8ePfS6kf60QK6GB0OG5Tyso20UmCh9fhUNdkuRZiy 9m/GCZAC12W+JfUJITrfEq0iG2MKGGKB41LV4h10ktdxTM43oi13WlfyefPsuQ5LQiO5 yXBUXLiAMB0U0BIWTT9sg2GidQmbx3YC3cnpzeDDuNUXL3/GtOrf8P+VA5zn1CD5YFC0 2iFhe9EoOf9E2+OsIEcZocq7FZgLaYQRoJ4iGy/n7Q4SPcX5ZjiHJekTy9Bj07mOFeq7 wjVKdxNpTPticbBC1O7/0geL+svbTufP7jaISu9cnFtSN9NI59+IDdd8jKvNbHZ8SW/X PH2Q== X-Gm-Message-State: APf1xPAvHQNSYAy0qYhKr3nUOaWYvldGWfq7KytgdD77QEDIuUPKXc/G q3jofIz+NVv5J/1bbgnGiVS2BA== X-Google-Smtp-Source: AH8x225ldfV+GG5tWjgcCvwFH5EOBGsgQVCGlUQnU0rlNebd/eefYi6GaLnGyP1PKOAsYmZiKOpo/A== X-Received: by 10.223.136.57 with SMTP id d54mr1226947wrd.163.1518674940329; Wed, 14 Feb 2018 22:09:00 -0800 (PST) Received: from mamamia.internal (a89-182-101-87.net-htp.de. [89.182.101.87]) by smtp.gmail.com with ESMTPSA id h13sm20858445wrc.89.2018.02.14.22.08.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 22:08:59 -0800 (PST) From: Andre Heider To: u-boot@lists.denx.de Date: Thu, 15 Feb 2018 07:08:56 +0100 Message-Id: <20180215060856.6740-2-a.heider@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215060856.6740-1-a.heider@gmail.com> References: <20180215060856.6740-1-a.heider@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The SDP protocol contains multiple 32bit pointers. Add a helper function to get a valid pointer from these values and use it. Signed-off-by: Andre Heider --- drivers/usb/gadget/f_sdp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 6da0530095..43c5cfbb77 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -230,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; @@ -344,7 +349,7 @@ 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; } @@ -622,7 +627,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 */ @@ -665,7 +670,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; @@ -676,7 +681,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) {