From patchwork Thu Mar 23 08:18:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 742548 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vpfbx2mS9z9s0m for ; Thu, 23 Mar 2017 19:19:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 25B63C21CA8; Thu, 23 Mar 2017 08:19:21 +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 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 69796C21C4D; Thu, 23 Mar 2017 08:19:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B3163C21CA7; Thu, 23 Mar 2017 08:19:11 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0056.outbound.protection.outlook.com [104.47.41.56]) by lists.denx.de (Postfix) with ESMTPS id 74A20C21C89 for ; Thu, 23 Mar 2017 08:19:07 +0000 (UTC) Received: from DM5PR03CA0028.namprd03.prod.outlook.com (10.174.189.145) by CO2PR03MB2264.namprd03.prod.outlook.com (10.166.92.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Thu, 23 Mar 2017 08:19:05 +0000 Received: from BN1BFFO11FD031.protection.gbl (2a01:111:f400:7c10::1:177) by DM5PR03CA0028.outlook.office365.com (2603:10b6:4:3b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14 via Frontend Transport; Thu, 23 Mar 2017 08:19:05 +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 BN1BFFO11FD031.mail.protection.outlook.com (10.58.144.94) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Thu, 23 Mar 2017 08:19:04 +0000 Received: from b49020-OptiPlex-790.ap.freescale.net (b49020-OptiPlex-790.ap.freescale.net [10.232.134.31]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2N8IgDa025696; Thu, 23 Mar 2017 01:19:02 -0700 From: Sumit Garg To: Date: Thu, 23 Mar 2017 13:48:14 +0530 Message-ID: <1490257100-16483-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490257100-16483-1-git-send-email-sumit.garg@nxp.com> References: <1490257100-16483-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131347307448932098; (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)(39450400003)(39860400002)(39850400002)(39400400002)(39380400002)(39410400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(189998001)(104016004)(575784001)(50466002)(110136004)(48376002)(54906002)(6666003)(85426001)(6916009)(38730400002)(8656002)(2950100002)(53936002)(47776003)(86362001)(81166006)(77096006)(356003)(8936002)(8676002)(106466001)(105606002)(36756003)(2351001)(76176999)(4326008)(5660300001)(5003940100001)(50986999)(33646002)(50226002)(305945005)(2906002)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2264; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD031; 1:JFIqNm6PE3NX1ddp/yoOUlh70CEKxsjfW87nYpnXfqyJzB4avCPDroF6ASaKMbcQkrivuq44bYovWBEGCNShktqOthdNYtuV4yYrEHLKRgawixR+uUyyMcEEN0ED3y+R7n4JsSN2KcSR4A2JEqacb77RxKGjBr7lY5eQECj5bUsVQSuuPV4RVkuzK0md+QnJ6+GbZOcS4wEjczo2obzT6zyOQ9Ju78N3+wlrKzERumCFPAru0dZBGk3Z5PvtHt5G/+iccBhnfhdOykVaavEVp1YRq+5XXP5+1K8R+4u26kGLFziBDxeoRtOA0X1XAUcs0WrnsxwLCzeuiYdfC4Fq18073C31HaG6FtZUUQHYvdx7RLnOlMHoL4w3Ist018VFb42Kg3/c9no0CIq3glSzAfVww997NG4d6CxVZAetiTKESFMPGRRCS553emcFIN4EprLCEW61gkLRkccYrHY0eG1bBCNMjGOJEycnhPu9QPMDRj2Z/IhXmgNq5FSLO/N2pQoyE1Ln5rHpjzTglRL49JW/SYdcp/b9vbDmM2x60rUxVcccUVPEuZVX6PK4bhaxBt3KnRqzwBo9CWEvD+Dpt3t73lQxYvwkSGYIFAIP1cOsXnhBZ9/wWTR/Da6sQum0DK0x+ZDTETkPt1Ytjvw3FRXF4nZEdeBcBSYq4S+xbxPN+nwU7+Ksn3H07EWiRHzp9seqdYMjeK0G+nOQMAWDPQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ea455441-9662-41d8-35a1-08d471c54527 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CO2PR03MB2264; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 3:m5ciaRN6EYvzJdxePhOl0K+ZqsmjVFiPujBo+bFj1dqIZ5Q7OVu9jao9NFDdZmhZJJ8TqLsGu0sJdpmsLp4x5uaOe3QhWUBOQfgDm7RxTEMz+6IDWKCZPXcwFUglDD4D7EGO+usVcKQMSjemedLfZNMkB9KLGqaJAfPx5/y6LL/CUrJABXKVFKFHdEawvpIL38b6dTz5+QxkkC5VE4L5g106RrRsNWEHXH1pR2d2pKrJDo7aGyeFJNxMhWmd0m2x2QLNZTtUe5xTFP3yreNPYV1xrkLOGTWiqvtueNIrECfpCYqdYnFlX55V1bTaKZVximdIvKYt91FSlHBRBZ+GylR0Wp5dfWXyF/xrdtllG6SC3eEMZKyTJjgYeU9pUBcD; 25:euuOvbW5QqqOdr9Xtw15f/HeaRwOYyIp9VIm1vCGSnMSkLJ+g6oaOKZ1x0ndmLVLh5m+b/8uOMPwGlkjXvEQxBzwRPNEc61Gbiah0OIwBvzX+zyyrMaFKuz71mX9+rnqblioqs0lZzAyk5oMG3b+wkRgjMUliaOx1wZoYUIabNT1YbviKAb6GJIrsFmLJ7XwMsofx3p2z/2DIrV6y1KVFV9NwMRmbnbZZ6nsRXF5Z8Cybac9Sd7gmVodw0Wm0NO8P+s1YjGHk3pHU5ae+n/OIytSVH3WqoPOuv6VoJDiXtYZ9IwDoZO7EJknUTUWsfw30kgD/eDfx858VzOOzk/CjN8T3seJvE6JdWqLtgTb7R8+VkF0RvHm2j97m3mceHR2BcaK2W+mt5NlK3ZhDDMYoMoANMbg14DZOFt7uZ1hos8F1tzvRHc9V+wViOqlTrjUNbBdL4ZfWcBKsQHN945fYA== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 31:p/m9Zh2gnaqCBLvDtN0gtNnzQVqZOPDTbHj7wQG+UzlRdGH4+DhjyBUZMZmZ3B2bZJfBfH8CvCunAvj9P6NeMXIUOuw517WDoTP+7jQTZ38qK9CZINfo3WLyH6/gEt4043ODFUa2JocLmcuy6tS0EHoXTCNHuQN9QCzXgp5CtnNgJHwaza1mTNfxkLO+lBRUfHUzJPfAjBcVu1cnv1j+UlfE1DpHTN5Ij7Waz5eCwP9ku3JLBJI2rxfLoc5a6pDw/UWGRcLqHivHvHSE/yWYQg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(13018025)(13015025)(13017025)(8121501046)(13024025)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123565025)(20161123556025)(20161123559025)(20161123563025); SRVR:CO2PR03MB2264; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2264; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 4:Y32GgkVOo9WKJKTXhpRphkQHLy1/uFmAqspjwN20DELNW51AfCgcDcfhPtxxL7BBJn40JIW44+e7JnxuZ20SyJgbfUbGRIT7a6aPg9Z4ApzaHKUh1XjqVwkq0YkRl6wHJJaepZXUgxYTKK4hVe1PoIUduYoutsECNHes1UNDMDi2zn2n5aQf/Sjd9Qpf9SqgQ24sX0OdKFBqpxd8XKqQfnzyydNdzIEchbLqvtJtM44LMWxTQIHKUiFj8CCrQyDNzlBNM4TXedcYQNagYEkXjEhMUu2wmgl8KZFcgYFXpe4B3QDlD772DaXdMcvs/WIfmd+QQJuISvvzdGXQD5dUJqtMFyv6g1pvYIt5qrrgyPAUUl/xe7+q9bYpDSM0twM2YmxwvBkJFNG9wC9lDhQ2ca6aw6Isblu+1OaVoScWlFVCaR4dLezmV3W/WrAjVpCIxZZPgoLDoosYBODQpByywHmUhEBwv9nWvOTp+TdEzIBEMlbSQZdrtS2RBo8qYNYVkVzOCg+8Xp82Lf4/ptJpfOGgSVsi8QffVBqqq11YVSyQxYPmtpy35Qy9rQob0AivRgGyNA90n+tfW2ORl+ZZsb1/zu5AhrmlCTEsTdW0P4sKemPTGdl09HNy4k+AghSdb7XAbZMOIwgCj1NfkxlCTfFte7St+1D/2DozMMQDOpec5BiBDSme9WxQ6aYYxrj0xess9/OfkVJmUaF5dAXZd51D2hk01DgUwS+c2IfzG1+pTs8McrwOca7thWTJA+Dx X-Forefront-PRVS: 0255DF69B9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2264; 23:OJNlPqvA/ZW/T4sCNR1sJrrx6BbJNiMOQbqIhwwGQ?= =?us-ascii?Q?859Xad8a/3h2OjzezA7FCg88dfPvOxCDtwUf5MjyIdugFjEAVsgmF4yLVA5V?= =?us-ascii?Q?oKwoWnz3Tcwo04xdoPuUK8w6/oGi9h9TH3meM4uKsKMwXgBoj8W4SAGTC2Ju?= =?us-ascii?Q?BjL6DcLer0bLlIpYDmfaH4aDT+/q/kihJZylQ0Apm1UpKiP8LOlx1+UWr+VM?= =?us-ascii?Q?DjHxPPD5a8859Dhie6Oq7Iid2XZHoVLTZX3/tP4eeBsXvb6ahjtkzoBRjGuB?= =?us-ascii?Q?Ei/EWAsFpgDj7Zjt0zAMhZm3CpBWE9nEc83pJBC/i+6k+m2MX2sz33Go4lGn?= =?us-ascii?Q?gLpbNtZNfxbviqPPvYXX0AUjs8SwTJOm8loMSXYY0WNbwH6zqLQDYlYTtHS0?= =?us-ascii?Q?xyTqH+Eq2hImISJEX5ny9+x9fRkpWveIa89+MMdlAHvT8z+tekEssGiF+64y?= =?us-ascii?Q?lWS5MQxLjNWdq+l+ApVTFriBFD7JeeC1YQIDWPc852Z8kzwBghVBn1wl4Fkq?= =?us-ascii?Q?OaUEP0rSutDSep1+NFthaJS3sLehROQEkn751o/8t4dnUvt6tU7D+Y/aL1xv?= =?us-ascii?Q?gtQL4PhCv1pfYPYSSa06HYsm2bJpM0UlB+FEg1OH6zrjyKFuZqxBJrNqIxME?= =?us-ascii?Q?IQvlinDqs7pRkaHc2pmJEFM0Mk2MAV9J10g1zqAVb/UGllZNARsVEZl5lPcj?= =?us-ascii?Q?LT0y9DlKbitmutbRFXX6zaH7104hRERvHHCTmLp5bwc5QpTSNXXy8PGigfn0?= =?us-ascii?Q?CqJciXqcbpw3GetUi4VEsQgl/ESZGpf2e2NVol92/bxzvXiYuhMmYADsCizq?= =?us-ascii?Q?Z+QjFj7mUjwJTWVHKQlsLMGfvPtVGtvyEvgY5zSjcMoc8gj36WWCzMznRnRS?= =?us-ascii?Q?irtTd3La0xGEZNgwhhYjBe3JjnLXLH00YNDxXSVoQX8IkMw8B4XN+hYlXq9m?= =?us-ascii?Q?p0vJO9ldxeApyfW10AUjVDhEUOjoRYBERA97/PE+v0C8bJlSN+zASQTPN4vu?= =?us-ascii?Q?Uw0IDsRP4Ts0Ld9/a++PPcokWI7ciUxvDqDrtUp9cvhLk7NWBfqd73yRdnQM?= =?us-ascii?Q?ReIRwe9QjDHA60XN0B3Jq2z+zIvqk3JSj+z42h1itni5McdwgQZhxskonbDf?= =?us-ascii?Q?XCJVXTi63ULGXHpHaLO1RS0n6OpB09brPgOGpQ0g2R7Qsj7lKvHe9l0hOhgB?= =?us-ascii?Q?lr12A67PBRbA2smQEd1GwDLiHrbwF86i4ZQmT+JqSW8vElL0n0qcsf6Zmv0m?= =?us-ascii?Q?P9IGZx1rMtExMbV5WOBEjZpCR1S7JjIoM2a5y4U?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 6:5IOyLG9CI77w0/rnxZFj7FqnDjIxMwECCvDOMImWbkysrWeBk5mhbx7jcvSp+d9MpES5KM4bnstuzqeVrqixalp5GSwxVA90Zfa+eZFsdjIoYLdXEgSXbNSc3XGd/F+vBXS3PnCvcIzu1QjQDv1txfaF9JPGK+K3OjQmMQ8vDrumKnRIFuS4W70iAWnT1H5dKCXtg8gD31xK/nLrpKbSjqSflZH+DVa9HQuG2EUg1nDsII7oWlOV6znk2bjKLGvb4l9KiGU+adUNDI6OC22rILVKDY05PcDUCBI784ibR+HDBet5Y3EntE8N6MfycpkHQ0ZYtXxL17jhaISlCaEPYxBO48W/F0kryO2zHy6DCp2hOt4osnR8aLMWCnLtBoUMz66L0qK5rolq5pq12gwA1/0sXNxzgX1y5/YG293K4w4=; 5:wSYyzHcxyTj9Yypz8DVEQCwN7+T3gnDAf+0pyowOvohLGjc227TfqnDw2WqIMs2NtiaN1XxF6moetHiCPVQ/LeoZb5Z56faN4Z6JNomhT3DnwfSGO3m2uecSCqm132UBUDh41CYQhYdKQXqzH/W07ADwatFeLfsE5yVeYxUshc1Dpoo3TqBJNYV2pSy85qIp; 24:JD/NHmJLEsQEfYsgncnFzk6UP1XPseZDiOnDmT5A0Ih9ZypfRmmfeOJv/ITXbwWkdAy5aF2UFQshqufFpnzophpSdw69lUGTY9rrNuWlv94= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 7:cUaJufiA8GPDhn1MKKsIuvh2MSm6QavgWnt7K4VUNO4KSD3Poz/RdOZUSQpfMgDQN0K1+iIRnFZjli3BFWvrBtAxCL3IJVftYJPXJWcbKYW87aoCY/UEbVXNAUHPgfKDS9sUpaKlt/JyMcnAFaC+wzOfuqMZmEiMdKPii3OLNOK1PMPQZQfHPtohmN1MEegyU6hdtftpQjRbuN6kzl8PfMCKNezO6BOnPbq6d0SWYtiR1GmoFC+mnoOoa+v4MnToBOcut1jMHYySa0KR+sxERgtzG8TqiiKxkO1aFiURIuJYauneCxAO4AtW1Hs6dCl29919hbitHotEK/NXKLvB9w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2017 08:19:04.6904 (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: CO2PR03MB2264 Cc: ruchika.gupta@nxp.com, vinitha.pillai@nxp.com Subject: [U-Boot] [PATCH 1/7] SECURE BOOT: Add header address of PPA in kconfig 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: Vinitha Pillai-B57223 The header address of PPA defined in Kconfig. Signed-off-by: Vinitha Pillai Signed-off-by: Sumit Garg --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 11 +++++++++++ arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 2 +- arch/arm/include/asm/fsl_secure_boot.h | 12 ++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index a99b1c6..10efb8c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -154,6 +154,17 @@ config SYS_LS_PPA_FW_ADDR QSPI flash, this address is a directly memory-mapped. If it is in a serial accessed flash, such as NAND and SD card, it is a byte offset. + +config SYS_LS_PPA_ESBC_ADDR + hex "hdr address of PPA firmware loading from" + depends on FSL_LS_PPA && CHAIN_OF_TRUST + default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A + help + If the PPA header firmware locate at XIP flash, such as NOR or + QSPI flash, this address is a directly memory-mapped. + If it is in a serial accessed flash, such as NAND and SD + card, it is a byte offset. + endmenu config SYS_FSL_ERRATUM_A010315 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c index b68e87d..cb16925 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c @@ -42,7 +42,7 @@ int ppa_init(void) ppa_img_addr = (uintptr_t)ppa_fit_addr; if (fsl_check_boot_mode_secure() != 0) { ret = fsl_secboot_validate(ppa_esbc_hdr, - CONFIG_PPA_KEY_HASH, + PPA_KEY_HASH, &ppa_img_addr); if (ret != 0) printf("PPA validation failed\n"); diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index fd627c0..a1a3004 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -109,21 +109,13 @@ #endif #ifdef CONFIG_FSL_LS_PPA -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP -#ifdef CONFIG_LS1043A -#define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x600c0000 -#endif -#else -#error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" -#endif /* ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP */ - /* Define the key hash here if SRK used for signing PPA image is * different from SRK hash put in SFP used for U-Boot. * Example * #define CONFIG_PPA_KEY_HASH \ - * "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b" + * "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b" */ -#define CONFIG_PPA_KEY_HASH NULL +#define PPA_KEY_HASH NULL #endif /* ifdef CONFIG_FSL_LS_PPA */ #include