From patchwork Fri Nov 13 04:14:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 324259 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp898527ils; Thu, 12 Nov 2020 20:16:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzfa4WtRNUT4UciEwCGzOPilM+CjTFI9Jq/H2svhxWNlqPybW1j7y3xtKMKILtfujUlF1I X-Received: by 2002:a05:6402:185:: with SMTP id r5mr615789edv.263.1605240960072; Thu, 12 Nov 2020 20:16:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605240960; cv=none; d=google.com; s=arc-20160816; b=AYcRwmcu/2W46HIl4t+dUCulAw/bMFvlcqF1UsJgK7aZhJKgaobyR1mckabUJrz7zf y8Gvn1TWTvRrLe/RAxS9kaqFcYy/rY9SwwueOGQV0DC2bj0khxVyi/J3LaEuM7A4dBBY u1eYsH695TTm37dSDv6JnvSBaaprjc3aNgbn/ttAhD5TNLhZFUlF//rSrk/O7/VIt0Cj Nmp1WU27CTZgrC/JTv6moz9oOOr2maULkmslm+4L+MR+8ZNUZFQ3ILqe+pK5NmP5BnyK cXIHVQo5ti2Jt1qsrdT0jW16FWd+RpG4kzJ3k+eNAjVf0KbPh+LjpTYTVKtiewM4Hzs1 6NHw== 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=gg+NeQZLDkliFD0+MH+JwxAli8bu6hM7uUdYZB++vok=; b=dKqSWytDi6k5ru8fvuighoQywnMwgNV/sUMVGGa8kvBLdCHtFu/yGeR3Y/GJVWTZl4 BfpILepsF2OXs5OaeLx1SnLDVqoZtiYUXSgPUhLlr5dsakc6kP6s50XrmmE6h82G0/0n uaE/emjpOs5UBG4y/lYzTHAj8+W0z8ZkK7k2DcdqTMgjrjx/SwVFZ25LHaYejSj1wcxt wsh/N/Cq+Mp5ELxZ35abA+oorrm3GOwT3l9J825WxBLlrpdkNvFKRg8h3Ii4gkkP7QC/ jPW2q59L5Xy4WcYkxlrkblPuyJgmieBX6Hc73O5w7SV2UW35hbgYeebSg07/AP0nIXMr sNSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Vk8E6FXo; 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 ob19si5140453ejb.694.2020.11.12.20.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 20:16:00 -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=Vk8E6FXo; 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 1BA1482535; Fri, 13 Nov 2020 05:15:51 +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="Vk8E6FXo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F98C82543; Fri, 13 Nov 2020 05:15:43 +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-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (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 229E18000F for ; Fri, 13 Nov 2020 05:15:34 +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-pg1-x544.google.com with SMTP id f38so6078188pgm.2 for ; Thu, 12 Nov 2020 20:15:34 -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=gg+NeQZLDkliFD0+MH+JwxAli8bu6hM7uUdYZB++vok=; b=Vk8E6FXob+v39hgEpJK/SmsylzEusyXg1bCMXxQxcVF2ffQwmOYKfDBqWkV7P6DWi1 5oKMtD5r8nkpxQGKKi/niWbtVfotTpwUPlSJtUIGvKsy9FwKRjavTSJOQxIZPIwmyB1Q nI6mwR7tesRP9XxcCyEGGUNXmnbz4DlDbgMXjv4BIcvwJS3s7H35rJqieq3JxL6+AUAk wh3ajCOEP3YIr4PqV5E46PvDUHrJ4fIonm1jJV43mnH3PHKVAd2HFkULkOcOGlxMtCD+ ASTB6ZfWPSphnTopLjeByR/vRQI/SKMiFPCWQCCDh4ZuXFSwuNxsmHW9GT4rfPhm6yOD Skkg== 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=gg+NeQZLDkliFD0+MH+JwxAli8bu6hM7uUdYZB++vok=; b=KQVoOBixu6ZF6SvlIrdAviSp8kRKJOa8gXY/Tce28ss4u8EA1XPn8Q1G6/e3h8efKR PCr5nScjGF30gg9P92oDbJ2K4+AQ+fnOHAtrGmake63sKeZ/noT6TIjPSLkb+t5hWvUH +8VEtbXoTyL1tXvjuHtcno3opvMz05/sPvdcNHd8sZVJ2K/dcaJ+PMwe1zhHFw1l+Rqi MbdvaJUQWll3wY04N1inx382e7S62jVM/dL6Z5zb09JJY9o1PmtPyZ1wHgdTRpeoKfca jr113ilBkMyay8AEHnurETBI4EpWaKmfMbpX9j/8DCXI3xBHujT+Rpj5Wwok9c8MBbWP 5mGQ== X-Gm-Message-State: AOAM530KR5yqHizeGwAPFwjMcWn9kTKWXBq5rmVexz/YjZIWuCeXE558 nrIC+ahoom5Vqjq/DcSXH1zyqw== X-Received: by 2002:a17:90a:7c4d:: with SMTP id e13mr771083pjl.146.1605240932368; Thu, 12 Nov 2020 20:15:32 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 20:15:31 -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 01/18] dfu: rename dfu_tftp_write() to dfu_write_by_name() Date: Fri, 13 Nov 2020 13:14:54 +0900 Message-Id: <20201113041511.48207-2-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 This function is essentially independent from tftp, and will also be utilised in implementing UEFI capsule update in a later commit. So just give it a more generic name. In addition, a new configuration option, CONFIG_DFU_WRITE_ALT, was introduced so that the file will be compiled with different options, particularly one added in a later commit. Signed-off-by: AKASHI Takahiro --- common/update.c | 5 +++-- drivers/dfu/Kconfig | 5 +++++ drivers/dfu/Makefile | 2 +- drivers/dfu/{dfu_tftp.c => dfu_alt.c} | 17 ++++++++++++-- include/dfu.h | 32 +++++++++++++-------------- 5 files changed, 40 insertions(+), 21 deletions(-) rename drivers/dfu/{dfu_tftp.c => dfu_alt.c} (67%) -- 2.28.0 diff --git a/common/update.c b/common/update.c index 36b6b7523d50..39946776d74f 100644 --- a/common/update.c +++ b/common/update.c @@ -324,8 +324,9 @@ got_update_file: } } else if (fit_image_check_type(fit, noffset, IH_TYPE_FIRMWARE)) { - ret = dfu_tftp_write(fit_image_name, update_addr, - update_size, interface, devstring); + ret = dfu_write_by_name(fit_image_name, update_addr, + update_size, interface, + devstring); if (ret) return ret; } diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 0eec00ba734d..10196f390fcd 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -14,8 +14,13 @@ config DFU_OVER_TFTP depends on NET if DFU +config DFU_WRITE_ALT + bool + default n + config DFU_TFTP bool "DFU via TFTP" + select DFU_WRITE_ALT select DFU_OVER_TFTP help This option allows performing update of DFU-managed medium with data diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index 0d7925c083ef..dfbf64da6677 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -9,5 +9,5 @@ obj-$(CONFIG_$(SPL_)DFU_MTD) += dfu_mtd.o obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o -obj-$(CONFIG_$(SPL_)DFU_TFTP) += dfu_tftp.o +obj-$(CONFIG_$(SPL_)DFU_WRITE_ALT) += dfu_alt.o obj-$(CONFIG_$(SPL_)DFU_VIRT) += dfu_virt.o diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_alt.c similarity index 67% rename from drivers/dfu/dfu_tftp.c rename to drivers/dfu/dfu_alt.c index ffae4bb54f80..5b1b13d7170d 100644 --- a/drivers/dfu/dfu_tftp.c +++ b/drivers/dfu/dfu_alt.c @@ -10,8 +10,21 @@ #include #include -int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len, - char *interface, char *devstring) +/** + * dfu_write_by_name() - write data to DFU medium + * @dfu_entity_name: Name of DFU entity to write + * @addr: Address of data buffer to write + * @len: Number of bytes + * @interface: Destination DFU medium (e.g. "mmc") + * @devstring: Instance number of destination DFU medium (e.g. "1") + * + * This function is storing data received on DFU supported medium which + * is specified by @dfu_entity_name. + * + * Return: 0 - on success, error code - otherwise + */ +int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, + unsigned int len, char *interface, char *devstring) { char *s, *sb; int alt_setting_num, ret; diff --git a/include/dfu.h b/include/dfu.h index 84abdc79acd1..a4cd86c0a6c4 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -494,27 +494,27 @@ static inline int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, #endif /** - * dfu_tftp_write() - write TFTP data to DFU medium + * dfu_write_by_name() - write data to DFU medium + * @dfu_entity_name: Name of DFU entity to write + * @addr: Address of data buffer to write + * @len: Number of bytes + * @interface: Destination DFU medium (e.g. "mmc") + * @devstring: Instance number of destination DFU medium (e.g. "1") * - * This function is storing data received via TFTP on DFU supported medium. + * This function is storing data received on DFU supported medium which + * is specified by @dfu_entity_name. * - * @dfu_entity_name: name of DFU entity to write - * @addr: address of data buffer to write - * @len: number of bytes - * @interface: destination DFU medium (e.g. "mmc") - * @devstring: instance number of destination DFU medium (e.g. "1") - * - * Return: 0 on success, otherwise error code + * Return: 0 - on success, error code - otherwise */ -#if CONFIG_IS_ENABLED(DFU_TFTP) -int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len, - char *interface, char *devstring); +#if CONFIG_IS_ENABLED(DFU_WRITE_ALT) +int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, + unsigned int len, char *interface, char *devstring); #else -static inline int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, - unsigned int len, char *interface, - char *devstring) +static inline int dfu_write_by_name(char *dfu_entity_name, unsigned int addr, + unsigned int len, char *interface, + char *devstring) { - puts("TFTP write support for DFU not available!\n"); + puts("write support for DFU not available!\n"); return -ENOSYS; } #endif