From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 24 Jun 2021 15:36:05 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwPWX-0003OX-JH for lore@lore.pengutronix.de; Thu, 24 Jun 2021 15:36:05 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwPWW-0005YY-Do for lore@pengutronix.de; Thu, 24 Jun 2021 15:36:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5cYHhmxWncGDbe2W7L9zIUBzjkpjuBpOgc2kJuT695g=; b=4OvvnsyclLc3bjxXIV7c8WavIe TXyuJJ4WWID8i201eUzzPutJ6cQCVNAaiyW0l3NhEtXpU9w/QKAKl+HYJN/+iLQ8XVMlZQgiNxcm1 X3JcOAcIf1NhHoixzZkBUq6a9yRbvCeSZLh+w1tNGO3fvmk77Wyw5F7iJGtOh9oZ6Q+XMI5YSsPxf /TCgtkH9g+o9GZQubWLo3g5rZr5i669ZCV/fwE9JEue3179tV0m339HcaL9rZUPcc9K94triInqPc vhFR7ONR7DQ2XZHO64gBfTJ83lMTg+hsBSO545POSxsrKpeYANps9cN340DaTkduOl7wVrV5gsKZp qhDmGY7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwPVI-00EpQm-EL; Thu, 24 Jun 2021 13:34:48 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwPVB-00EpP0-4V for barebox@lists.infradead.org; Thu, 24 Jun 2021 13:34:44 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwPV9-00055s-Sn; Thu, 24 Jun 2021 15:34:39 +0200 To: Michael Tretter Cc: barebox@lists.infradead.org References: <20210624102342.269363-1-m.tretter@pengutronix.de> <20210624102342.269363-5-m.tretter@pengutronix.de> <20210624132423.GD28030@pengutronix.de> From: Ahmad Fatoum Message-ID: Date: Thu, 24 Jun 2021 15:34:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210624132423.GD28030@pengutronix.de> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210624_063441_304109_CD65D1BA X-CRM114-Status: GOOD ( 28.02 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 4/7] ARM: zynqmp: add update handler X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 24.06.21 15:24, Michael Tretter wrote: > On Thu, 24 Jun 2021 12:52:58 +0200, Ahmad Fatoum wrote: >> On 24.06.21 12:23, Michael Tretter wrote: >>> The ZynqMP boots from an SDHCI device by reading a boot.bin file from >>> the FAT16/32 partition, which is the first partition in the MBR. >>> >>> The update handler copies a boot.bin image to this partition, which >>> might be board specific. >> >> Is barebox the boot.bin or is that a separate first stage bootloader? > > Both. The boot.bin contains at least the first stage bootloader, TF-A, and > Barebox. You cannot boot a "standalone" Barebox image on the ZynqMP. > > I also documented this in the zynqmp documentation as part of this patch > series. I saw that after writing the mail here. Thanks for clarifying. > > Michael > >> >>> >>> Signed-off-by: Michael Tretter >>> --- >>> arch/arm/mach-zynqmp/Makefile | 1 + >>> .../arm/mach-zynqmp/include/mach/zynqmp-bbu.h | 21 ++++++++ >>> arch/arm/mach-zynqmp/zynqmp-bbu.c | 48 +++++++++++++++++++ >>> 3 files changed, 70 insertions(+) >>> create mode 100644 arch/arm/mach-zynqmp/include/mach/zynqmp-bbu.h >>> create mode 100644 arch/arm/mach-zynqmp/zynqmp-bbu.c >>> >>> diff --git a/arch/arm/mach-zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile >>> index 14b8a4e46b87..e24a43c0d59f 100644 >>> --- a/arch/arm/mach-zynqmp/Makefile >>> +++ b/arch/arm/mach-zynqmp/Makefile >>> @@ -1,3 +1,4 @@ >>> # SPDX-License-Identifier: GPL-2.0-or-later >>> obj-y += firmware-zynqmp.o >>> obj-y += zynqmp.o >>> +obj-$(CONFIG_BAREBOX_UPDATE) += zynqmp-bbu.o >>> diff --git a/arch/arm/mach-zynqmp/include/mach/zynqmp-bbu.h b/arch/arm/mach-zynqmp/include/mach/zynqmp-bbu.h >>> new file mode 100644 >>> index 000000000000..8502791ee0f7 >>> --- /dev/null >>> +++ b/arch/arm/mach-zynqmp/include/mach/zynqmp-bbu.h >>> @@ -0,0 +1,21 @@ >>> +/* SPDX-License-Identifier: GPL-2.0-only */ >>> +/* >>> + * Copyright (C) 2020 Michael Tretter >>> + */ >>> +#ifndef __MACH_ZYNQMP_BBU_H >>> +#define __MACH_ZYNQMP_BBU_H >>> + >>> +#include >>> + >>> +#ifdef CONFIG_BAREBOX_UPDATE >>> +int zynqmp_bbu_register_handler(const char *name, char *devicefile, >>> + unsigned long flags); >>> +#else >>> +static int zynqmp_bbu_register_handler(const char *name, char *devicefile, >>> + unsigned long flags) >>> +{ >>> + return 0; >>> +}; >>> +#endif >>> + >>> +#endif /* __MACH_ZYNQMP_BBU_H */ >>> diff --git a/arch/arm/mach-zynqmp/zynqmp-bbu.c b/arch/arm/mach-zynqmp/zynqmp-bbu.c >>> new file mode 100644 >>> index 000000000000..d1197c01dc41 >>> --- /dev/null >>> +++ b/arch/arm/mach-zynqmp/zynqmp-bbu.c >>> @@ -0,0 +1,48 @@ >>> +// SPDX-License-Identifier: GPL-2.0-only >>> +/* >>> + * Copyright (C) 2020 Michael Tretter >>> + */ >>> + >>> +#include >>> +#include >>> +#include >>> + >>> +static int zynqmp_bbu_handler(struct bbu_handler *handler, >>> + struct bbu_data *data) >>> +{ >>> + int ret = 0; >>> + >>> + ret = bbu_confirm(data); >>> + if (ret) >>> + return ret; >>> + >>> + ret = copy_file(data->imagefile, data->devicefile, 1); >>> + if (ret < 0) { >>> + pr_err("update failed: %s", strerror(-ret)); >>> + return ret; >>> + } EFI also registers an barebox update handler for a file: /boot/EFI/BOOT/BOOTx64.EFI, but there apparently bbu_register_std_file_update suffices. Did you check if that would work for you as well? It's still a good idea to have a zynqmp specific wrapper for bbu_register_std_file_update, but I am not sure you need to duplicate the copy_file stuff. Also, this seems SD-specific. I assume eMMC would boot from boot partitions? If so, zynqmp_bbu_register_sd_handler may be a more apt name. >>> + >>> + return ret; >>> +} >>> + >>> +int zynqmp_bbu_register_handler(const char *name, char *devicefile, >>> + unsigned long flags) >>> +{ >>> + struct bbu_handler *handler; >>> + int ret = 0; >>> + >>> + if (!name || !devicefile) >>> + return -EINVAL; >>> + >>> + handler = xzalloc(sizeof(*handler)); >>> + handler->name = name; >>> + handler->devicefile = devicefile; >>> + handler->flags = flags; >>> + handler->handler = zynqmp_bbu_handler; >>> + >>> + ret = bbu_register_handler(handler); >>> + if (ret) >>> + free(handler); >>> + >>> + return ret; >>> +} >>> > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox