From patchwork Fri Nov 13 04:14:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 324260 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp898611ils; Thu, 12 Nov 2020 20:16:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2a+W2TIq+6VyuYMY+vesEp2tT/GJO/w6N7KXu6PpAwa/gMXmMDPNJduFQJfZxStOoanxI X-Received: by 2002:a05:6402:2da:: with SMTP id b26mr600538edx.176.1605240970921; Thu, 12 Nov 2020 20:16:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605240970; cv=none; d=google.com; s=arc-20160816; b=JmwvOMlG75aOLMr0DLpR9yoXqglIwmYeTBwJKz2QMZ4CB9w57uVdVPqlVeI0pJ23it Jyt/Po0+cHwV2krput2k6JhoLTBev5gsJuATOs5H6tZUY3AUvEJl/4bWod6y9RTuKZ/B Q4IUXADC/w26kISuzVE/sa2gFPNBmOxxV7tm2fe2zGoI+SBw3uiMQdnEGvCkif39HZTd sIKKLMEVlO/XLGZNTKLW/xL8rzVcj7+cew9HWcP9B0SpVno7CVtPIzRUNZYuOXlLKRUs mMiM+uqmvJxiFkJkuH2xZK3vMhTUObewYKT3ty48bGkjbWI7+ug1IcNw3e/VrAiB0cb8 bMVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=n8Pj9XZPABDumjpzo1x+qe+FsXyFIB9vF6EC2r6C1+I=; b=AerlwNJfhpq5/+R8mjebndMX2QEwcTWOGAMpPFavEWqpSs3dXMw6JpO+xu3bIQ/8EE 9f+VoJNq0qZU35iAPsVAdMnpLGGUxw65nIHXUmjzWQ8kzI3i0IrngGlEQiRoVUPWsWh6 EPN+1OowzceeE7jKkrzfUexZXgU19qRSpnAD6bWWd9fZQuye21mUZAdOX7P1HpTcKdj4 iYjrFogsEW+BGybS0KWoi4BVVaAtD25ugMJlhEukQ/JJNzz2ay6TgedUrOGvleneWXMM hq/qsL6s1FPjWcPxAVvyBdOspDezMogYoH1oegyGIvgeiPCz9fWqhPRM1i2GDgAGijxF RunA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q7EHmWBZ; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id b6si6485753edu.343.2020.11.12.20.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 20:16:10 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q7EHmWBZ; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D47038254F; Fri, 13 Nov 2020 05:15:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="q7EHmWBZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2A818254E; Fri, 13 Nov 2020 05:15:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 354DB82535 for ; Fri, 13 Nov 2020 05:15:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pf1-x441.google.com with SMTP id w6so6561498pfu.1 for ; Thu, 12 Nov 2020 20:15:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n8Pj9XZPABDumjpzo1x+qe+FsXyFIB9vF6EC2r6C1+I=; b=q7EHmWBZq/A3cPigalxa1FMD8NmvR3nzCnQKa647ek8++2mhtYJcJwoSbwIGOFohkU 9qdIDWsoMxy/xhFeSZyrKCowoPehXIeC+kmqSjFXX/NyvIwGylH4Zo/Y5yfgaQ5OLeGR RfrwsUGntMiXw3ygBuwOFxQVLbnEJhfEs/fBG9ZsujXcBOexOKgdDO3kqt+wRiNsx0Mk jPXdtczgiMBOYoIxcMjD7IVrkKeMooASFRjGKgdzbvdeZIygZxV4VmBX4ckNiHJi4fhV ZqfQ0nmhXzmKzRWxHQ9P4QLfX5mjINU9SYclHzsl3JJ5ODwCIz6rDHGHhO4WEq1i8tsv IgTw== 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=n8Pj9XZPABDumjpzo1x+qe+FsXyFIB9vF6EC2r6C1+I=; b=NGu1b5W0QNVT/VXxtIwcR4Fz3+ZhoA+60HzhNyw2W8ysxLzmCzQwKTt40bdN7IvJRa rA8NHSnK1NLX5ok+OTedPwPNl+pkHjSXbxpOZN7agXmn0McUhSSZHSVC753IK2e6XPbH wCvUR1jTO+htqpArRpef8z5N3IuA5fyCDnvRn0EpNKvsJfUc6YMrj3kz6JImXQPh3qK5 z1OucDqVVPgFErsxMIgeFEwAaY6ALoGIulDfc419VQeYRmH8oKgFoQH2xL4gkE+WBNy2 5PECizX/Ucirtum/jgMgJToqRJGvmpOM9XzRqy7U38r/u1DjePI3Wyz6WB11WT6vI98U KRkw== X-Gm-Message-State: AOAM530/QZasXB6Vkg+ek/yiOPHNG08zb7/nx9B6ejqM2WmHGLiOuHco XaybsvjjGx3JKSYNNASaEbwarA== X-Received: by 2002:a63:5608:: with SMTP id k8mr528596pgb.285.1605240935452; Thu, 12 Nov 2020 20:15:35 -0800 (PST) Received: from localhost.localdomain (p784a5642.tkyea130.ap.so-net.ne.jp. [120.74.86.66]) by smtp.gmail.com with ESMTPSA id s10sm4588340pjn.35.2020.11.12.20.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 20:15:34 -0800 (PST) From: AKASHI Takahiro To: lukma@denx.de, trini@konsulko.com, xypron.glpk@gmx.de, agraf@csgraf.de Cc: sughosh.ganu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v8 02/18] dfu: modify an argument type for an address Date: Fri, 13 Nov 2020 13:14:55 +0900 Message-Id: <20201113041511.48207-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201113041511.48207-1-takahiro.akashi@linaro.org> References: <20201113041511.48207-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The range of an addressable pointer can go beyond 'integer'. So change the argument type to a void pointer. Signed-off-by: AKASHI Takahiro Reviewed-by: Heinrich Schuchardt --- common/update.c | 3 ++- drivers/dfu/dfu_alt.c | 6 +++--- include/dfu.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) -- 2.28.0 diff --git a/common/update.c b/common/update.c index 39946776d74f..8dd6ee8b7ddb 100644 --- a/common/update.c +++ b/common/update.c @@ -324,7 +324,8 @@ got_update_file: } } else if (fit_image_check_type(fit, noffset, IH_TYPE_FIRMWARE)) { - ret = dfu_write_by_name(fit_image_name, update_addr, + ret = dfu_write_by_name(fit_image_name, + (void *)update_addr, update_size, interface, devstring); if (ret) diff --git a/drivers/dfu/dfu_alt.c b/drivers/dfu/dfu_alt.c index 5b1b13d7170d..7528806cd163 100644 --- a/drivers/dfu/dfu_alt.c +++ b/drivers/dfu/dfu_alt.c @@ -23,14 +23,14 @@ * * Return: 0 - on success, error code - otherwise */ -int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, +int dfu_write_by_name(char *dfu_entity_name, void *addr, unsigned int len, char *interface, char *devstring) { char *s, *sb; int alt_setting_num, ret; struct dfu_entity *dfu; - debug("%s: name: %s addr: 0x%x len: %d device: %s:%s\n", __func__, + debug("%s: name: %s addr: 0x%p len: %d device: %s:%s\n", __func__, dfu_entity_name, addr, len, interface, devstring); ret = dfu_init_env_entities(interface, devstring); @@ -69,7 +69,7 @@ int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, goto done; } - ret = dfu_write_from_mem_addr(dfu, (void *)(uintptr_t)addr, len); + ret = dfu_write_from_mem_addr(dfu, (void *)addr, len); done: dfu_free_entities(); diff --git a/include/dfu.h b/include/dfu.h index a4cd86c0a6c4..d3d7e07b60d8 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -507,10 +507,10 @@ static inline int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, * Return: 0 - on success, error code - otherwise */ #if CONFIG_IS_ENABLED(DFU_WRITE_ALT) -int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, +int dfu_write_by_name(char *dfu_entity_name, void *addr, unsigned int len, char *interface, char *devstring); #else -static inline int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, +static inline int dfu_write_by_name(char *dfu_entity_name, void *addr, unsigned int len, char *interface, char *devstring) {