From patchwork Thu Jul 18 12:34:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 1133719 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="N2bDL4zS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qDB25rTkz9s4Y for ; Thu, 18 Jul 2019 22:35:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 59ECEC21FE1; Thu, 18 Jul 2019 12:34:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 71011C21C8B; Thu, 18 Jul 2019 12:34:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ADD46C21F21; Thu, 18 Jul 2019 12:34:18 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50044.outbound.protection.outlook.com [40.107.5.44]) by lists.denx.de (Postfix) with ESMTPS id 11AA7C21FBB for ; Thu, 18 Jul 2019 12:34:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a7pMy/1bAfVMpNLkTkmo4v4vHEj6yX0c/5UoAmr2eEldaV+H0PGQd2QD8MXGSabsYMNDJGASaVv0Tov8LG4X3qmRxnSOaXe93Tl/ZXG1XLmI1Lh8dktCjLJ8F3zyO851p6so9nnI9CvJLNDqspPCZiNRTxBQRgp9Fx4zn9fB1J7XLBpfqs8YhSb2uJ+Wm+GR88DUrqZxEJCDYO0mCfc81WI/WKuxTRlpeokoebBgJ/uwp4BEAbl1mRSd4DXn93ssjq50lzGLXUjmM/mToHt8jCXf78oB8rsvh2iKu/LITXL1RqhHl7SiNdhYk6vRs7w7aj+wptDMQrVOLobGmhN1sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywsyutPjzTvgIn0W8He3mZ6v6mv4lY486h1iMVSS7GM=; b=JIENrv6fos+GJtbn6lerNDf66wDplLxDsIwiTZNrOO6pbvvXbju55VHlA2lWkvZVoW3FJFNpVH04e59iTbMNYqzLx7dFe+APx+Gc/eQ+yRECIb/UQ/Krx+u4Yzt4TqWsfN4t1/yDnVs6XSxTKHL0i9ERtxlkfyPOCh4vDkS/3r9oMzZ2TVDK7+HH9stqi10ZWGRkDK0tlo59L360q1MLNQeSlLLiP3WJbPf8tPzNZKyBQmsVLEI7f8TI35VIefxwCk1yT18fdSU+4uQBTZuBH5/w/AUme6hkyrgjrNW47/mSwrqRxITfcA979QQuLUvG3K5Kyqe1SmsulAuAr8LEjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywsyutPjzTvgIn0W8He3mZ6v6mv4lY486h1iMVSS7GM=; b=N2bDL4zSlGvfAWfsUAqqX1BaZE8ig28FZ8XS6JRfymQE99yF2MryKRcf1SH4zP429M2m8KiLTT9lUFFo2vBLxoY+BMvGsXJS/vA0/LBwKw/7pcV90/uePR2V1L6tKnNfOQrjNVW5JMjnYoJUAdvPTgbY6MjfjV9rOR6nxEuWiJA= Received: from DB7PR04MB4636.eurprd04.prod.outlook.com (52.135.134.158) by DB7PR04MB3993.eurprd04.prod.outlook.com (52.134.108.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 12:34:16 +0000 Received: from DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4]) by DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4%6]) with mapi id 15.20.2094.011; Thu, 18 Jul 2019 12:34:16 +0000 From: Breno Matheus Lima To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 2/4] habv4: tools: Avoid hardcoded CSF size for SPL targets Thread-Index: AQHVPWUcwqU0IjyR7U6cywWYetGUCQ== Date: Thu, 18 Jul 2019 12:34:15 +0000 Message-ID: <1563453220-248-3-git-send-email-breno.lima@nxp.com> References: <1563453220-248-1-git-send-email-breno.lima@nxp.com> In-Reply-To: <1563453220-248-1-git-send-email-breno.lima@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.144.34.2] x-clientproxiedby: LO2P265CA0334.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::34) To DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=breno.lima@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 63233cf2-6e83-459d-b54e-08d70b7c3ebb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB7PR04MB3993; x-ms-traffictypediagnostic: DB7PR04MB3993: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4303; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(256004)(50226002)(8936002)(26005)(52116002)(68736007)(8676002)(86362001)(186003)(76176011)(14444005)(6506007)(386003)(25786009)(102836004)(478600001)(81156014)(2501003)(81166006)(2616005)(14454004)(7736002)(476003)(305945005)(66066001)(446003)(486006)(11346002)(53936002)(3846002)(2906002)(4326008)(6512007)(316002)(36756003)(6116002)(5660300002)(54906003)(110136005)(66556008)(66946007)(64756008)(66446008)(66476007)(71190400001)(71200400001)(99286004)(6486002)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB3993; H:DB7PR04MB4636.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: R2Q+nG2DjqP/I3AkUb0bBCImY5m91dp1Yd41GcOBdYYm9/UaZw73qdvcIKkzMdSB77gq1mwih8ODIentFK6+FMDVnw5O1l+Gk6M9yOnOwKsSqe/QFLjrvM9G3WfLb3xoXV8JgzmRpZ1jGIjr72RyovT4d2yp9OmrzADVCsCxFUG//22q0ft9jfGweVq3wDmEHr7vYIx5lDWajgSvf3HRLd0fDUc5jmIAoMOoFQ4nHLIJlu0mYworoAJfTsT690eBOvcVmF5cLy43KCKJe2g1pBn9VsRJZCRlaSMAA24xm0W2SfE/+OMeZUAZLj04SnzO38O4znHs8GjGGLEJ7WIiNny9d/qFUA78SXmqnptL0AQB7Y9j4YZNSRFYmZ6WeHk7jtxVlAcVCtyVMU1Vpz3YAi9hOw6EekugUsX0bhZGd4M= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63233cf2-6e83-459d-b54e-08d70b7c3ebb X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 12:34:15.8820 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: breno.lima@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB3993 Cc: "sven.ebenfeld@gmail.com" , Breno Matheus Lima , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 2/4] habv4: tools: Avoid hardcoded CSF size for SPL targets X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Currently it's not possible to authenticate the U-Boot proper of mx6ul_14x14_evk_defconfig target: Authenticate image from DDR location 0x877fffc0... bad magic magic=0x0 length=0x00 version=0x3 bad length magic=0x0 length=0x00 version=0x3 bad version magic=0x0 length=0x00 version=0x3 spl: ERROR: image authentication fail Commit 0633e134784a ("imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devices") has increased CSF_SIZE to avoid a possible issue when booting encrypted boot images. Commit d21bd69b6e95 ("tools: mkimage: add firmware-ivt image type for HAB verification") is hardcoding the CSF and IVT sizes, the new CSF size is not being considered and u-boot-ivt.img fails to boot. Avoid hardcoded CSF and IVT size to fix this issue. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- common/image.c | 8 +++++--- tools/default_image.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/image.c b/common/image.c index 9f9538fac2..fc19dfdd9c 100644 --- a/common/image.c +++ b/common/image.c @@ -54,6 +54,8 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, #endif /* !USE_HOSTCC*/ #include +#include +#include #ifndef CONFIG_SYS_BARGSIZE #define CONFIG_SYS_BARGSIZE 512 @@ -369,9 +371,9 @@ void image_print_contents(const void *ptr) } } else if (image_check_type(hdr, IH_TYPE_FIRMWARE_IVT)) { printf("HAB Blocks: 0x%08x 0x0000 0x%08x\n", - image_get_load(hdr) - image_get_header_size(), - image_get_size(hdr) + image_get_header_size() - - 0x1FE0); + image_get_load(hdr) - image_get_header_size(), + (int)(image_get_size(hdr) + image_get_header_size() + + sizeof(flash_header_v2_t) - CONFIG_CSF_SIZE)); } } diff --git a/tools/default_image.c b/tools/default_image.c index 4b7d1ed4a1..7a26232779 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include static image_header_t header; @@ -106,7 +108,8 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd, if (params->type == IH_TYPE_FIRMWARE_IVT) /* Add size of CSF minus IVT */ - imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0; + imagesize = sbuf->st_size - sizeof(image_header_t) + + CONFIG_CSF_SIZE - sizeof(flash_header_v2_t); else imagesize = sbuf->st_size - sizeof(image_header_t);