From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 09 Jun 2022 10:23:22 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nzDRq-008YUg-Hu for lore@lore.pengutronix.de; Thu, 09 Jun 2022 10:23:22 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nzDRp-0007N5-3M for lore@pengutronix.de; Thu, 09 Jun 2022 10:23:21 +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:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cCbpd3VtabuZNeqcb46w3DwyLXMzecjTxC6yw44jU5M=; b=0YXahq3n5MD4ui Sg74tFtZF0m4yH9RHjlYvrOIoph7FKKjR9EIW7xxepUZ9oD14Sh54My/yxu8y7hIGz3NP1EnVyA1T Ci/bFyqykFbtX52WgpckFg9QWmRRRMqsaHtKQ+1N6l7me3mZdZZ3oCxJf5lJ/dnGG9XvfcqagS6dY TjSL5UC7FL8mz2o1pxOXFS1c3ZTuq6xmY5y+YPto746afGH0H3wh2RwP1yeT/l/kiv5jaG8AX9tLF qZ0o9jaPYFPvqCKQadVVap9v/F4QxyEeY/S142veXdaYhgO6BuPu1wi05AeS5d2AbBT+E9LMBEtG9 AvbZbGPqM4xWfEJgcspA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzDQR-000CJc-5p; Thu, 09 Jun 2022 08:21:55 +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 1nzDQN-000CIJ-2N for barebox@lists.infradead.org; Thu, 09 Jun 2022 08:21:52 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nzDQJ-0007G3-GR; Thu, 09 Jun 2022 10:21:47 +0200 Message-ID: <27fa57cd-439f-fadf-25df-f1e7e2fd12ad@pengutronix.de> Date: Thu, 9 Jun 2022 10:21:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: Sascha Hauer Cc: barebox@lists.infradead.org, lgo@pengutronix.de References: <20220531093537.1731712-1-a.fatoum@pengutronix.de> <20220609071928.GY1615@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20220609071928.GY1615@pengutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220609_012151_178998_91EA3A8B X-CRM114-Status: GOOD ( 30.19 ) 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:3::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.8 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_NONE,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] fastboot: inform user if barebox update falls back to raw copy 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) Hello Sascha, On 09.06.22 09:19, Sascha Hauer wrote: > On Tue, May 31, 2022 at 11:35:37AM +0200, Ahmad Fatoum wrote: >> Fastboot code determines whether to go into barebox update handler by >> checking whether filetype_is_barebox_image() returns true for the image. >> This is different from the barebox_update command which leaves it to the >> individual handlers to decide whether an image is suitable. >> >> Coupled with eMMC boot partitions, this could lead to >> `barebox_update -t mmc` updating the boot partition, while a >> `fastboot flash bbu-mmc` will write the image to the user area instead. >> >> It may be worth breaking backwards compatibility here and refuse update >> in that case, but for now at least alert the user that a raw copy is >> being attempted. >> >> Signed-off-by: Ahmad Fatoum >> --- >> common/fastboot.c | 13 ++++++++++++- >> 1 file changed, 12 insertions(+), 1 deletion(-) >> >> diff --git a/common/fastboot.c b/common/fastboot.c >> index f8ed40c86e00..50ea8421d92c 100644 >> --- a/common/fastboot.c >> +++ b/common/fastboot.c >> @@ -673,7 +673,7 @@ static void cb_flash(struct fastboot *fb, const char *cmd) >> goto out; >> } >> >> - if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) { >> + if (IS_ENABLED(CONFIG_BAREBOX_UPDATE)) { > > >> void *buf; >> struct bbu_handler *handler; >> struct bbu_data data = { >> @@ -681,6 +681,17 @@ static void cb_flash(struct fastboot *fb, const char *cmd) >> .flags = BBU_FLAG_YES, >> }; >> >> + if (!filetype_is_barebox_image(filetype)) { >> + if (strstarts(fentry->name, "bbu-")) { >> + fastboot_tx_print(fb, FASTBOOT_MSG_INFO, >> + "This is _not_ a barebox image..."); >> + fastboot_tx_print(fb, FASTBOOT_MSG_INFO, >> + "Falling back to raw copy to %s", filename); >> + } >> + >> + goto copy; >> + } > > The handlers starting with "bbu-" are registered from the barebox update > code, so falling back to copy is clearly wrong. > > The logic to enter this barebox_update path should be: > > if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && > (filetype_is_barebox_image(filetype) || strstarts(fentry->name, "bbu-"))) > > That way we are sure that barebox_update is called when we need it. Also > behaviour is consistent to what barebox_update does on the command line. This is not consistent with barebox_update behavior. Calling it from command line will leave it to update handlers to determine whether an image is a barebox image. filetype_is_barebox_image() is exclusively used for fastboot. I don't like the current behavior either, but I am wary of breaking existing users, so I figured an info message would be a stop-gap solution for now. You can add a pr_warn("fastboot: deprecated raw copy fallback for barebox_update\n"); for now. What do you think? Cheers, Ahmad > > Sascha > -- 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