From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02C6EC432BE for ; Wed, 25 Aug 2021 16:49:16 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02C2760FC1 for ; Wed, 25 Aug 2021 16:49:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 02C2760FC1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nic.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8367E82C30; Wed, 25 Aug 2021 18:49:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="v8bdeAS1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C0B882BB2; Wed, 25 Aug 2021 18:49:11 +0200 (CEST) Received: from mail.nic.cz (mail.nic.cz [217.31.204.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 72DD782C30 for ; Wed, 25 Aug 2021 18:49:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from dellmb (unknown [IPv6:2001:1488:fffe:6:8747:7254:5571:3010]) by mail.nic.cz (Postfix) with ESMTPSA id DE1EB1409EE; Wed, 25 Aug 2021 18:49:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1629910146; bh=1xxLp6b3rR2xRHGc7gvNp+HnBPuqyi4gUSkQX/+oiuY=; h=Date:From:To; b=v8bdeAS1XVWJC3k0B/QH2GEWG6XCJxTJoRT9BVjJKXpugsXa30oxuEo88nXgbQHfT ieD4sSlTamgCb4UHgDPcA2+7joJ+r3K31J9Rv/S5b4iIxy5lYps0nfi8p1ISS0w8pW EKRNxnSGsHdC4iSv+lNH/FHniNs+Bwsw6Iuc5p2o= Date: Wed, 25 Aug 2021 18:49:05 +0200 From: Marek =?UTF-8?B?QmVow7pu?= To: Stefan Roese Cc: u-boot@lists.denx.de, pali@kernel.org, Chris Packham , Baruch Siach , Dennis Gilmore , Mario Six , Jon Nettleton Subject: Re: [PATCH u-boot-marvell 25/29] tools: kwboot: Support higher baudrates when booting via UART Message-ID: <20210825184905.16cf1fe5@dellmb> In-Reply-To: <20210825134634.3959-26-marek.behun@nic.cz> References: <20210825134634.3959-1-marek.behun@nic.cz> <20210825134634.3959-26-marek.behun@nic.cz> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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.103.2 at phobos.denx.de X-Virus-Status: Clean On Wed, 25 Aug 2021 15:46:30 +0200 Marek Beh=C3=BAn wrote: > @@ -765,6 +1187,37 @@ kwboot_img_is_secure(void *img) > return 0; > } > =20 > +static void * > +kwboot_img_grow_data_left(void *img, size_t *size, size_t grow) > +{ > + uint32_t hdrsz, datasz, srcaddr; > + struct main_hdr_v1 *hdr =3D img; > + uint8_t *data; > + > + srcaddr =3D le32_to_cpu(hdr->srcaddr); > + > + hdrsz =3D kwbheader_size(hdr); > + data =3D (uint8_t *)img + srcaddr; > + datasz =3D *size - srcaddr; > + > + /* only move data if there is not enough space */ > + if (hdrsz + grow > srcaddr) { > + size_t need =3D hdrsz + grow - srcaddr; > + > + /* move data by enough bytes */ > + memmove(data + need, data, datasz); > + *size +=3D need; > + srcaddr +=3D need; > + } > + > + srcaddr -=3D grow; > + hdr->srcaddr =3D cpu_to_le32(srcaddr); > + hdr->destaddr =3D cpu_to_le32(le32_to_cpu(hdr->destaddr) - grow); > + hdr->execaddr =3D cpu_to_le32(le32_to_cpu(hdr->execaddr) - grow); Sorry, we need to do one more thing here: hdr->blocksize =3D cpu_to_le32(le32_to_cpu(hdr->blocksize) + grow); I will fix this in v2, unless Stefan is willing to fix this himself. Marek