From patchwork Fri Feb 9 09:11: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: 871257 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Kes8iAwq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zd8Sq6dqpz9s4q for ; Fri, 9 Feb 2018 20:11:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2210BC21EC9; Fri, 9 Feb 2018 09:11:28 +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_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 5DF53C21E70; Fri, 9 Feb 2018 09:11:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0FC28C21E70; Fri, 9 Feb 2018 09:11:17 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00061.outbound.protection.outlook.com [40.107.0.61]) by lists.denx.de (Postfix) with ESMTPS id 13676C21E45 for ; Fri, 9 Feb 2018 09:11:17 +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=8cL69N7sWjvYqSOzwD/CBl04MFYwZdWq7+U8hMbcZWI=; b=Kes8iAwqcfS8gEjrP537J52r6CQwL9MhEN8QYAcOR/rUvVPEubo/Ue1FxK+2C8b3X/Embee1dASnD2387zt5GlSHrQ5UhXCyMglEXr3iAGiIcALo2qWmdDgg6l61syQcIXFU5pEWAfiz8K8dIJib4PIwCH3bAtJBCgqJN8XRbN4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ruchika.gupta@nxp.com; Received: from vinitha-OptiPlex-790.ap.freescale.net (192.88.169.1) by DB6PR04MB2951.eurprd04.prod.outlook.com (2603:10a6:6:9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Fri, 9 Feb 2018 09:11:14 +0000 From: Ruchika Gupta To: u-boot@lists.denx.de, york.sun@nxp.com, prabhakar.kushwaha@nxp.com Date: Fri, 9 Feb 2018 14:41:35 +0530 Message-Id: <1518167495-3066-1-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [192.88.169.1] X-ClientProxiedBy: BM1PR0101CA0029.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::15) To DB6PR04MB2951.eurprd04.prod.outlook.com (2603:10a6:6:9::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2689fda1-4247-4519-eedb-08d56f9d12b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB2951; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB2951; 3:O5qmV0hqrJZzbV4UVME9cDDLjOX8vwpU0TYeazMZ4OlJiRgqcVzXhkLinUj19LjluV3qi1PR1bFK7U/a5V6VGnJspMZMKPF7jCXfO5TGyYjzwICU0No7sdovgjvLl3IUPVYxoY8YnVvEPYoj6XDDP6PYHdaKoLXnGaa5QIs2l0c749hR/Yk/HOuWlx6rh6fkhlsumktH/2CKGO5GqAzVTSoP4DzDESDt47y2CuqCP7yEXIwSQmh21Chq16FEW/m/; 25:aKhzDuJ3G3RqxojdeiqYiOA2a4SqoCwO4DDqOqiDs0e/E/6VM5NqCRAnFXKdIzOT3koKx7Nxzxk47twkl9/BF3S5q/XlizvJRTxKaDJqXu/aanl7Smcdy92fzi3ElZQKxFHXyQBXLVM69FS+aUYGUPoyFup0/tFdvCkM+a3HcJdTE2xE1I9AcsrclSvWBi7CBjw8FkMzUvdfZ+MU8GrGbavRGGExrJRHeZ+IeLGrCorKiMqSKIvVwf40FHtetqDyov6TSwy4VNWDEBF1+esveu/WLq8Hu+Icofzo4I5kDYORZDBCG0NRDxvqQiLizK5jT7MvkTICwOGjKH+juApOvg==; 31:vLsH8Z89j6ViPzD2lpktQab5WRVmM0pYRG2S4WzAkmGXyZxRuLxNmiVNt6xK4m6XeIgAIjqiFkP7mmyy/gTsGztIOlYjbzq4O0jq+lRZgezx32aVeFkNawvch8jbnEkO1BaQX2cr+sYg72l3Jwo8uU/SIUMrPNNPE7hGhf4njP8UGEIRJFzmn0bJ+43xJKmq2Mowk+ewMS8VWlWk2TxQh4oy93sdvAu9pu+AJmOsoOU= X-MS-TrafficTypeDiagnostic: DB6PR04MB2951: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB2951; 20:Ms/rz717iUFCT6/WAKzn/mVOLQ/ynetC2PGpIagaxgld+H/2bD+w4vYV9bPrJS5k4mNgUZja605ZuYqD2TMypGsZ9cvElebHpRaGn/y3scWv3oheGLI8XWoE/dpWTpZO1q1Mh6puXm4DGEzmNkATLA/wM3FqIPJv5DIFaSgYRz6Da5aZph6G1gxUSM2oQwsm7IEpbaq4bfxUsfJB7NcYviDdAK2QXnQmd7oFG+3hxCUVrlW6e/vUSxLKhfU7yQ6Ui0sbkzpjadTyfu8XWyoB2G1TOQfytwHdxINXG3ppkZEv3x29t7FgFx7NcdW5oJeooNLnh1y0o2CGOqtFrma0WoXDdi82kV0od94fOOpTZjCKX0eQ3vqrd6iP+wMfZsbfXySjiwo2vk5jreHBW4cABjrC3y6X1gc0GBQ3vrOvNzg+RcIgH5qPHWxUPQku69HxdsLp7bQkJQbjLIFdlyRe00VP8WNFHxmHXGPATlnBHSiupOyx5W0RaNL6xDNbwTDF; 4:IK4FEY1hfS75+Ccm2DrWPFotoWVTvZpybndPa4BPTf5kms3Bw4bzESlnqnrZm3/3rLVstJu2Maptwl4xHFkubqnm2ivDlnM6+N1x62Ot68uuwgS3PF/3sDgXUBgreNgQcMipf+qgg8ifKyjiFQ47v2sPlM39LTMuIX2NJ1draINDat8NS4vsWBv8Qf28FPKQMRHsPZvMUFxno2HoboJotTwfxwEbHmpNtq0/j8Guo+FGo7IGJUHNuVsQs3MmZ0tWbRDoeilFnglUfzfPptYGfHd8/un25QTQfCKmYw95raYVXmljB69um0nO3ilCB/ys X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231101)(2400082)(944501161)(3002001)(6055026)(6041288)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DB6PR04MB2951; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB2951; X-Forefront-PRVS: 057859F9C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39860400002)(396003)(39380400002)(376002)(199004)(189003)(6116002)(86362001)(36756003)(16586007)(81156014)(81166006)(316002)(8676002)(66066001)(386003)(25786009)(8936002)(6512007)(105586002)(478600001)(50226002)(2906002)(3846002)(68736007)(6636002)(6666003)(6486002)(53936002)(106356001)(26005)(48376002)(97736004)(4326008)(52116002)(51416003)(50466002)(7736002)(59450400001)(6506007)(186003)(305945005)(16526019)(1857600001)(5660300001)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB2951; H:vinitha-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB2951; 23:MmQqqDhsD1Or5XE+fees9xuiSQBwGwvdn5fhW66JL?= S8jyNYWBWe+FiandkNRpByQilIXvBghjLEkkJR5HpyP1Sr9u0b8CJdY5jgmv9OYmiZkPd0MdtOx8elMyN+/phtwUmGASxHvlzcn0h2vOraKLHR1dfuHfiSbWSclGHopimm6On1mgV6jyCrmNoYVXu6EHuqj/43WyvJYjwXj3lLr7oHiy8hetOkmVpmOVQHKSt400zWDUOlqZaDDrylI9+wRZzh4A9tRPdwlB47LC+L0vGPr/PFFNjyHIaURP0roY5LioApIpuDRCk2wsfRixbFDCk5N4hs+RPrgxS95nnU9OrjnGFroXNTSm1Aar5tRlnHExsNOGmbo8pzaI6neF3yObnZHr67tt0mF72EsKqjDPA7/iPTkJBAoMF+Pk/UvNRVvNHObYqBmnh1lwlL8EARN8K2rKuY7mP+IBdGQ+X1GtdG5USWTLzhgVbRCaLsgR8j2SYvy97Ow9sMdYenWRnVKqwmULRDZx2/HTgP4tr0TuYDS6A59JWJFpF0YzsLxRjPT75fVleTVfO24jSzq0Z6sLQYUrZNULR8mVRbtxC2+H83PxgaUoJZB60CaFTwUNiOvPYaJWUH/1O9AWJiZIP3krp/7EgiGfGa66M0cOJc7+8ka12xO2jmaPn4qdAHNLiI4UZGB5+yidfSEelyE7VsC60ma6GvhnQ/Jq0HqeRjrjPhaYeil6vznatao177PmUtZv5TgiXUl0f1NPbKwrBTDyEM8clSHU1xRen7e4zbxoQDpaDy+xgTMR0mybaMeFraJwc8iZvdxKGeDKjHr+LU1R3gphMdu4PS1rOmPJhObvdWNIdRbaI7QKwq1AezbHdEjs7mTtj4hnyi8tZFIBXhaA3HICbIfB0TgPYtvkimfIiaUNQEwaXEjXInuou2F3umH5EU9iLE76NYNJ391YLdwTySiAphrypebKTgLSWjkIVCBq9klXQcSwPipwdD7dbBgCvisZuhLTgqQhZ/qmS8s2Ub5sAEyGLxX4me9mPujUVHwDndmIuhDncl5pp1XhD0EthCAxlmT4D9fixU0yPx3yEQkpzVpUIxa/WEiRishjg== X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB2951; 6:sixsDevXbjogF3pZC95iKcLGazie4nsC52fDi8vlblDY5tMTdZcqwfERukdE7hro9OSXgFZxIY/OFCxZvdgl4/QoHpW41lZwZfsFgYJ1j2OiEhL7wL8MVffw+V7skqZfd25ieAlpKVvyJMCTdClznE2G6hyX9hJIko/dRXfS2YgdIh4RZvrXvXILBr9dbopv/QoES1XaN/eJ+/yR/Y2VYmqcCUw3TtkZiVcMM+OwRpsmNmRzUQPLWiHEHrHK2qP7/Ya9x1t4qL1kM9NahbqNpfzRK/P37FsGQSn+QmFq5k7gPJjdDP697UuIOlADvbPnd8R/4kna8MiZqcBAS3k7QSCftMO8jZPSsi3GTFOm3nw=; 5:ctStC/P7p17HrirU0jUqcBjQy86kvuOGe/tN8Scsaw6HXE29WdRDHdrIXDnocnvSTxwF6n5DFAj0zK85RXfUCe474OiwveUiU7BW8CkpjFulJ9aqKoRoYZ1B7RJFRF5UN1EFhdk6z7m3EVQbpJLfYe/Jo1+a3L3lYO0k9QAaSmc=; 24:vHDvxW5qEGWeHEMWYrQJ7QX28jYX5bsxJnXdvxwA5XbG8gQP2D/eOwkveKeIQMOy/yU9J/QkKyyJy4L+/OMNx/L3HQgv9JQe/pvPD4XgCVo=; 7:NpKU+OAXCzkxEKiD2iAQVzfF8b8Jz1JPLxM1DgUuld3fcJCRsd10rYHU97v1D3668KgYJ1/ursn6MQmqxry9p4U0wSfr918hulb6XgiN9HJx0cjkJx01VH5ru+83Q02huchRKR6hFnyg/D1RFcpTxOyvaBFDaJh1z0f+i5OULDceQ1IwQ2RPGVb7IPyeH2sjCWMvSKKi8bo742Hhc2dDzD85bao6tWGxTxHTbM9rbgdIupSK146zNBi3FDAfItqI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2018 09:11:14.7163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2689fda1-4247-4519-eedb-08d56f9d12b6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB2951 Cc: Ruchika Gupta Subject: [U-Boot] [PATCH] 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 --- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 ++-- arch/arm/cpu/armv8/sec_firmware.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 80af318..6a19f4d 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..ebf41b5 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -320,7 +320,6 @@ 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 +428,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) {