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 81126C07E9B for ; Wed, 21 Jul 2021 09:38:29 +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 D2D246023F for ; Wed, 21 Jul 2021 09:38:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2D246023F 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 3B02982C08; Wed, 21 Jul 2021 11:38:27 +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=1626860307; bh=0AzzcxTtV4uX2aqHQQP5dI3dHY1rtFbNGUaPBsEEDjk=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cONGMPIglacFWgepHp31mwYFqDtgvzxjJIWbf6JnV42QiHHudC/FnuGHOaO1qK+OA 1DQvZrzG7a2+YSijqKLtdHxTwigVmhyjpMPlK30jWohY/yKd711T+dhOsjBBj8hTJj SG3p3buCA3svaBzi5/WpOsUbFEV58IWWMrD78GPFxK7pk8+Fstg871pNLRhw1eFioj lJ1oXwI6f3sxcvyqFIQM0ySuqlOc/CEp0AgcTbR+VXVkwrvP2ThEeM5pmriziIUkVG WH0H+adsrncKT0lLpHrycKPqv2CsotIF+kpvlIwgdLLUjWJ6UL1JW5ybU1iUSHjcGB ohITpiJ2L/OqQ== Received: by phobos.denx.de (Postfix, from userid 109) id 4682882C30; Wed, 21 Jul 2021 11:38:25 +0200 (CEST) Received: from mout-u-205.mailbox.org (mout-u-205.mailbox.org [91.198.250.254]) (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 9DA4582BEE for ; Wed, 21 Jul 2021 11:38:22 +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-205.mailbox.org (Postfix) with ESMTPS id 4GV9W23pTgzQkFt; Wed, 21 Jul 2021 11:38:22 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id MhA8eflv0si2; Wed, 21 Jul 2021 11:38:17 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu v2 20/41] tools: kwbimage: Mark all BootROM structures __packed 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: <20210719122104.29698-1-marek.behun@nic.cz> <20210719122104.29698-21-marek.behun@nic.cz> From: Stefan Roese Message-ID: <7581a596-8bd4-b790-19ce-caf148c58a89@denx.de> Date: Wed, 21 Jul 2021 11:38:14 +0200 MIME-Version: 1.0 In-Reply-To: <20210719122104.29698-21-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 790BD1860 X-Rspamd-UID: bb847a 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 19.07.21 14:20, Marek Behún wrote: > From: Pali Rohár > > These structures must have specific size without padding, so mark them as > packed via the de-facto standard macro __packed. Also replace PACKED > macro. > > Signed-off-by: Pali Rohár > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese Thanks, Stefan > --- > tools/kwbimage.h | 30 ++++++++++++++++++------------ > tools/kwboot.c | 8 +------- > 2 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/tools/kwbimage.h b/tools/kwbimage.h > index 9f86da46e8..e063e3e41e 100644 > --- a/tools/kwbimage.h > +++ b/tools/kwbimage.h > @@ -11,6 +11,12 @@ > #include > #include > > +#ifdef __GNUC__ > +#define __packed __attribute((packed)) > +#else > +#define __packed > +#endif > + > #define KWBIMAGE_MAX_CONFIG ((0x1dc - 0x20)/sizeof(struct reg_config)) > #define MAX_TEMPBUF_LEN 32 > > @@ -46,12 +52,12 @@ struct main_hdr_v0 { > uint16_t rsvd2; /* 0x1C-0x1D */ > uint8_t ext; /* 0x1E */ > uint8_t checksum; /* 0x1F */ > -}; > +} __packed; > > struct ext_hdr_v0_reg { > uint32_t raddr; > uint32_t rdata; > -}; > +} __packed; > > #define EXT_HDR_V0_REG_COUNT ((0x1dc - 0x20) / sizeof(struct ext_hdr_v0_reg)) > > @@ -61,12 +67,12 @@ struct ext_hdr_v0 { > struct ext_hdr_v0_reg rcfg[EXT_HDR_V0_REG_COUNT]; > uint8_t reserved2[7]; > uint8_t checksum; > -}; > +} __packed; > > struct kwb_header { > struct main_hdr_v0 kwb_hdr; > struct ext_hdr_v0 kwb_exthdr; > -}; > +} __packed; > > /* Structure of the main header, version 1 (Armada 370/38x/XP) */ > struct main_hdr_v1 { > @@ -87,7 +93,7 @@ struct main_hdr_v1 { > uint16_t reserved5; /* 0x1C-0x1D */ > uint8_t ext; /* 0x1E */ > uint8_t checksum; /* 0x1F */ > -}; > +} __packed; > > /* > * Main header options > @@ -109,21 +115,21 @@ struct opt_hdr_v1 { > uint8_t headersz_msb; > uint16_t headersz_lsb; > char data[0]; > -}; > +} __packed; > > /* > * Public Key data in DER format > */ > struct pubkey_der_v1 { > uint8_t key[524]; > -}; > +} __packed; > > /* > * Signature (RSA 2048) > */ > struct sig_v1 { > uint8_t sig[256]; > -}; > +} __packed; > > /* > * Structure of secure header (Armada 38x) > @@ -146,7 +152,7 @@ struct secure_hdr_v1 { > uint8_t next; /* 0x25E0 */ > uint8_t reserved4; /* 0x25E1 */ > uint16_t reserved5; /* 0x25E2 - 0x25E3 */ > -}; > +} __packed; > > /* > * Structure of register set > @@ -159,14 +165,14 @@ struct register_set_hdr_v1 { > struct { > uint32_t address; /* 0x4+8*N - 0x7+8*N */ > uint32_t value; /* 0x8+8*N - 0xB+8*N */ > - } entry; > + } __packed entry; > struct { > uint8_t next; /* 0xC+8*N */ > uint8_t delay; /* 0xD+8*N */ > uint16_t reserved; /* 0xE+8*N - 0xF+8*N */ > - } last_entry; > + } __packed last_entry; > } data[]; > -}; > +} __packed; > > /* > * Value 0 in register_set_hdr_v1 delay field is special. > diff --git a/tools/kwboot.c b/tools/kwboot.c > index 4be094c9c8..2683e5360c 100644 > --- a/tools/kwboot.c > +++ b/tools/kwboot.c > @@ -26,12 +26,6 @@ > #include > #include > > -#ifdef __GNUC__ > -#define PACKED __attribute((packed)) > -#else > -#define PACKED > -#endif > - > /* > * Marvell BootROM UART Sensing > */ > @@ -68,7 +62,7 @@ struct kwboot_block { > uint8_t _pnum; > uint8_t data[128]; > uint8_t csum; > -} PACKED; > +} __packed; > > #define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */ > > 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