From patchwork Wed Aug 16 11:13:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 801851 X-Patchwork-Delegate: yorksun@freescale.com 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xXGyJ5H8kz9s7C for ; Wed, 16 Aug 2017 14:46:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 71EBAC21DF0; Wed, 16 Aug 2017 04:45:35 +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=BAD_ENC_HEADER, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 7BDDBC21DFF; Wed, 16 Aug 2017 04:45:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 86EACC21DE0; Wed, 16 Aug 2017 04:45:18 +0000 (UTC) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0064.outbound.protection.outlook.com [104.47.38.64]) by lists.denx.de (Postfix) with ESMTPS id B1A3EC21DD9 for ; Wed, 16 Aug 2017 04:45:13 +0000 (UTC) Received: from MWHPR03CA0016.namprd03.prod.outlook.com (10.175.133.154) by MWHPR03MB3327.namprd03.prod.outlook.com (10.174.249.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.21; Wed, 16 Aug 2017 04:45:11 +0000 Received: from BN1BFFO11FD013.protection.gbl (2a01:111:f400:7c10::1:181) by MWHPR03CA0016.outlook.office365.com (2603:10b6:300:117::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18 via Frontend Transport; Wed, 16 Aug 2017 04:45:11 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD013.mail.protection.outlook.com (10.58.144.76) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Wed, 16 Aug 2017 04:45:11 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.22]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7G4iwnH014004; Tue, 15 Aug 2017 21:45:08 -0700 From: Sumit Garg To: Date: Wed, 16 Aug 2017 07:13:29 -0400 Message-ID: <1502882010-27829-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1502882010-27829-1-git-send-email-sumit.garg@nxp.com> References: <1502882010-27829-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131473323116605598; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(498600001)(626005)(53936002)(8656003)(33646002)(54906002)(6306002)(6916009)(68736007)(106466001)(110136004)(4326008)(8936002)(105606002)(50466002)(48376002)(5660300001)(81156014)(966005)(8676002)(2351001)(47776003)(2950100002)(305945005)(356003)(81166006)(6666003)(4720700003)(50226002)(77096006)(5003940100001)(2906002)(76176999)(50986999)(189998001)(36756003)(104016004)(85426001)(86362001)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB3327; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11FD013; 1:zEzEjQZ89pXf0BchpmsG5YWKiVmKEX87jD8YqgZ73?= =?us-ascii?Q?lWWDR5mHbddXFfbpw90YB8d0yxzOgmafkfSX67Zjn8hb/8pK6HKyGZPQXHjd?= =?us-ascii?Q?s1PjFN+5E2A9MVKwlAEUXuZJ3N47zTIyTKXaNLhe2qtnbpYqgE/0PnhfFn/u?= =?us-ascii?Q?m8J2UCAVfRFNd+Pet/aoo92QGV8wOJrogAXhu+ucxR3qZtv5kIoQD88zfV+/?= =?us-ascii?Q?ZsihY+NOqnawU75HNe8XQ04z9/NHIN3uUPXGyZGji/Rre20FViUt1/HEwo1G?= =?us-ascii?Q?vJSL2I6uoK4qHsVEfaGfoCHisxCiEI/t1HJRXsXnTI7OKmGdNo3md+8MotRf?= =?us-ascii?Q?vqNgTOlYq4WJaZRcrYsKkEVaE1Y7aw7KVrGe9ageUVfFhf2u/fwm9Un4fY4L?= =?us-ascii?Q?vWTpx1Hn2ivpOvIXfb9aSZXLE5o/MEJjGTNqitXhx4RVIw22AfSjYTjpl9Cj?= =?us-ascii?Q?f2xYRyxOS73RpZ4gIfhi3hvxVvAvIaxFlhWOM1l5WWMnOugIJCcltxGDeNLz?= =?us-ascii?Q?W+Ya2EjiCqgpkatLgVzdSe76WEJcDx4w/Mahog9eInUZrwuR656AIqcxXTXi?= =?us-ascii?Q?2Twp2b/2JkARO0dPd5TFwQF+u6SYk9Mn7q/u2gILfZc/uEqY+ck3TfTRPeX7?= =?us-ascii?Q?GZDyZrY20SIW1wrEDiZXFE7ejDhXqGC3jnEB4wI9lWLkAIgbQS9NYfMgdy4y?= =?us-ascii?Q?NiNmzwEmPIegO58ZCS0MCBtc81iOqMQ/Wd/JhCoVwV0Cf2U0l1z7mYhJkfsp?= =?us-ascii?Q?fC9qkNLSHBOs9VnlOugxoGgKhZtIY+6xB+Mg1XR+9V7xnemOleU6uW97k/ao?= =?us-ascii?Q?FvPC0XeWaiZrk+xWetIEs84L2vjsoirtQZom5UQnkKLsFILD/bml9wwLogEP?= =?us-ascii?Q?X8PHFprRdmTj4ADffG4ObGntEvKVuE4u2gBFwZ9so33GeSfRAYyzxhzxIQSi?= =?us-ascii?Q?HjeQpDqAD7IbJDS6UxDPm9MSyTHkoLBGtoYoeeYTg=3D=3D?= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2a896ca-4d38-45f9-cf3f-08d4e4619442 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR03MB3327; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3327; 3:yJVyptbur824frIe4sqqu5dAo0ebW/hb6bDM3Q/NlQYZ+N8cL+1eog31oCKsdpK0hWTMhJlVaqT3KUbBmG3fXDu4J6qRGqyAYjKQ0jORJ1Jy1T1480pxl1w/5ZjWZb5MZUw/t4dZqsY56HyyMJYjJgpsGVO6KYIJy5zJKD80AN9sas38WyCx20nGhWLKMRSqZyR+l9SgA68QI8RQFNlN9sThRFMWiz/a02P2e2cAVrMIr+sZ0jzrilu5DkYbzDTgm9ObtBsr3KZqs+aGvfvSXDQ+2LNVh9fUP54jbgZvg1tzj4d/gkqSPjfyzj2eFu1OdrGhcUu3u7TrOTOXVsxioPxrSuKnnw8h2YpKtjcEV/U=; 25:OCh0IoXyZoWEU0J35KAuyucfK080QzZUVSdk3ehkdh73/LRH/S27w80RsfzG6aQ9gYKQYUV/j+GkA3XjpT9JMrIJi3zTdMnI96UI6U9wprn6vqvjlELOOzfrjWl1he35iDxXp/ugZdOSE+Shp/p9o8MPEb4BEWg8GlwIMWMIQ+7mzkCPUNVnDmG7+Wtaijwu19i5L8stMxmlCzk7RCsl3YJupspwvBoerT71sPdgIs0pylaaNhD8I2XHniNlv8o1H4LVr0iuasVXlUgZrvWm8RhOyS8itICR+cBLoY9VcIIBloiqPF5/Z4s6ZWlWW2d0CgmjlKEkYg3Kx0sCUcMeSw== X-MS-TrafficTypeDiagnostic: MWHPR03MB3327: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3327; 31:pnbINYNeInBqsfARh8OWAx9JFVMtxXzCgCy8HPJDNa6fb4j4r954cZoitI0EwmLtRFQMf6dUbM6QAsqKoGoRg8nCzTlzElaTvXAIR9GUjn7hucdp4hhj3g2UObBSoL8eaIE5KQv0aUvY+7nwgCeEpdRuJocO4mrv+7zS2661KwVm/gI1A+skUC/3rvJDgp2YMewc+ldYoi3jFoQy5gACn58iZt1OZC9p8jyH3zRn+Ys=; 4:Ssq6QaIUoK0jWBh5PKxXJr9PNgTiiMRZ/HII9ycRBKBd2CuR1hqoKSiMLVWj3iic0aUJ/LaIejueHu0sq/sLAICGB+2FyNdh4HwKodmMNwcaPlM0Qp09GDcOXHMRjE6DodoG1ujMvPgDyIrjxJxL9dA/UahRRTkWxj08cA8sSjchNz8uVAow9Cv3eU+Pc2mZHfdR5Xpqg31kPi12fbCunXyHakeZ7wpDhr6vKgfNANAH9GcAiAsGCiH8Kl/q8+vbcQNI/Lu7h1ejFmTxZeuQvtbnyDs+dSx9JN0Nqhp8vgw= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(5005006)(13016025)(13018025)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559100)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB3327; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB3327; X-Forefront-PRVS: 0401647B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB3327; 23:pMdgx4fVDab+DKbUbqNvlIaKJHD7drEwEBcdyvlUJ?= =?us-ascii?Q?OLVzE5R5Y1Lg/Af0g/YJ9UswXHEovNdUo/xEqyFx+i8XU3LoZXTuw5oQ8C4x?= =?us-ascii?Q?2ONnBv5GYw/6ewqeIXf/TsO7goXSv27wUdEjMKpw9N669jqmzAPrZxMQjDqe?= =?us-ascii?Q?1f9bAXDa6gFaUbAlpODagZtf6I3gcAS1/2EUEyb31cDHx5yBZMeYd/bQNOxV?= =?us-ascii?Q?Hp3bXTZdZxQ2o+GRssU1YZUoe2QEB6/miczlDr+nx7BQbTTSwOScJIvdCycn?= =?us-ascii?Q?teX/nrJ1MeKqnmQLCjv+IRlYaPN586EcHu596kNHfj8klw5AVVR7f/bnKVvn?= =?us-ascii?Q?IqFhg0962Mq+ORJnWVq30HnHXKQMzZ30nfFHv3vEcp/xc+70JRzWvGq7tW9u?= =?us-ascii?Q?qF49fX9a3t8beiCGM5qC5/sxB2jG1zwBauutijbp3Mj4FE6iFm0tzbFPxAUm?= =?us-ascii?Q?zKsrOHXWyukVVV8fF7ZcwJmH78DuXLkFBT244+71OK4aa6R+84SPB/LBdlOP?= =?us-ascii?Q?9GF1o7fVZYcSiFrCTzzutXUdPWCMjcFmQCfkuTWU/5c78BnLCKqGOsz+cnR0?= =?us-ascii?Q?a5JZsdLg79Zkga18M2WNhZxqz5QFu3oWK24fpqLYeBWtcxD6+TDJVjoVVrJU?= =?us-ascii?Q?jWVU1W5KtXJ8YI056MbmaI4IdQd+1w2oUmosFhRVG9khHSBSJ0ofIU5jMej+?= =?us-ascii?Q?pIRcyd5nQhE9186Xxk/CgTNHh7P696vWlnhDvYOE2gXsnhdsLh4KmG2o6XC+?= =?us-ascii?Q?Xavntnp/Tz0qvpqpEWPHqTUTieMP5sLs8tsNk6wZJBD6WhwZzGU+ZZsQ+YPq?= =?us-ascii?Q?XZszYqX1pa/mctxeU45jQnwsp2v6ILn0ETdVV0dzsL22Jh55cfdrctZPxPVv?= =?us-ascii?Q?0D+bzy5vmPWLPSOxH7IRCwq1VMdWCXD/jdBvoPmLIQXb9izfHAFBhFuVk+pp?= =?us-ascii?Q?7XjO01M2YNJopEB+ynjNvfSk3nlQZNf4JvoUR/edvILeSf/4SVi6Hd5oPkZl?= =?us-ascii?Q?kHaGdQ9N+dQxsGOcHQM1h1Dx8tJ4l2nzNrA+n50T8JxmbHIUdggZxWlAWd8B?= =?us-ascii?Q?mW+vi5gDC4d8pOUN1bDiT04ctBAF7dVbjj3boUHTQIJRzdDJU0fldXo66zDo?= =?us-ascii?Q?06jEDcelTTsWLC0gnjPpYRsHUgnb96WOJD/tmxzIHBcbAEQl2n3N1eUafJmM?= =?us-ascii?Q?Dd/eIp9OLhDXro=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3327; 6:E5WxKsqdvsopGNhUuUllvFYBzYYO3X8ZYh3VmD/+Nviu64fQHClnUxP/raPKj5QulOZqsyrjDboz+dze38ULqWZMARTuBrun6iDloKX9kwtzfD3KiLzgxn9y6LpJu/oLAm9YImxPp4J0L2gL/0Z1wZ0/sB7Tik+02q5hcn1M5inj1anYFS/xk8KxbYi7ykiQOgTCpHnuCDxUgmYW98K6jW48geCI08XQBvOClPQGotvWTKXxJg3uSgTpWBCq4iLDOSOBWNV/S08Y9htEafvI0rIGuNDDcx7933oqAqfWkuVCNDurMzC8aoDeA2IrC/lL0hunlIwyppwMI33mA1DkTA==; 5:N3OP9SPujr246rj+80YTh6E/tvNsxtmZgKUyWbC73bmngXwxI0xVKm/J/LezmEzN5lZMmJeGqia6CaNsmM4Vm4aZFuBt/FfRaexHUQ0hqRpLlmOeMq5l/WOfiskURaRA7SVLSks9GE5lOc7m/O3lKw==; 24:KzryBC4n2faV2NRNidVA+38+9pdradkYIFcIlxFHEJEqHRiPkLWL5kedvYW/t2Z72rwdmOm5qBaJpq86kamPOEg0TQyyYrPZMeWiLXRoY0I=; 7:Vn09X/llxqYRnrTZp8T/RlmS0vLv9EArIlzz8jIIXQZH8CEkFuDFzjuxg6M5ZwPTnxtuvWilYeYLAwbRP7jdd7YvY8yWU9QbpC3N7EVv3rXhhTBUmrv0K/y9gtTsRB0cmbbyQOgpKsbPVV5Q9aPFZwtYUtF0a/4jGDu+mCOYnwh2j6s/sZyWMQbDppEVnJNdLHND5cJG737BVbioF0l4wTqWcwmXO8wDfxwlCGWH+vw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2017 04:45:11.4733 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB3327 Cc: Udit Agarwal , ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v3 2/3] LS2080ARDB: QSPI boot: Secure Boot image validation 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" From: Udit Agarwal Adds header address for PPA to be validated during ESBC phase for ARCH_LS2088 and QSPI_BOOT. Moves sec_init prior to ppa_init as for validation of PPA, sec must be initialised before the PPA is initialised. Signed-off-by: Udit Agarwal --- Changes in v3: Rebasing of the patches on the top commit and removes conflict on CONFIG_EXTRA_ENV_SETTINGS. This patch supersedes https://patchwork.ozlabs.org/patch/767679/ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 ++- arch/arm/include/asm/fsl_secure_boot.h | 5 +++++ board/freescale/ls2080aqds/ls2080aqds.c | 7 +++---- board/freescale/ls2080ardb/ls2080ardb.c | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index b7549a0..f14b1c8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -197,7 +197,8 @@ config SYS_LS_PPA_ESBC_ADDR default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3 + default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A + default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A default 0x680000 if SYS_LS_PPA_FW_IN_MMC default 0x680000 if SYS_LS_PPA_FW_IN_NAND help diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 63845a2..ec6463d 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -72,8 +72,13 @@ * DDR memory map */ #ifdef CONFIG_FSL_LSCH3 +#ifdef CONFIG_QSPI_BOOT +#define CONFIG_BS_ADDR_DEVICE 0x20600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x20640000 +#else /* NOR BOOT */ #define CONFIG_BS_ADDR_DEVICE 0x580600000 #define CONFIG_BS_HDR_ADDR_DEVICE 0x580640000 +#endif /*ifdef CONFIG_QSPI_BOOT */ #define CONFIG_BS_SIZE 0x00001000 #define CONFIG_BS_HDR_SIZE 0x00004000 #define CONFIG_BS_ADDR_RAM 0xa0600000 diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index f36fb98..be4e8ee 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -226,15 +226,14 @@ int board_init(void) #endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); rtc_enable_32khz_output(); +#ifdef CONFIG_FSL_CAAM + sec_init(); +#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - return 0; } diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index df2d768..4c42c73 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -231,6 +231,10 @@ int board_init(void) #ifdef CONFIG_FSL_QIXIS QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); #endif + +#ifdef CONFIG_FSL_CAAM + sec_init(); +#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif