From patchwork Sun Jan 17 09:39:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aneesh Bansal X-Patchwork-Id: 569236 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 96097140779 for ; Sun, 17 Jan 2016 20:43:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 33CDBA7867; Sun, 17 Jan 2016 10:42:52 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1uDmvC7giPr5; Sun, 17 Jan 2016 10:42:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 63498A7848; Sun, 17 Jan 2016 10:42:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E80AEA784D for ; Sun, 17 Jan 2016 10:42:46 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mQ2AK30yYqo8 for ; Sun, 17 Jan 2016 10:42:46 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0092.outbound.protection.outlook.com [65.55.169.92]) by theia.denx.de (Postfix) with ESMTPS id 10E8CA784F for ; Sun, 17 Jan 2016 10:42:30 +0100 (CET) Received: from BN3PR0301CA0034.namprd03.prod.outlook.com (10.160.180.172) by DM2PR0301MB0749.namprd03.prod.outlook.com (10.160.97.145) with Microsoft SMTP Server (TLS) id 15.1.361.13; Sun, 17 Jan 2016 09:42:28 +0000 Received: from BL2FFO11FD054.protection.gbl (2a01:111:f400:7c09::159) by BN3PR0301CA0034.outlook.office365.com (2a01:111:e400:4000::44) with Microsoft SMTP Server (TLS) id 15.1.365.19 via Frontend Transport; Sun, 17 Jan 2016 09:42:28 +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=none 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 BL2FFO11FD054.mail.protection.outlook.com (10.173.161.182) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Sun, 17 Jan 2016 09:42:25 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0H9fseB028685; Sun, 17 Jan 2016 02:42:22 -0700 From: Aneesh Bansal To: Date: Sun, 17 Jan 2016 15:09:36 +0530 Message-ID: <1453023576-17845-8-git-send-email-aneesh.bansal@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1453023576-17845-1-git-send-email-aneesh.bansal@nxp.com> References: <1453023576-17845-1-git-send-email-aneesh.bansal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130974973471879926; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD054; 1:Jch8DAj0m6XIa+ripzzXlpzR/9nWhqOFqqS+GsItAzP5SwUMsxrdOIN+KqLcjxFypLKF+TtjQZYqNRlRIdAG4G7i+D5JTT1pYvqGzihJYprWi4BNjr/G+GTHmjzQirOAU/xkc9FkT3VDFK/Sbl7yHBtmlJeJqGZRrOg2eDUvipZHarepetly9NW/p7xZPQwzrU5ylJ06T+ROxJtjT8KJDjdIeKOCY+rRcFne4BHibxFp2oEvt7TIn4xDLPlmW3e1Sgdx083UXFGbHbxkO/kccxL64FpRl8tzfynFAgthnwA6P3eNvel7QMn6blGHeHSeP1HcLaPwsKHTyVaEbWe0YRj+tGuEGsPBnO3jthLJI2iwp85Em2EVauUcwq+C6HWH7EaHnnHRKkvC2R2YFcXo669gFyI8X6PIWsxErAB+KOAWf0JvU6EaNFl3kafp3GquoESvAYN7F8vefqUpQ52HqhTKiIJZnL3a8EGZO9FnHCE= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(586003)(86362001)(76176999)(87936001)(19580405001)(19580395003)(85426001)(6806005)(229853001)(4326007)(104016004)(97736004)(105606002)(5008740100001)(81156007)(106466001)(11100500001)(50226001)(110136002)(2950100001)(50986999)(47776003)(5001960100002)(5003940100001)(36756003)(48376002)(2351001)(50466002)(92566002)(1220700001)(1096002)(2906002)(77096005)(33646002)(189998001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0749; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 2:zzRRokUMpoNK2okEzE3mRUDywbBpheDo0VSX8IOL1pHBrpYLUqViqzTEXmPjuUJrGmlvOBmT7BNvMOQt6gqe8Z+RtbABWqhvWyCwbA4xAB3zPhJ71k4478vZMJik6vROf5lo1qlitgAjKCxZN/hQ0A==; 3:4QKDR2nHgmNcVbt/Jl1U8YcbcXP1a1ERfqNQVEkb9i7tLbtNon0KZEXbxUt7sgBicSdKSzSxWLWwQNpIEqBsALNJblHxf38uPhlwdMLU1M3YC5y3CW3APoz8tqOro3DCxAKF0WyyNPncLdAIpHW2fP9fL7yqiMm4YVGu0G9xLVm3cjiGALfgtg5U6IepM+5hrB1a4auKtw8+mZqVFZom0zV5Z59EB13P82urZiWaF+Y=; 25:6qmzmLUOaLl1zqDPYjVE0iTlVQsNb/w9/nJjOmPKxiGYKcQcG0c0XHIy92cm8mM6rKxsXQa8Zm2eDymhlCgcDvlLEa5CwUYG3zS5qrQcuazaypnQG+GfYrUQT1eqxGxg4YmEGmMMIfoaewsiT84AFy9BmUyXUI+ySIpU8sKrSIircIGuqHQNGxKBCUvIKuOLrycfgrJDpAnXRIFZFzsT8Nby3kwJrwf5JsImtPpg7QAFXxW/2s0ZVkFk3O9j5erT X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0749; X-MS-Office365-Filtering-Correlation-Id: bce99510-27c9-437f-9197-08d31f2282b6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13017025)(13015025)(8121501046)(520078)(13018025)(10201501046)(3002001); SRVR:DM2PR0301MB0749; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 4:8kPGusliypqMD4Qvv8jGX/lz5Aj/T/yAC+Bi9KEt6H+EZcYQUekq7j6QFLxHZ/d945jq/c65LyGlr8wiVC6Q7ZZZcBSybU6vhLIfTU7w3HuATVsABlKth24h4Lq+9cop6FI9w40hoSwvuPqML0KNIFEQ5vIrH/WPLdB/vBnYXCcN5LYb7RW+9/X1QWwH/LS9cyazJupmCiB1m+nc5UxQ5xJKMADnmWjkncGQZEWwLPILvx3YxoTgvzU+RF04yTSoM1zYAh7Jl/6Bc00MM4AQcGsRFfqugw2eDmucekYHwfwznxhmeJ9pM9YBTG0XO90+7YF/qmSPVz+VGNAtMUrhlpshko90oxu/iRZP4w9PFlbY+JV4Yawp6X5bi54R8YQ4SOJC370UJSDFSmVOxPiWCXD5f9pvUTuEVxoCeu9rDm252pQijMURw52uVfaUBFrgF7b2C4MgB/6n0GDbOBQrF7/QVeVSC2cXgWvLcufKAdY= X-Forefront-PRVS: 082465FB26 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0749; 23:P538O1jDSAa96ngQg/P23iK7iQTJ5a21QJdmWne?= =?us-ascii?Q?urV2PrKkJFQwOV5llNZrXcmclSW8mslY37IPWg59GX6/3dQKh9INXbzCQSa3?= =?us-ascii?Q?NyPyg/ZchQIG2AFzTYW2tMEc5ZOwIbNnoCRWN1zVc8LymGnPbBx6GmxF5Ble?= =?us-ascii?Q?UWkuK8GNVL+AD+XdIkb30m7jdSCAWo/no0GQtnCcUOWn79KhaJ9LPaNXXgum?= =?us-ascii?Q?ADYgVrPBInuD55E0UT+UK0QEb/uU+FRYwT00L+OjeVcdvJgh5jvW/hG19YQ3?= =?us-ascii?Q?Mq58PicN5dAfkESv13OEREbxAZt7+qKH0uUnyppDNBzd2LsukwIqvy7Sn+6L?= =?us-ascii?Q?2U2wrvzAWi1rh57BlT67FOoNtfMdHsxZPUrefsZtw6u7o17/gqhMmT0p287B?= =?us-ascii?Q?cT1blyClAIguXiN2RumwSgLxNPhe9OlwFae8Orw/QVLTxcdjQ/kcBXQppv++?= =?us-ascii?Q?QJngTMsOOWzgY2BTGhy1WZ7JqWfpXTkSoGR7jIs9pIJaFDNzXSeDTRWs4aiu?= =?us-ascii?Q?jw3e2cLB7FkylKrRFFh5EBHf178sY2RaTPCX4cFpeW2NDpOJkbOAp9IPIA9L?= =?us-ascii?Q?KJECPf6e+z2rVGaI5607ToUV6bE7DzSp365RzayVjAELRRIVb9haGMWlfinp?= =?us-ascii?Q?O22/S4pca40K1mAZJbVEsDJgffJIL0EOgVR8zwCni1fnuZ478tEG+helGD8y?= =?us-ascii?Q?ZmDu47ML7Hk2Zre3nsDQyOTfNHaFgrjUbCzy9l8Y5tB6P0S+qIm+l3rnB8gA?= =?us-ascii?Q?x23SrAtZ6L6v36srHsji47WObHiiLFYhboF+kgQ/21pdU5M2OWK5km7vyp4s?= =?us-ascii?Q?+NTW0uGBry14N0UBTI5HiI/k1J3UOR7XMaBBa3NCbtWQqsXU5jDSKVol4sFo?= =?us-ascii?Q?8kQcTkTy164DjPZsKtbK1kvCPvJoXg5Hb4c2IsTVmsohiSMobEOW7aqkda0/?= =?us-ascii?Q?827zvVikuxO2rrlirtkx6XyWbc2FB8iiW/VM84M8y8gRzz7eGz+fGbRpBt1Y?= =?us-ascii?Q?gSgsG9TYmGF6xsyw6v7Va49gKhajgxFCjsZ1RRgYFIIHH/Jy+7AeVq4MDuiN?= =?us-ascii?Q?rLgnsEo4f97d6sBwIxUl2+vdFY6oCevEIAiFQkUz3ch2HKprpFZimSbahNGZ?= =?us-ascii?Q?VtmHYf9Yq5v4=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 5:Z9VxuP/F5PNbOMjs8kBDheVwreA0HpYg2pK3qNcGalgwpmUt0yrEjZnb6Zdn3ld/Ne9UkpYk14q/TTqj+il32smuQnqw6UfnwsZBsSc3bRwT6ghN6WzA/YqWpoalXGqIzYxnoe3yyRgKp+3tXNxVZuMDNGVJapBvcMnPKy4QdQY=; 24:qfnoF+Men4P+GQn3YU3PUU+u83C8mSLdWaCK7AVrtDoeBceMKB/J3c1DCoY4a/7/PZb7aXzMiGyU1NAGz9h7+FnrmAlNXMbWOJr8DQ+HB6g= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2016 09:42:25.2536 (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: DM2PR0301MB0749 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v2 7/7] SECURE_BOOT: change error handler for esbc_validate X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" In case of error while executing esbc_validate command, SNVS transition and issue of reset is required only for secure-boot. If boot mode is non-secure, this is not required. Similarly, esbc_halt command which puts the core in Spin Loop is applicable only for Secure Boot. Signed-off-by: Aneesh Bansal --- Changes in v2: None (Changed the Sign-Off with New E-Mail ID) board/freescale/common/cmd_esbc_validate.c | 7 ++++++- board/freescale/common/fsl_validate.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index ca7c737..dfa3e21 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -11,6 +11,11 @@ static int do_esbc_halt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { + if (fsl_check_boot_mode_secure() == 0) { + printf("Boot Mode is Non-Secure. Not entering spin loop.\n"); + return 0; + } + printf("Core is entering spin loop.\n"); loop: goto loop; @@ -64,6 +69,6 @@ U_BOOT_CMD( U_BOOT_CMD( esbc_halt, 1, 0, do_esbc_halt, - "Put the core in spin loop ", + "Put the core in spin loop (Secure Boot Only)", "" ); diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index de40081..8fd6dd6 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -370,6 +370,13 @@ void fsl_secboot_handle_error(int error) printf("ERROR :: %x :: %s\n", error, e->name); } + /* If Boot Mode is secure, transition the SNVS state and issue + * reset based on type of failure and ITS setting. + * If Boot mode is non-secure, return from this function. + */ + if (fsl_check_boot_mode_secure() == 0) + return; + switch (error) { case ERROR_ESBC_CLIENT_HEADER_BARKER: case ERROR_ESBC_CLIENT_HEADER_IMG_SIZE: