Message ID | 20210325093036.3270101-14-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | f217470b392806be340e9c03d46e98bb29d7caec |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=YyRVx0Y5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F5g1T73gHz9s1l for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:34:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E1D0828FF; Thu, 25 Mar 2021 10:33:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="YyRVx0Y5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A21D8289B; Thu, 25 Mar 2021 10:32:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::62c]) (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 895E980462 for <u-boot@lists.denx.de>; Thu, 25 Mar 2021 10:32:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BeiQbKAWdt81/OJ13IPz7q2jIbu6bp1SEjvLPclwZjJTJ2sFOpnbNuQ24x0AvJk4elK6inVt6MVbO/R1YZwH4bUbQBYFkOqBb9hAEA04pL8tgSDmxpC6PtfI4jS+G62GsH7pUfKg7HKeQGmcoiHKfy6A8XdedEeR63fJjLUW/hkaaGVyQviroV9nh6kAze0ZxoUY1U91Bos3heoT5odGStSBnlR5egiIlbi32lXelgSSbBOXnGA0BRAL65X0rCf2P9flkpUwioyiIajlVCT1MgHqxgFBuZSFJPZ6Z+io5mB2M27Ek07AkPMMHVWi94grW/kZfU9pg+RQrhuIsTCMQA== 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=hAks0Eyiy0NmZZKrRSPxXbflbwGqIjpflQo1KNQmPpU=; b=mSyH7Rr52FJjAvSZPFba5Bopp/tA8bxp4WseO6tYyHT6Cz3cGxLf5ITymVFQ+7JA6CLMXa6MFOApyDVBtmiisiXoC2yL2bbSoqB4iHURT/VndP/5RNQkyE1LZgo5aqGYB0/i9JDJun1FcrXFq+fXsMH1ij2mAj39ymmoD7MGgx/w3nBr8rQtgCoKRg7Ia9W1jeH0qjdpEpw3bl3wu51c4n02yPs4HUx9RJawxZVwcrUxTUAy+s/jKjS0PvfE2/nTIOtG6otnCwfgjstoJNs2CB1fWmKfMcxeOKroxn1um+h3dhu5qlcUpOCOwksnVeMvK/s6ENko9wDRFGjBO8QYoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hAks0Eyiy0NmZZKrRSPxXbflbwGqIjpflQo1KNQmPpU=; b=YyRVx0Y5QKXrrj/eUhSk4FbGiKTSB1vHV77zXuZVAGlmS+8XdZWZJKDiUFjbLY3SofeliSxjzXZzOHHzHX7WtSyba5opwHHjQzkfK/Bp8DhULaEamzdVq6+YTZ0oFY6K69IFfgFT0oR+UUoqvTBwDx68gSUSl2g/DUF/6ql+ZFA= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB9PR04MB8316.eurprd04.prod.outlook.com (2603:10a6:10:246::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.24; Thu, 25 Mar 2021 09:32:22 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3955.025; Thu, 25 Mar 2021 09:32:22 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Breno Lima <breno.lima@nxp.com>, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 13/37] imx: hab: Check if IVT header is HABv4 Date: Thu, 25 Mar 2021 17:30:12 +0800 Message-Id: <20210325093036.3270101-14-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325093036.3270101-1-peng.fan@oss.nxp.com> References: <20210325093036.3270101-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.16 via Frontend Transport; Thu, 25 Mar 2021 09:32:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: df7f4c3c-bb1b-46af-8219-08d8ef70e4a9 X-MS-TrafficTypeDiagnostic: DB9PR04MB8316: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB9PR04MB83161E1037D86A800D9CDEC1C9629@DB9PR04MB8316.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bknrs5QsbgnNODNz46ZrEiR8tyBti+6eCBCpDFtaKlkXL2BLK8BH9HfnhheoFDKmFrHgOccGsrTPRKjahFEWvQJrYXSTbSMznq+kVKjdCqyPRLEiAP52MNmERkAWRTxpJ1D7NIUTutyIprunNX+GrEIaNSmMLwaRFKU1dRqstE5golEEqLYld9cI7j5L1MsRW1bUUwKDKKlKxmPSX8qSke/TKWgOd4C4iBJZnDpp1RJMC4PWrzhJX8EzNV4A9i10mWw6YhOR5v99Np2Esa1m3uRhlEfFvPLCPx4XMQo2VroTxkncRDXKHp7jLAzm/qRQQlYbRsmcNoqf1kF4VCZ+8o41nnnGYFjCGvk/3LOYh8R1ynaaY1jDGesX6KGbRAgObAaWtkeeMjddAErtlp930R/TKFvw3VDYEjKi5r9xjl3r9Fl0Uc74/USYlSLHbp+jtaWFeUglXEdl1PKv3/ERNYA0e001Cx+F787p+TMgm+yU+8UE55SO7B2/2cxLcVjBSJu8l4vDuz0OpmARF8Pk+4MCtEQ9dxUJf3B0Zv/KbnWBW8BT4aAiHtlEukRqPct5CTyo8yK2kYRQyYCsUfs6pcGjh6YzEYGLpvdHBAS1wyFstD8gKr/w94QTj0RWywuHBt+8VXGIVdpS7W599XZUEO1aDXWB7w230MTrgEjUZ0+TtY9oEF8/Cwh5+33YuhFg X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(396003)(39860400002)(366004)(376002)(26005)(6512007)(2616005)(186003)(86362001)(1076003)(6486002)(83380400001)(69590400012)(956004)(6666004)(16526019)(38100700001)(5660300002)(8936002)(52116002)(66946007)(478600001)(8676002)(4326008)(316002)(54906003)(66476007)(66556008)(6506007)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: w75QsVQyT5JNOmm8H/TMIPGKpv94lgwip4HNPzHwnOOMqWhdRM3KOklzlOc+Amq+fE8EO+E+qRxoukvpEsLfXkE+QdpKLitMjip0lyDNizR19eS2rC+oEsSuBToUDnn3qOEOWmgLOcj2Ao6FgMdFqu7FV5Jn3lcqAYIpGV4jk5YUYvGsXrQyvid9NZ2SeYcnXeOsYLkzedcSwasj/bzLqvl9XQDnLJiF3kPwlifHPAESKMfqiRyRK1pcodSnvKmI8UClx5jMf/l2A2lQbA8sv9zJuKPHVe+wvIr3g764oZQDn64KJLSRrLsao+Q1q9P/vr2BeZbECWByZ0H1HIjo4z5uXb6P392yGGjqQrFq7T3ud7Lo5OG7EnvcPglz11JflTe/Rq+M1rQpbsbgpFfAWgdUNzSknZdYB/4cOGt4aeloMzLgPTnfg4++g1PSpoWiA2A2JEZBRGxgpqf+RvIvoDVJk4h2PTXSktK6hAZmRWExpLRI2/+umWJ2sIJBW8u2MB91eoSp0AwdqU4+Cc6A87HXr1UUdnoQ77uj5keLccGk0nYsrMn2Di9r9wlA1FJFMaqBzef1Q3IgnZ8CKpcm9bI/3aTfp4vltFd2aQsB7GTBo9cZJb19QRsOehwWh+8VYxUCuEcx7bM20+n1JrwtOD5NEx2J1fRatFy2CkUysCcJGJXLhO+ltATBs6EA8ZD4Ytj1XinWLb2tRZEp8V3asvrfIuKIOK0+m0J7S0IK6wwwZ/lI3EvO4+WUh1/vmBZl1R9tAyX/h+hL+kOT2DTsvjapRu5oqR7evdyBq70/1AQbmWQc9zzo7wSjCg+f2buRMDuwBSA9y2SmpP5Dl6Bik6ZBewDuSNWYwNHMwN2L5sfZWzOxcrqqgvlfaU/JcZi65SZ1vheCabMLSpNI47seGczJWRuA28KyZeu25c8Cp9+YJW0b2wD++0eo4Yz7UMdhqB4AnxJokK+MbSf1Hvt8t5UaEdfocgWTimTrVMwhl6GBcGWna7SwQqmFrGsis9+yTwak0yCCuGv9yf7VsuutcjmJE34Qm2VCvsKiHnf77hjIhsHMAfBbnjEkJKCo+yr3o0HUtxT4s+Prx08qxl8x4JW8X25DQwYi9EypnX9KsEP13VRvEfU3PUmtog/ByIlPGS+RY+U881cPSu0XbgGi3IuuBvGWu1p52MjcrLL+kStDwclqTubDQqbcy7aHapQt/5AuDjli/kr36JG+WdHYSDWGogYZxuNv8Z12Tb3MWERT9Fn9EJOU0Uc8ZEiEV0V3zGR8PMR/giye1I00RAuPU0S9IKGErAscpJQsszvxiMbqQIh53JmGbHLMa9PxnX3PlFvLpet7bfvZ4f6cxeY7jQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df7f4c3c-bb1b-46af-8219-08d8ef70e4a9 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2021 09:32:22.6504 (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: 97IqNV4DKfriSvRlRy53gzOjmPHJqqvaVU5N8YjvehODsmNf5Y6/LR9tQOfHcp7I4LqwxITU7oUyApIsYcneww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8316 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: hab/caam new feature and update
|
expand
|
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index c4393ef443..62218818f9 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -18,8 +18,6 @@ */ #define IVT_HEADER_MAGIC 0xD1 #define IVT_TOTAL_LENGTH 0x20 -#define IVT_HEADER_V1 0x40 -#define IVT_HEADER_V2 0x41 struct __packed ivt_header { uint8_t magic; diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 264e148ba6..5f46df0f8b 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -45,8 +45,7 @@ static int verify_ivt_header(struct ivt_header *ivt_hdr) if (be16_to_cpu(ivt_hdr->length) != IVT_TOTAL_LENGTH) result = ivt_header_error("bad length", ivt_hdr); - if (ivt_hdr->version != IVT_HEADER_V1 && - ivt_hdr->version != IVT_HEADER_V2) + if ((ivt_hdr->version & HAB_MAJ_MASK) != HAB_MAJ_VER) result = ivt_header_error("bad version", ivt_hdr); return result;