From patchwork Thu Oct 29 04:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 319351 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp142409ilc; Wed, 28 Oct 2020 21:51:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzahOKV5JyN90OMY3zJOobOeOTcYqrBveEpGv5vLsCN1O/YdVL+wMLcGgfODyeceHwWzD9J X-Received: by 2002:a17:906:714b:: with SMTP id z11mr2289380ejj.139.1603947111971; Wed, 28 Oct 2020 21:51:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603947111; cv=none; d=google.com; s=arc-20160816; b=eKBBi6Hbhq82J9KOgoSdnTmLYmom4q1pq5mA7CR6OfkdLFGEFPqH3sIV4fbsyzhB9L DxndVw8/i2oG2zuiuSzy83AkdjmmXpBklWJb51NMmE6OYaYUjbpkHks4dC3PnJgMhQgC rtsa+OCTuob6eLikd7qdkOiV+RYF8e/el1H5t12knur9R3SlDk6RT83vED4YvDXvtqdV lxLdy/9npAoG4BQAeMPmf/lYCmfvJyMzmhkIk48aShjDABKpHmd+v2mAif/i6KbgWq4l N7DI05hF0gxUiYo6FRof06s2V505IMX3XBub8jzavctf5KeO6DhVbbibue9NzKT4mQiB p4AA== 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=GOxjoIFrbPU/USWH83c4NCXOSoHA/g+AcKYd/lZMzps=; b=jf2ATN0te/gEB+XVbUdpytvReK6yEy3GKTJ87l0uIjblRI6bRk2s//48LDcYnlbUnr 7hesAdoGqOPZvRtvWB/9pJiuoSmU8b0v9EWVLetaHPtjGkVISRY0FUgxeJZKnbdssSua 0/wUIMDxLxT89JLc5tA1CnU3mnoeGCKSlgB6HUzhQW61+18ZVWt/2nZhg8KcLjM4Owla EYXZcrjm+yzTGbMaeACE3A7qSiobpgyTnNJ4vAl2+9I1j9ME0BnIV2ZUrkZUpQCIRMTC eQRI+RBz9Vh1X71Eqd06lJiHr3dmiz32E1j30JkWBgWMvihQhPGU+CgXB14HyJ41DmpW fqhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="HMkDN/H1"; 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 22si1014249ejv.120.2020.10.28.21.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 21:51:51 -0700 (PDT) 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="HMkDN/H1"; 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 252EA82537; Thu, 29 Oct 2020 05:50:19 +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="HMkDN/H1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1375B82520; Thu, 29 Oct 2020 05:50:16 +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-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) (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 3EB358251C for ; Thu, 29 Oct 2020 05:50:13 +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-x434.google.com with SMTP id a200so1319870pfa.10 for ; Wed, 28 Oct 2020 21:50:13 -0700 (PDT) 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=GOxjoIFrbPU/USWH83c4NCXOSoHA/g+AcKYd/lZMzps=; b=HMkDN/H1kPUkQjmhDhDlSWjiWx6N2BDnlTpzmywop4zkVitUmnaaYjkkyPOp8LAUwS +GveZTKgWWyIK1eqNDW8Rw6YxFEUdwEYPbnmWVWieNRvNKPh/+IgoW3fDgeZp8Of2Ecx jHT+2fnAqmvQce+4PFxpGcWjI72g1c7sH8Y9rl3r+SARx66J9eSmUpm6qvp76wh+BJbQ hH604uQIvVEI+VMHqDpngJtNE6M+g4SueqPosLPt/BuxipHoXbkGWsG30O+0SXDA0x9+ Nw7Mz4FGalYgua/bNZHoW+IE0qhOk0m6/5vjcCzOh9j4ZpTGG7aYuthVoMTzRVyo35T5 dF1Q== 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=GOxjoIFrbPU/USWH83c4NCXOSoHA/g+AcKYd/lZMzps=; b=OBYjaLZzrU2gVk+XMokZth2ph4/eDXDR5QnRk8WgFODbDYhaeskV80uZo1PI8QeeFZ aHXwZKuU83t7jT2VYglw8NKMdq6t8q9qHjZsrU/XVR7ozxiyFvA3zwvpAcJI6ni8Ht0D Fp58eAGXbUdiipHPLNJHTpszk5UjUbw0O6ZJuZKZVQDEMxNjIDzFWl9P650T3qRGseE5 Aofw+Yd0JTaKxl4yZsbd2glYgVvGYRIL49T1N0U11M63gkAwuecdJxDaG4YUpmS6TJrx Devh9w6C2yIvDZlPhFrnXwLcClrFdIXVaTTfCRaQvvCT/Pb2AWZNWqWiqN+ZxIOXmuuI p59w== X-Gm-Message-State: AOAM531DGHJ7GS9S7cQxa4ISxAZHnVH87s3/E4agKfPwlDl/TjarIxWU 0xMlXnwdMm+qK1LUUoDrRijxHA== X-Received: by 2002:a17:90a:19d1:: with SMTP id 17mr2341577pjj.121.1603947011843; Wed, 28 Oct 2020 21:50:11 -0700 (PDT) Received: from localhost.localdomain (p784a66b9.tkyea130.ap.so-net.ne.jp. [120.74.102.185]) by smtp.gmail.com with ESMTPSA id t14sm830689pjy.46.2020.10.28.21.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 21:50:11 -0700 (PDT) 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 v7 12/17] dfu: add dfu_write_by_alt() Date: Thu, 29 Oct 2020 13:47:52 +0900 Message-Id: <20201029044757.183262-13-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201029044757.183262-1-takahiro.akashi@linaro.org> References: <20201029044757.183262-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 a variant of dfu_write_by_name() and takes a DFU alt setting number for dfu configuration. It will be utilised to implement UEFI capsule management protocol for raw image in a later commit. Signed-off-by: AKASHI Takahiro --- drivers/dfu/dfu_alt.c | 47 +++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 26 +++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) -- 2.28.0 Reviewed-by: Tom Rini diff --git a/drivers/dfu/dfu_alt.c b/drivers/dfu/dfu_alt.c index 7528806cd163..d5827812070c 100644 --- a/drivers/dfu/dfu_alt.c +++ b/drivers/dfu/dfu_alt.c @@ -76,3 +76,50 @@ done: return ret; } + +/** + * dfu_write_by_alt() - write data to DFU medium + * @dfu_alt_num: DFU alt setting number + * @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_alt_name. + * + * Return: 0 - on success, error code - otherwise + */ +int dfu_write_by_alt(int dfu_alt_num, void *addr, unsigned int len, + char *interface, char *devstring) +{ + struct dfu_entity *dfu; + int ret; + + debug("%s: alt: %d addr: 0x%p len: %d device: %s:%s\n", __func__, + dfu_alt_num, addr, len, interface, devstring); + + ret = dfu_init_env_entities(interface, devstring); + if (ret) + goto done; + + if (dfu_alt_num < 0) { + pr_err("Invalid alt number: %d", dfu_alt_num); + ret = -ENODEV; + goto done; + } + + dfu = dfu_get_entity(dfu_alt_num); + if (!dfu) { + pr_err("DFU entity for alt: %d not found!", dfu_alt_num); + ret = -ENODEV; + goto done; + } + + ret = dfu_write_from_mem_addr(dfu, (void *)(uintptr_t)addr, len); + +done: + dfu_free_entities(); + + return ret; +} diff --git a/include/dfu.h b/include/dfu.h index eaf4bfc0d5ed..a767adee4107 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -496,6 +496,7 @@ static inline int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, } #endif +#if CONFIG_IS_ENABLED(DFU_WRITE_ALT) /** * dfu_write_by_name() - write data to DFU medium * @dfu_entity_name: Name of DFU entity to write @@ -509,9 +510,24 @@ 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, void *addr, unsigned int len, char *interface, char *devstring); + +/** + * dfu_write_by_alt() - write data to DFU medium + * @dfu_alt_num: DFU alt setting number + * @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_alt_name. + * + * Return: 0 - on success, error code - otherwise + */ +int dfu_write_by_alt(int dfu_alt_num, void *addr, unsigned int len, + char *interface, char *devstring); #else static inline int dfu_write_by_name(char *dfu_entity_name, void *addr, unsigned int len, char *interface, @@ -520,6 +536,14 @@ static inline int dfu_write_by_name(char *dfu_entity_name, void *addr, puts("write support for DFU not available!\n"); return -ENOSYS; } + +static inline int dfu_write_by_alt(int dfu_alt_num, void *addr, + unsigned int len, char *interface, + char *devstring) +{ + puts("write support for DFU not available!\n"); + return -ENOSYS; +} #endif int dfu_add(struct usb_configuration *c);