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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 8E55DC07E96 for ; Thu, 15 Jul 2021 08:35:37 +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 072D96127C for ; Thu, 15 Jul 2021 08:35:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 072D96127C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3338382903; Thu, 15 Jul 2021 10:35:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1626338135; bh=B/gO3SL/ZfwJP+hyD0qyM1lt7YMdkypc4sYFWas8B4k=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=w8AGoreu3jkr+O9KkoVTgLb2shpBtI4+O9jIDRs7YYsuaGNgm/WAd7JJOAFZ29PfI nyNJYtSVru/JJy51OI2eoHZMQ0T6Ziztvpq+2iSq80pdke/o6ihxfyhh0blNaZYbYp pZD/0egzJafpDuS7dZcHsqC7Omed2mnXw7OOehCufbr20bnaynbelSK4rWyTH5CCKM vw+t2JokjQW9ho1WUewJtw6Wk1zzneam46ea3PUmqVqeVbLrRsDFupnthJKlpDoe/S 1jzxqjBEv9MEqpQak4UKD1Xz9EEJ1IV9Ac9EL4D3BmjtgxZafdmFpqKgoMmKJPKyrV YqALkpQeIjyvA== Received: by phobos.denx.de (Postfix, from userid 109) id 6221982952; Thu, 15 Jul 2021 10:35:33 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 551E28203B for ; Thu, 15 Jul 2021 10:35:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4GQSPG0jgvzQk9Y; Thu, 15 Jul 2021 10:35:30 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id UQ97ckFhWcyA; Thu, 15 Jul 2021 10:35:27 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu 05/31] tools: kwbimage: Fix generation of SATA, SDIO and PCIe images To: =?UTF-8?Q?Marek_Beh=c3=ban?= , u-boot@lists.denx.de, Chris Packham , Baruch Siach , Dirk Eibach , Chris Packham Cc: Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20210708173032.27999-1-marek.behun@nic.cz> <20210708173032.27999-6-marek.behun@nic.cz> From: Stefan Roese Message-ID: <55b62b7e-5b18-cb8e-0b6b-202c1c4b7006@denx.de> Date: Thu, 15 Jul 2021 10:35:24 +0200 MIME-Version: 1.0 In-Reply-To: <20210708173032.27999-6-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -1.41 / 15.00 / 15.00 X-Rspamd-Queue-Id: 3E54D189C X-Rspamd-UID: 6cabbe 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 08.07.21 19:30, Marek Behún wrote: > From: Pali Rohár > > SATA and SDIO images must be aligned to sector size (which in most cases > is 512 bytes) and Source Address in main header is stored in number of > sectors from the beginning of the drive. SATA image must be stored at > sector 1 and SDIO image at sector 0. Source Address for PCIe image is > not used and must be set to 0xFFFFFFFF. > > Signed-off-by: Pali Rohár > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese Thanks, Stefan > --- > tools/kwbimage.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/tools/kwbimage.c b/tools/kwbimage.c > index f40ba0994d..44bf5ee026 100644 > --- a/tools/kwbimage.c > +++ b/tools/kwbimage.c > @@ -1281,6 +1281,26 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, > main_hdr->destaddr = cpu_to_le32(params->addr); > } > > + /* > + * For SATA srcaddr is specified in number of sectors starting from > + * sector 0. The main header is stored at sector number 1. > + * This expects the sector size to be 512 bytes. > + */ > + if (main_hdr->blockid == IBR_HDR_SATA_ID) > + main_hdr->srcaddr = cpu_to_le32((headersz + 511) / 512 + 1); > + > + /* > + * For SDIO srcaddr is specified in number of sectors starting from > + * sector 0. The main header is stored at sector number 0. > + * This expects sector size to be 512 bytes. > + */ > + if (main_hdr->blockid == IBR_HDR_SDIO_ID) > + main_hdr->srcaddr = cpu_to_le32((headersz + 511) / 512); > + > + /* For PCIe srcaddr is not used and must be set to 0xFFFFFFFF. */ > + if (main_hdr->blockid == IBR_HDR_PEX_ID) > + main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF); > + > #if defined(CONFIG_KWB_SECURE) > if (image_get_csk_index() >= 0) { > /* > @@ -1734,6 +1754,8 @@ static int kwbimage_generate(struct image_tool_params *params, > */ > if (bootfrom == IBR_HDR_SPI_ID || bootfrom == IBR_HDR_NAND_ID) > return 4 + (256 - (alloc_len + s.st_size + 4) % 256) % 256; > + else if (bootfrom == IBR_HDR_SDIO_ID || bootfrom == IBR_HDR_PEX_ID) > + return 4 + (512 - (alloc_len + s.st_size + 4) % 512) % 512; > else > return 4 + (4 - s.st_size % 4) % 4; > } > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de