From patchwork Wed Dec 30 13:57:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosh Ganu X-Patchwork-Id: 355259 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp11350731jai; Wed, 30 Dec 2020 05:58:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwt0ejwlbz01OEbfFkeknyKp2APmqh4Mb9zUZFHR0n4HJb3VxBMJWRF+P2FPVep/PikZEpw X-Received: by 2002:a17:906:6d14:: with SMTP id m20mr48871245ejr.3.1609336723775; Wed, 30 Dec 2020 05:58:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609336723; cv=none; d=google.com; s=arc-20160816; b=N2Utj1c/HxbWFHJQKFt0g6KhoYFj2NXh2KN8/YlOymGA2KueY2mY6vFMDxFUdUCdwC ypJ8plkHm9brxYPMIKIG1Wjv9VvETC7OZJJlNUms8mMdJc1W3os8MWh8vvLf8VeS8oxv rmBgl7InEtOEZ0QfjXAzRTMO2Olr6wiZrcdVRgTlP4XRwDh7t07tt24WU38ejzUfV2nf qIcEepLKRANrPMR6+ZBUUqimoke5h9cZxUJ/p2F8QTpojuCZGIZCZvUPmnCmbxWbQnOK uQn2u5Kaw2F3nDAI8QQBHAKhWIByZZvpaqIwpAl84z17CB8NqAWx3+dng0HZfPr4vRqB 2ANg== 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:references:in-reply-to :message-id:date:subject:cc:to:from; bh=qWs+9fa+Zm47+cNUWp2b7DeUaZpTC7oSY/HmAQn5/X0=; b=EXjI12inEW7N4jYDltZtjKpOGM9SGOnUliQTF7P13bodxZec30+uBFZ+axr12vj+WC FIO9JpNq7qEi/JRWGfX1w2fRfvtIo1OiJMVEqc1e3i+Y9dBFkwEEY9OeGrqi93hwx2YA +3d6rlECrTGDQQpsUhO81qAabZakBvsat2hX7/zMYjAFO5933BNIOXJ2bozzYg1hyP8O bIZtuRS7PmACr3KjsXv3uJkbGsk3QLXjpu9tp4Owe/2+iQ/eDj5bI4pHQdpT4kDWeshg C1WspvKumU0b7hsObljrK3Tc1DeYdgML3SZIpUJE9GuMaPy65bT3idan7oGGCICsSSiJ iQiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id f13si23224639edw.454.2020.12.30.05.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 05:58:43 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (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 C095782626; Wed, 30 Dec 2020 14:58:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0529E825F4; Wed, 30 Dec 2020 14:57:53 +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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id AE3B9825AE for ; Wed, 30 Dec 2020 14:57:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sughosh.ganu@linaro.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F3A9E143D; Wed, 30 Dec 2020 05:57:46 -0800 (PST) Received: from a076522.blr.arm.com (a076522.blr.arm.com [10.162.16.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5A7043F6CF; Wed, 30 Dec 2020 05:57:44 -0800 (PST) From: Sughosh Ganu To: u-boot@lists.denx.de Cc: Takahiro Akashi , Heinrich Schuchardt , Alexander Graf , Lukasz Majewski , Tuomas Tynkkynen , Tom Rini , Ilias Apalodimas , Sughosh Ganu Subject: [PATCH v4 05/14] qemu: common: Set dfu_alt_info variable for the platform Date: Wed, 30 Dec 2020 19:27:03 +0530 Message-Id: <20201230135712.5289-6-sughosh.ganu@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201230135712.5289-1-sughosh.ganu@linaro.org> References: <20201230135712.5289-1-sughosh.ganu@linaro.org> 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 dfu framework uses the dfu_alt_info environment variable to get information that is needed for performing the firmware update. Add logic to set the dfu_alt_info for the qemu arm64 platform to reflect the two mtd partitions created for the u-boot env and the firmware image. This can be subsequently extended for other qemu architectures which need this variable set. Signed-off-by: Sughosh Ganu --- Changes since V3: * Move the selection of SET_DFU_ALT_INFO config to the board's Kconfig from lib/efi_loader/Kconfig, using imply. board/emulation/common/Makefile | 1 + board/emulation/common/qemu_dfu.c | 68 +++++++++++++++++++++++++++++++ board/emulation/qemu-arm/Kconfig | 1 + 3 files changed, 70 insertions(+) create mode 100644 board/emulation/common/qemu_dfu.c -- 2.17.1 diff --git a/board/emulation/common/Makefile b/board/emulation/common/Makefile index de5c8d0c2a..c5b452e7e3 100644 --- a/board/emulation/common/Makefile +++ b/board/emulation/common/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += qemu_mtdparts.o +obj-$(CONFIG_SET_DFU_ALT_INFO) += qemu_dfu.o diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c new file mode 100644 index 0000000000..62234a7647 --- /dev/null +++ b/board/emulation/common/qemu_dfu.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2020 Linaro Limited + */ + +#include +#include +#include +#include +#include + +#define DFU_ALT_BUF_LEN SZ_1K + +static void board_get_alt_info(struct mtd_info *mtd, char *buf) +{ + struct mtd_info *part; + bool first = true; + const char *name; + int len, partnum = 0; + + name = mtd->name; + len = strlen(buf); + + if (buf[0] != '\0') + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, "&"); + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, + "mtd %s=", name); + + list_for_each_entry(part, &mtd->partitions, node) { + partnum++; + if (!first) + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, ";"); + first = false; + + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, + "%s part %d", + part->name, partnum); + } +} + +void set_dfu_alt_info(char *interface, char *devstr) +{ + struct mtd_info *mtd; + + ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN); + + if (env_get("dfu_alt_info")) + return; + + memset(buf, 0, sizeof(buf)); + + /* + * Currently dfu_alt_info is needed on Qemu ARM64 for + * capsule updates + */ + if (IS_ENABLED(CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT) && + IS_ENABLED(CONFIG_TARGET_QEMU_ARM_64BIT)) { + /* probe all MTD devices */ + mtd_probe_devices(); + + mtd = get_mtd_device_nm("nor0"); + if (!IS_ERR_OR_NULL(mtd)) + board_get_alt_info(mtd, buf); + } + + env_set("dfu_alt_info", buf); + printf("dfu_alt_info set\n"); +} diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig index 0108efebd3..fb8d38f5b8 100644 --- a/board/emulation/qemu-arm/Kconfig +++ b/board/emulation/qemu-arm/Kconfig @@ -15,6 +15,7 @@ endif if TARGET_QEMU_ARM_64BIT && !TFABOOT config BOARD_SPECIFIC_OPTIONS imply SYS_MTDPARTS_RUNTIME + imply SET_DFU_ALT_INFO source "board/emulation/common/Kconfig" endif