From patchwork Thu Feb 15 09:17:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 873713 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="rCqKY3D9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zhrLG13qMz9t2l for ; Thu, 15 Feb 2018 20:18:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BBFABC220F0; Thu, 15 Feb 2018 09:18:37 +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 084C2C21E74; Thu, 15 Feb 2018 09:18:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 17E03C22120; Thu, 15 Feb 2018 09:18:31 +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 97A21C22119 for ; Thu, 15 Feb 2018 09:17:32 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id k32so2581465wrk.4 for ; Thu, 15 Feb 2018 01:17:32 -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 :mime-version:content-transfer-encoding; bh=KfsXAhrLbngB9k+Io6Wg0U45hcTzTcae/wrPdIK0ruQ=; b=rCqKY3D9giIDmDF0OvflxhhHfLKRTSsjGVS4MVWZcLd3BvfzFPeSVFLvwcwydvEnTF UYG8C9wXjfVAUXUWkjghak5JK6Sg3VN9Q0p1AFuIJGjRMz2+DwaxgWkkbb/kIA4+7RdO vg0a3RCVBK8ZtZD31Nss6h7DHlcAcsFp3f2kFRb3AtCWxQqf3OSNqj1+IPbWMf1GfcHo wvhCnoGtc3t2BoeNF4lB8iLyN8Zd4jkACTfliMmVeC7ZvAg+sjdyShzicShOniwikEli PjmvythEtQazTlRYMKDk2lmDPbEpoYggFrpi8xF5uARO6D1hUXyOlm919w3eRMk/LkgK 64hQ== 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:mime-version:content-transfer-encoding; bh=KfsXAhrLbngB9k+Io6Wg0U45hcTzTcae/wrPdIK0ruQ=; b=ZHRkRMwGkIcAJI3dn4kOfE8fvPL8KHGH2qB8dh8IirFwK9oxPUZTUeTPeTRlVGC4Ty tIZu/BbNl0uRAh2ZhBccCtXFMi2HOUnpLVHhoM0vd17Ge1BiLuA0EmUJUOsHwLc1q6/Z R8xKmw+B+3KzW+tQvdXLVQjdgW4xeCp1B9b9faAPhX1QBM34cbaz3UROK1ug/IKqilPB 1MqZyqNYUtZ1aaSL1doX+BKnZLSLfdC0ov2T2gJ8/jmW/+TBrYswAR/dMT3oY4BvCmI0 rZsCjqGIowknVof0hLOf4lz43kVCMeNz35VCj2u5agtliD5aUm7MjDaREaBldVNAVkHn wbOQ== X-Gm-Message-State: APf1xPACZlx6KnOPoEr7giNFAwvZdtRuF5rKXOtY0N60G5f2dmTuNESz zrKaST9hyuQfZkhsPcVsgkicJg== X-Google-Smtp-Source: AH8x227iM96wQQMbt8yfNNiNU4KG2lQ2y+NqrpxQ6uHH2O9C1NGbiBwdqrHYmETvc+YJpFut3FbKHw== X-Received: by 10.223.136.57 with SMTP id d54mr1666669wrd.163.1518686251927; Thu, 15 Feb 2018 01:17:31 -0800 (PST) Received: from mamamia.internal (a89-182-101-87.net-htp.de. [89.182.101.87]) by smtp.gmail.com with ESMTPSA id x19sm14010655wrd.7.2018.02.15.01.17.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 01:17:31 -0800 (PST) From: Andre Heider To: u-boot@lists.denx.de Date: Thu, 15 Feb 2018 10:17:29 +0100 Message-Id: <20180215091729.26499-1-a.heider@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215060856.6740-2-a.heider@gmail.com> References: <20180215060856.6740-2-a.heider@gmail.com> MIME-Version: 1.0 Cc: Marek Vasut Subject: [U-Boot] [PATCH v2 2/2] usb: gadget: sdp: fix pointer cast warnings 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: , 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. This fixes the following warnings: drivers/usb/gadget/f_sdp.c: In function ‘sdp_rx_data_complete’: drivers/usb/gadget/f_sdp.c:347:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy((void *)sdp->dnl_address, req->buf + 1, datalen); ^ drivers/usb/gadget/f_sdp.c: In function ‘sdp_jump_imxheader’: drivers/usb/gadget/f_sdp.c:625:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] entry = (void *)headerv2->entry; ^ drivers/usb/gadget/f_sdp.c: In function ‘sdp_handle_in_ep’: drivers/usb/gadget/f_sdp.c:668:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy(&data[1], (void *)sdp_func->dnl_address, datalen); ^ drivers/usb/gadget/f_sdp.c:679:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] status = sdp_jump_imxheader((void *)sdp_func->jmp_address); ^ 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) {