From patchwork Thu Nov 2 13:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ulrich Teichert X-Patchwork-Id: 1858536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=k8Td+jwz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23c; helo=mail-lj1-x23c.google.com; envelope-from=swupdate+bncbcp5t7mrsecrbzwbr2vamgqeltxd2ra@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23c.google.com (mail-lj1-x23c.google.com [IPv6:2a00:1450:4864:20::23c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SLkrW0lVwz1yQ4 for ; Fri, 3 Nov 2023 00:15:22 +1100 (AEDT) Received: by mail-lj1-x23c.google.com with SMTP id 38308e7fff4ca-2c5047f94bdsf8772371fa.1 for ; Thu, 02 Nov 2023 06:15:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698930919; cv=pass; d=google.com; s=arc-20160816; b=EE8jmECy9qvb3Ut/MDpYx0MnjAKnpWUVYvmH7gNLOulBp3z2R7aNcs6zMw9kU0zgVj rNc3TaUUZZ8jubOS4VpRnSDnRmPWkn3W49HO0YM2OWPbS9T6InyQUI20v9LcpZMXW3p6 YUwr+VilQzgr9FgBgxAwWYH4tDsCWWppPW3euWdRALEkoqDCTvnrmb8wsZVekVSfYanU qC4BsFozjbywsQa0orYRV7pJnhFuyWoDFi73tsS2XW7ieRDTTJFtlTesGkXMloNaiA+o r0ud+I43APUnEhUYiuhi8M+l5nq24SaZCRlxnW1XamZzv14lqbacZ5wxn/oDdNGBwLa7 6+pA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version :content-transfer-encoding:content-language:accept-language :message-id:date:thread-index:thread-topic:subject:cc:to:from:sender :dkim-signature; bh=WWO1txOmuVS10p/90Cylx4gtMHCQtZGIkgaElyXonWw=; fh=IonDzF0Fm76Nm77XGPmJf5DbY678Dd4Ai863Ksiywrc=; b=zhYVE93crwKWp4w1Pa9HNaF7eioVBF1ESaWrOfmG8mEwzQed6ecUAH5Xm7flEi+b0K gh3hEjDmkyIQKRA3tD18Xa2lSs+Nw8RQfQSONed5SxuuAm7IoZeOFo2dw9J4a+wD2yhm jKsjAH/RNa2Vnoi5ZDTyoLkQn4G+jt6e9jWQmHUv1txkCqM2mDPUYsiPKX9oYZZlZ0Yq 9uruaECMxcTuxDZD5AtmCSBNoarXULh3zy69H9bfTO9SCnOdIpsjwyHDd2y7Ok9npH4J IMdwGQx6/Z8Hh2Cq7Vtt71CRqmHuL35xuIk9klDhfrwxVg8xW844JYAxc/TckMrR0zsN Hl7A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@kumkeo.de header.s=default header.b=YIxc97iG; spf=pass (google.com: domain of ulrich.teichert@kumkeo.de designates 91.102.14.10 as permitted sender) smtp.mailfrom=ulrich.teichert@kumkeo.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1698930919; x=1699535719; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=WWO1txOmuVS10p/90Cylx4gtMHCQtZGIkgaElyXonWw=; b=k8Td+jwzyPpNZ2vOKiI795Y+GUhfcySd7RxzHtF/Ryer9o7S6JSSXxynZtSpvmYuSv d2tfHYg43KZqnX5iERnhwNC4WyJX1d+EwqcQbYF5fdexZquezcJ3Eo1PPy68LTf/9CaB tX66hNc75zRVtBd2/AlXnopgz065rrS1BO2FiTUerVZz8Eo/8eYPF3TCLETtcfsYVV6h bGfqEJDt5llYynsu49zRNUXbb25jhNhaD14Sy+9LOGazcwulLddtYbaTe8wT8zEn5Flt 43TY2QFtK+AQFtKHQAqHBORshE34YI31I6iKtHcdssA0rcvcPTnxEyQi4zMauk/bAZ+v L88w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698930919; x=1699535719; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :content-transfer-encoding:content-language:accept-language :message-id:date:thread-index:thread-topic:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=WWO1txOmuVS10p/90Cylx4gtMHCQtZGIkgaElyXonWw=; b=kbrM8rsVyha7U16Hd7EnDU8AF60nefMDtSo3N+aelLssoKm7iBZ1eroFSsvA+6uGof Y/rci3+bXDj/oFUh9pBMegVDEUqPiEk0mO9kTswmkI/E9CVYEUPS9yFgBe3dc2Y1eyN0 XAjpVlg+2v9Cj/h/KG05JM7HIGakAukI5Lobk5Tb2eDFi7XdK+2xcAQ8g7WA6xqSitCs 8KCyg5K3FZt2bIxbypHs5g2aHOB9f7ApW6X1AGXC84J9acGunlL29+Q7fNHoQ78rh2cj /cLAu188v9BsvyM0VFZFGz7uN3iSddq7D8TprxFaALnQdzH+Csxhcqdkn8NR2r91I6e4 TWXA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwBPOXXZis1EYVlwK9fg1uV7CnH+d51PvdQBUod6T33pOZ4dOXb 3c0K6n7f9ArgWJg0StCAEbI= X-Google-Smtp-Source: AGHT+IE79dv9YHKcevzNWcg+aBvFPZjcLDaumDQ55XxmyPIec+/j36KZreLpCzCcxFKj8l/4qeDJoA== X-Received: by 2002:a2e:9050:0:b0:2c6:f3cf:d7a3 with SMTP id n16-20020a2e9050000000b002c6f3cfd7a3mr1160926ljg.36.1698930918569; Thu, 02 Nov 2023 06:15:18 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:1d29:b0:405:32c1:16f9 with SMTP id l41-20020a05600c1d2900b0040532c116f9ls368256wms.1.-pod-prod-02-eu; Thu, 02 Nov 2023 06:15:16 -0700 (PDT) X-Received: by 2002:a05:600c:3594:b0:408:3804:2a20 with SMTP id p20-20020a05600c359400b0040838042a20mr15130686wmq.22.1698930916528; Thu, 02 Nov 2023 06:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698930916; cv=none; d=google.com; s=arc-20160816; b=OxyRjjS2f8c+eIGAlXQTqXIsqK/Nljea3NSH6w1aA2rSj6AaYBpBq77H4XxgjRISY3 ycFZ64LN1JOiYMNd3ihc0cYwPb6fCbodaBr19CtlmSVFLJwCRarMUv1m5VlSBUxrlhRO 2Ym4V59UX/kqOtzJhV0AG37fKbVAQ3Xu9KBFPk5qgyGspz14mPmOaKRIscacCh4dHsbg Th2gAcTLmu59HMTRV80tS9BOKo6EYf3J4AjRe4paRxtZWt1+r4HcD5f/SmdzGI44q52P BKnDrG054Joxuq4834y7jm5C3cK90I4/EWtf1eBAUqurp4ZZwrM8Vpzn2lNiiuLjLUDI OLtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature; bh=ccI71S9gul5ky8z0g39R0EK1D9swzwjN+g7ISbqquXM=; fh=IonDzF0Fm76Nm77XGPmJf5DbY678Dd4Ai863Ksiywrc=; b=BfsaJDYOuHdAyz6RlWfOc1CjYOj6b0mV1RKIQgXjCoqAU+gQGNfKKO+rDY+332XnLz 9BMSL3ALUGDZ0R/twDfyLp+WpguvqtcyTfrYG4ivfIen9r0biNQ5ECHN/NM+OI06QDHS DiVtv6D8hmqlBtGx1GHP1de2dYGkg6N8GkURD+E8sLE+S+L5l/uamOS5hj+kYp4ig8O8 WW14MKtXBo0lsv5kzmXLB3j3uGcfBJGPviYfTuKkGewPVTMCr1b9H1CNhilLiE9cmmjb HxxKP5QTRZyCvXcXmFR1ZET6EMxa3goXXsgp47GOrEuNRuQqzTl3ZqzSyTJINW5gZF1D mXVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@kumkeo.de header.s=default header.b=YIxc97iG; spf=pass (google.com: domain of ulrich.teichert@kumkeo.de designates 91.102.14.10 as permitted sender) smtp.mailfrom=ulrich.teichert@kumkeo.de Received: from mail1.berlinercloud.net (mail1.berlinercloud.net. [91.102.14.10]) by gmr-mx.google.com with ESMTPS id s17-20020a05600c45d100b00401df7502b6si279932wmo.1.2023.11.02.06.15.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2023 06:15:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ulrich.teichert@kumkeo.de designates 91.102.14.10 as permitted sender) client-ip=91.102.14.10; Received: from mail1.berlinercloud.net (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F163BFC099 for ; Thu, 2 Nov 2023 14:15:15 +0100 (CET) Received: from mail1.berlinercloud.net (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5BF9FC098 for ; Thu, 2 Nov 2023 14:15:15 +0100 (CET) Received: from mail.kumkeo.de (unknown [172.18.20.16]) by mail1.berlinercloud.net (Postfix) with ESMTPS for ; Thu, 2 Nov 2023 14:15:15 +0100 (CET) Received: from kumex2.kumkeo.de (172.18.20.16) by kumex2.kumkeo.de (172.18.20.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Thu, 2 Nov 2023 14:15:15 +0100 Received: from kumex2.kumkeo.de ([fe80::6572:2554:d711:1795]) by kumex2.kumkeo.de ([fe80::6572:2554:d711:1795%3]) with mapi id 15.01.2507.034; Thu, 2 Nov 2023 14:15:15 +0100 From: Ulrich Teichert To: "swupdate@googlegroups.com" CC: Ulrich Teichert Subject: [swupdate] [PATCH] Allow flash updates to proceed without decompressed-size set Thread-Topic: [PATCH] Allow flash updates to proceed without decompressed-size set Thread-Index: AQHaDYx1Zh8v0O5aAEaPBv9dkQsFfw== Date: Thu, 2 Nov 2023 13:15:14 +0000 Message-ID: <84fe5ff5bb03467dbc0d6518d1f3cee7@kumkeo.de> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [213.61.103.52] x-tm-as-product-ver: SMEX-14.0.0.3152-9.1.1006-27972.007 x-tm-as-result: No-10--4.305000-8.000000 x-tmase-matchedrid: biL4YBBTMFYC+6mJa2j6YYA8oQ1Jmr+1AD0+9pqq8M1YC5LPd7Bvbdzx tXV3o6/dOzGf0sp2z8pDOTmBZRPz9h1YpEPWJiyzQ0Xm0pWWLkqFIJL35BQIZNxGVXFEKe3Wh+n qPq4qP85JwexDJ3p2xMD41uBd6qgy7aNCrPxQ/uewOmfjQ30zeWvaomg0i4KNnhD4vcFcha54zB xGN5n2p7BGgWlfHEjBEmFBzlx70kidyXrS98sFgxF4zyLyne+An5nfR7I2dFOQc9WQFO7fUz8HD yFhgZeIfS0Ip2eEHnzWRN8STJpl3PoLR4+zsDTttrrTuahHzlHs5fpNo1yMgQ3rzTpoydEZoOxh Ry/lxXIzqiOnV266UHN1AJSHzlmkIZjO6N+j1NSfJQC3boK9D29F3TFyPOaW9+zChovcdw/G61L W3xarQYiiduc0eATAz+phZh9BMadJA4+6YYiS7R/BXqwE9HSW x-tm-as-user-approved-sender: No x-tm-as-user-blocked-sender: No x-tmase-result: 10--4.305000-8.000000 x-tmase-version: SMEX-14.0.0.3152-9.1.1006-27972.007 x-tm-snts-smtp: C8C8EA28C5146DA0CD58AFDE5E710944879175BEEE2AE95CED3C539CB74486372000:9 x-c2processedorg: c2164c60-77f9-4731-9233-294e5719f64e MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Original-Sender: ulrich.teichert@kumkeo.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@kumkeo.de header.s=default header.b=YIxc97iG; spf=pass (google.com: domain of ulrich.teichert@kumkeo.de designates 91.102.14.10 as permitted sender) smtp.mailfrom=ulrich.teichert@kumkeo.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Hi, sorry that I've opened up a GitHub pull request, should have read the contribution guidelines to the very end... My problem was that after an update to 2023.05 I could not use old images to downgrade a running system. The reason for that is that the property "decompressed-size" was not mandatory for software update images. Now, for performance reasons it *is* mandatory, which may prevent downgrades with older images. To allow flash updates to proceed without decompressed-size set, test for the property and if the property is unset, erase the whole device before copying the image. Signed-off-by: Ulrich Teichert --- Mit freundlichen Grüßen / Kind regards Dipl.-Inform. Ulrich Teichert Senior Software Developer kumkeo GmbH Heidenkampsweg 82a 20097 Hamburg Germany T: +49 40 2846761-0 F: +49 40 2846761-99 ulrich.teichert@kumkeo.de www.kumkeo.de Amtsgericht Hamburg / Hamburg District Court, HRB 108558 Geschäftsführer / Managing Director: Dipl.-Ing. Bernd Sager; Dipl.-Ing. Sven Tanneberger, MBA diff --git a/handlers/flash_handler.c b/handlers/flash_handler.c index 3cca02b..a3d79b3 100644 --- a/handlers/flash_handler.c +++ b/handlers/flash_handler.c @@ -310,13 +310,19 @@ static int flash_write_nor(int mtdnum, struct img_type *img) long long size = get_output_size(img, true); if (size < 0) { - ERROR("Failed to determine output size, bailing out."); - return -1; + INFO("decompression-size not set, erasing whole flash device %s\n", + img->device); + if (flash_erase(mtdnum)) { + ERROR("Failed to erase %s", img->device); + return -1; + } } - if (flash_erase_sector(mtdnum, img->seek, size)) { - ERROR("Failed to erase sectors on /dev/mtd%d (start: %llu, size: %lld)", - mtdnum, img->seek, size); - return -1; + else { + if (flash_erase_sector(mtdnum, img->seek, size)) { + ERROR("Failed to erase sectors on /dev/mtd%d (start: %llu, size: %lld)", + mtdnum, img->seek, size); + return -1; + } }