From patchwork Thu Apr 12 10:54:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 897609 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=) 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="f4SKxg6W"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40MHnn5KQWz9s25 for ; Thu, 12 Apr 2018 20:53:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1CCB8C21DC1; Thu, 12 Apr 2018 10:53:16 +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, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 111FBC21C3F; Thu, 12 Apr 2018 10:53:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B60E9C21C2F; Thu, 12 Apr 2018 10:53:12 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10074.outbound.protection.outlook.com [40.107.1.74]) by lists.denx.de (Postfix) with ESMTPS id 22824C21C38 for ; Thu, 12 Apr 2018 10:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9Bhxp6VYvlZeNyCoaRfJEFGi2v0fY8fJ+dJAGM2daZg=; b=f4SKxg6W5+2C6jDTkh5GRz5FKQ5EVOoXpj8gsyRNlcVypoVAUGSe2GW2QknnfOgC+GaRHdsJjl+T9PjauS+r2O9bX4TQslCUTZV68pNnTQSk7soouqCEuAMkft8D6H18VDeb0vmqpKXUGC+9iCJiv3zsDssiMEmTVXsL6JtCL0s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ruchika.gupta@nxp.com; Received: from vinitha-OptiPlex-790.ap.freescale.net (14.142.187.166) by HE1PR04MB2956.eurprd04.prod.outlook.com (2603:10a6:7:1f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 12 Apr 2018 10:53:09 +0000 From: Ruchika Gupta To: u-boot@lists.denx.de, york.sun@nxp.com Date: Thu, 12 Apr 2018 16:24:35 +0530 Message-Id: <1523530475-23028-1-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0018.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::28) To HE1PR04MB2956.eurprd04.prod.outlook.com (2603:10a6:7:1f::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB2956; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB2956; 3:w/Rhf7Bnjc9BFVnIazhpjBQUWdDPxMgeOlPDGFKU349AfMg+OexQNqAItq1urOiFMpGDE12Nxq8ZDy777QvcmI1ILTkgRlOt2z/gPSYh9Cls3uZDJKX5bGUA7hizE+UYPtbweaGoBqS6xBSAEqLjNHqv+6xczO8iOMI2LB1OiylR/CfQvqeyaVMi0a9Qc0v4/ydFodAE9GVAT1xoeDF7e7iImyWLOuJKTozkPNQBwdf68o92m0IG2TblMyOx5dfT; 25:v7pQnTOrci0PSy8A6yV64zMS9MZ/uPNNCLSnB1vFQussEut3lDrF1dLOHDbDeYxjq5JOJ0sbDctJ3Ri0miIPIzaviNw93/fTmR5Pbx7DtIjN0mTBtyrl6/gL5OZG9TKS2cMReRg0NUoKbY3WpNN2OrHmp3IMtwFDeETkS7/6gDJNXJBXMq9VhkAFCNSJc/q3BM3J7DtSxgsAvWWqtDhESeYMpzYpW2/ORC2pTT0c4CQxZ3JHKn6jGw+NhNFFxTcPFQBHfnJr/XhYGsNLWidzQEgskNAAfB/uD/ZsqkzGt8nVo4DBOQdJTb5esos77zdpNmH4Ov5utPPTthK8tttqHQ==; 31:vNfDZaO7r/PjkvPwVKUyUTvfPMDrFEzZEjH8wfR5ER2vRrZDHhdSkLqkeyNqCLDaqtiagRn72Lb1VxTLFSDbeQlYhdqgAeEHd/IR1uOnyms6PzFLOhmuIw4Q/eT6Z/B25JK8am9tEZO4pQXMI5xpW36ZJt6sNo+lA1T/OO2mtTYNOtkrxLzXLCnyEG0UxxaCreUmldCVw1QJhfMaDqLXVBOQIBX6Qp1OP52s7uVGyIU= X-MS-TrafficTypeDiagnostic: HE1PR04MB2956: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB2956; 20:FmEWfq86BH5gkexThW+WjLHOQn9DcjQ3ySzmuj4yR+J8jFeOkXW7qfks4WSnqX7vurAw4YAA9fzzGTbdi7cif8k6fzEFpr9TO+ikZHEYPOALtZa7rPu0v90nv2wfwx16S1mUxoxt0AeyNlZH6hHIrSP0F/LH1r+Ke/d318TsSlU+ZzoJ1ZJzIYD+8mWV4z46TsNIhPv+ALiiy2J/pTAe4So7cInU2hFPODjYkz11I9UU1YDZ71EYrDruRxjfaMsIjfQZjNN8q1kpRPl9fX1G7dTLQXcQl3qtB/aNfCUQyLE3+ZaASm/K8lMEZLMxebMFbdLCS+4HVJGLjNBn4HImtB048iyixCIoh4RFXMmVRSh/th3f1wWJ8KVCkMH3CZ9Ju/3AuXx9tqwvrzlBbCTUYFEJZkoEH5c4U5gNaMcNcvlRO+LqdX5KoOBXfMxAVk72L6SfxaXl3CipINxyn4pZD8kV6+QMGtPzd31JdhUud+f4uJjOxEJWMtVzBoTZdOPZ; 4:1egx3qPG979kEIpIh4XX3Ev2N/KyxWFN2EBfoAPoizPPSm9Aw39lxhZcqJLCBCuLbvxNq07eF2Bp3rTMDyXNhuit/s20Owl45/k6DJb1zh6V7tzTxMCARlplghhxhjPqU8hpV1xN17tlvOMLObF6oclSX1ktUIblo8bGlnUZjtVKuWSxcNQTTOHiiYQwUeYcAo8rRs+Pg4d3mImi4PNYd6o9fLzax+lNMa+HFRK+Lm4/Rm9SVOUmC0SnSpLpuRjpgFRv+hrCTXy3sKPxLRQk36LSPe8u/KuzYmUn229ZHkxOYvNYnG7wHWwRSNz1+uE2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB2956; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB2956; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39860400002)(39380400002)(366004)(396003)(199004)(189003)(81156014)(81166006)(186003)(68736007)(50226002)(5009440100003)(5660300001)(6512007)(8936002)(53936002)(8676002)(106356001)(6486002)(305945005)(55236004)(52116002)(478600001)(316002)(59450400001)(51416003)(47776003)(7736002)(6506007)(16586007)(386003)(50466002)(36756003)(66066001)(956004)(2616005)(6666003)(6636002)(476003)(1857600001)(4326008)(2906002)(86362001)(6116002)(16526019)(26005)(44832011)(97736004)(25786009)(105586002)(3846002)(486006)(48376002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB2956; H:vinitha-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB2956; 23:8DVfiQxBiN9uZhxNh2vZ946NP9eJt67IWUqxledfQ?= urzSoOFWS/T23IEq/e3S/6k0T8kAPKM5CafEhxRzqSkLHTtkdRt+yprRtoifvntWKRerYr8D5WHqrWfZqMD3cI5DRmq9z/grXAZw7uFsxDABhsngHZJubw0TW3ln1hOssP1CCcKlvzuRwd7shOxM8Hs64dk13x/weL8p72o9uv9FlkKV+Wtblr2kivM9Bvp2+f9bYwaPO8tK8Zw9RlrxXZQ6Bz742HOhBD+kDhB2cJifJKp/oGzMUavmqz1t9t8eotdt/v58zPZTART/MiiNPh1HrpE88jjQY3TWzpvrykMkYZnRRN+tt22dSUnrbNEIAGMSm9EQwCaLhVjOxoCOcnEN8x+WEMIYvAr/PfuP9NOEStklJP7JT0Hs6vBmlE4yg7FHucTp9OOTtUb8CPhJJiOyV85UNvpecnRLnCqMJ8jMzJKYVoLEvV1kKmaKp/3s/o9jDCNogDlnsI6XOzXcOYiT/7fCGZJHf7x/QLgmMEE11oljnJeemlMdUA9khsPDXrViMa0YhGg+n42eub5gafJGR5J01t93pfNvIow8/ClEfXbE6rUvtydaVRHMl2gACVFqkQAc8dr0741TlDD0fCa+kuT0rc8WlIhNdp0ADwH+IXgkH7Ob0Bos+mBCeJfuxJv1RHAp54cto70FN8Iq6Kj1lhGJes0QmeF5RvWtAwWN2ptsqfARxe+74i03KmNO9QBTEn7W23ae3/WR0k3DN6DyJIUvfrtkXv3xCZFdjSxVanOovWYNRUWCmnI4jHB12s3Y4kxhmUEo9v7D6YPQIaJCoZr/xDxVRUev3uGUIkTI12dl2WeFH3bo2dUZ3uWvauj90xvDptG/wJtuLKvaJ1/JRIlT+VAuIC5t4aDl3VjPu0nWFIw8eYMPLJ64aQSMPn50eAybkXBQplJ1tRXxz3RiU69yXGJMg61I0h2zApjMZGJ7ypl2ZtBP42sAKRtuHgusdIr8abxnlGDbzopKUyx8ZPGnuvDmjAKS+XIE8d01LUIzDVHdl8gntRXAUjBAwGaaCa1gP2iK3i28V/psJZn2TJFyrg982UnErXolkQiqr3SVI5GKjlt0ZPMw0mY0iJTWKdZnCkM74HGkSDIVPxaAj+TaacgbSuu7lv6BeDsoeubu3cj66nFijhb3pwzvRAmH34q9TlsOwNSzNLlyF6JOG39rI4+lfwHEXNZrmj0mXhQP5VO/RbpzPbbDzkKR63EGY7aPmFeiWrX25rK7BVd X-Microsoft-Antispam-Message-Info: +lCfpD0RhH423rajrhnPiSBdQuT/OEnSOhKuVjYkRH/zyKYc/8l+lzrBqxJ/+7tlK8iAZRcVp0Br0G8iXzWH8W/36uvXcmDRQ/HDg6SEipYlZTVe/ZC0gYcMJUWWjyJBIOayC2GkWmygi81MwxQSWvVUbZIdlAFKKupAqU113T9puSLBId9kZSC2uNLD4Vvx X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB2956; 6:2LrkUbp+j2VIQlk6dRg7swbH9EtbvoMi8G7ker0oA5ep59UPUuvWX8A+rv6cXtfdYoVpPnUeiqRAVMKveH7fmfi7PavmJuqNFRiMfU0a4V2sqLsDlxEMxEW8zVJA+mRbc5q7p2bmHRKcFNK6BmAoAz2lnMLf6IoPdBgVRi4+iR7lHYvJ5SIoyYFVYoTcHlOVocf+JB4CrwaF1Bx1duoTjPPy4hYAVejWJGQsaK0MseRYc8VnLBDLXDFbfKGOjGir0jsBR+OkMFo+196sd1lN7DucWJdM/yRzc5SKtW8xMk8kphluNgS/5J0ugohlhIIDiyi3i2C+B7Sj8kZzihO52Nac9Gg89R/AMWWVyn9UfWxEy1akoH4+04JqsJD6y3oM16PEUB43nCAfN/CJ+gWAOmmFhTWiuRHLDXWPIwYh1CcW0oACaW/bxndUktQF1y5H0PfpfVwMn2l6kcSd0uTIFw==; 5:VFzcSq4EXX3o8ecIhphaXowUflKfsI8GsrJ2Fzh694yZCEt8XjHy8MoVusxNM5l7SLr3eoIXpKg3PFf/xEL2p5nw2gVkmxgJgeeoUgL4tIdgyJYhFbZFBNGKPXqXvJGxERTEO2cbyWDXCzNmoyc2FWZpHUqaJJTaM6w/bQ8VNbY=; 24:yKthIrwPVfzx4kWBRWvXNJQ1hij0/m74hgmqr5kyMg0Gj7fYCfQ3Us5Obk6Vd38jTZrCF/FJiELgD+DLwkaSSooEN9FoLrOFdqbcw0SJjyA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB2956; 7:J479w79QhjezlIlR3Ka1uK/f0Kv93COvm1s8ly5opBMvmeqOUwhFik0F6IxSFFsG/tPvHbBzlXpAZkiAAyEf5bkkKhguV3046KV9S64mCfTB/JZoB1yKL8QQ0YxtyBCbeWVxRxkt6qub1Vk4Qy+1CFYm0E38FxLkIxthlzOwCmp+J8/qBUx7qkD/J/AkjXuYUjAvrH3nNgv1x8ICF9stjhEZAvo6bXMe1SHoc+AgDB8KKbPBBuKbXuRZlToyS1mJ X-MS-Office365-Filtering-Correlation-Id: 5f9ce91b-b36c-489f-f346-08d5a0639529 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 10:53:09.7710 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9ce91b-b36c-489f-f346-08d5a0639529 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB2956 Cc: Ruchika Gupta Subject: [U-Boot] [PATCH][v2] armv8: sec_firmware: Remove JR3 from device tree node in all cases 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" JR3 was getting removed from device tree only if random number generation was successful. However, if SEC firmware is present,JR3 should be removed from device tree node irrespective of the random seed generation as SEC firmware reserves it for it's use. Not removing it in case of random number generation failure causes the kernel to crash. Random number generation was being called twice. This is not required. If SEC firmware is running, SIP call can be made to the SEC firmware to get the random number. This call itself would return failure if function is not supported. Duplicate calling of random number generation function has been removed Signed-off-by: Ruchika Gupta --- Changes from v1: Removed unused variable rand from the sec_firmware_support_hwrng function arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 ++-- arch/arm/cpu/armv8/sec_firmware.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 99c5d13..955ef30 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -415,8 +415,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) ccsr_sec_t __iomem *sec; #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT - if (fdt_fixup_kaslr(blob)) - fdt_fixup_remove_jr(blob); + fdt_fixup_remove_jr(blob); + fdt_fixup_kaslr(blob); #endif sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR; diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index b56ea78..98d7be3 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -318,9 +318,7 @@ unsigned int sec_firmware_support_psci_version(void) */ bool sec_firmware_support_hwrng(void) { - uint8_t rand[8]; if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) { - if (!sec_firmware_get_random(rand, 8)) return true; } @@ -429,8 +427,10 @@ int fdt_fixup_kaslr(void *fdt) #if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) /* Check if random seed generation is supported */ - if (sec_firmware_support_hwrng() == false) + if (sec_firmware_support_hwrng() == false) { + printf("WARNING: SEC firmware not running, no kaslr-seed\n"); return 0; + } ret = sec_firmware_get_random(rand, 8); if (ret < 0) {