From patchwork Thu Sep 1 16:56:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 664886 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 3sPzZl17J7z9s3s for ; Thu, 1 Sep 2016 20:51:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B286DA7532; Thu, 1 Sep 2016 12:51:25 +0200 (CEST) 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 nrP52xqWeM0h; Thu, 1 Sep 2016 12:51:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A15DA751E; Thu, 1 Sep 2016 12:51:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE5054B6B3 for ; Thu, 1 Sep 2016 12:51:21 +0200 (CEST) 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 ChOL66j6NU_M for ; Thu, 1 Sep 2016 12:51:21 +0200 (CEST) X-Greylist: delayed 96158 seconds by postgrey-1.34 at theia; Thu, 01 Sep 2016 12:51:18 CEST 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 NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0059.outbound.protection.outlook.com [104.47.32.59]) by theia.denx.de (Postfix) with ESMTPS id 13C904B68A for ; Thu, 1 Sep 2016 12:51:18 +0200 (CEST) Received: from BN6PR03CA0053.namprd03.prod.outlook.com (10.173.137.15) by MWHPR03MB2447.namprd03.prod.outlook.com (10.169.200.141) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Thu, 1 Sep 2016 10:36:31 +0000 Received: from BY2FFO11FD004.protection.gbl (2a01:111:f400:7c0c::131) by BN6PR03CA0053.outlook.office365.com (2603:10b6:404:4c::15) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Thu, 1 Sep 2016 10:36:30 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BY2FFO11FD004.mail.protection.outlook.com (10.1.14.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Thu, 1 Sep 2016 10:36:30 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.31]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u81AaQ9H031299; Thu, 1 Sep 2016 03:36:27 -0700 From: Sumit Garg To: Date: Thu, 1 Sep 2016 12:56:43 -0400 Message-ID: <1472749004-6505-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131171997904657236; (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)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(92566002)(86362001)(2351001)(15975445007)(229853001)(106466001)(8666005)(77096005)(85426001)(104016004)(87936001)(5660300001)(586003)(626004)(33646002)(47776003)(36756003)(305945005)(7846002)(5003940100001)(11100500001)(105606002)(50986999)(50466002)(2906002)(97736004)(48376002)(8936002)(8676002)(81156014)(81166006)(50226002)(19580395003)(19580405001)(110136002)(68736007)(4326007)(189998001)(356003)(7059030)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2447; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD004; 1:M4XOpbCurRjnReH0acznOEVhGHsZLfmNazW1irTBi+Ua8k8ErWyh+hkVl86TLIr6yLFV/cGxJccarSpFfHJnBbTWVOSefg6IxBuuIxwatdbjRgZ6Fa0oD2Cw2Mavtluhz1cCAlHGD3iosn/XOKLXVF4XdLMeTaEsXXCACN/iMX4GjqxPNNSi3zbd+H1jKE/XSLJ22QfwknkNTcaKZkdcyIX0Bq99npypBQVLBnEGB8i1BdwrynoVKFNqUq3k11LH4FXYDkpTKPLo9cgRVX2FbwpKqwmiXTx/6E+W3F4z/qXkbYi8E1ddV5eY1v9C4B22Vm9fuJX7mil0Ex8UUJf3NJ2NWPiTkF9xLg750CEZIm1gdD5SCftvsMd1N0HcBq+BOEKphjvMLshE0zvPbAWHviCpG3jB/JU4f71QYl8XBl0PDMYWbzuO0GN21k+YnBfnU4pfE1NXSJg6roQUGX5FkGi3wQxO3UUTW47AzQ8hx+gOg8CbwrXA4y2+8Aof2KMyYQPJTDLOR951NlGBwSJ9RpwbW9D4ytoePpyTc/G5qXlqRm69U3M2hdG8wP/cUjsEYFNUj4txnQmoApNlr2X18ShyQQNevtibPJsCOwqdsz2HRdL0JhuGwq/qd28imu9xYpPix/Rvd/CiIMS5FmWiHykp8W6m+XMKI2LpBD6w07riiPGPnIItFPis4EiftwCQMaep3gFy1PI4A1euiP/i0o1C1MnDikr3gUWVJLAE764= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b8bde913-69f7-4332-79f4-08d3d253d60a X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2447; 2:PIyycZND9iaVvvRc/cdOtBvcq+VU1HUvoBXf/TonLLDPz+vGoucE3wVw35/S8wQZ4Et5MYzPSnzT7FrV2AW9OKP9rdnXc7ucPtw3gR00nfOXmKW3hfQAYl/EPLHwmdnix3mJXqe8q97fq7qC/yeUdpqL9rDozvfMKG6DrGjyBrexEo8ZKN82pbIXINs6bA0S; 3:dpaN/eo9AVavqeGo2UfC0fetXPX72nqBwN9Wzo3rRZhS8/M6E3gXNELWcJqckWAgdecQ0sxONpapLBenHAooQU+cpts9yyzWJifmo5ggs37CZb0dStU+HScJHyZFNNbwjptdR8SESeLvdit06WyqsiB69x6PwrRe0+Tq5SJ0xcnzGD9m46npSk4UsjNdujUIhamKk1IEV+frDksw424nrIg6ukFMYxOdcUaEbssWTyw=; 25:pYsQMeG85DRjdx1yYmqgY0uMcwXWUi9fYexqYjk10vIhRfxoO9D1KEro/YrWwcXZdbtxTo+YX/kD9eFu0a4jykQtM0r0UaFHjaBiETWtnVRCPMJ+by/atm9D/eZV8BxNpb+BqlgRy3j3+j+MeSY7RTlUv69PAiQyjYGBYl0Fvs1CFhAP0mmZq/3/gmAMof9Nsc4KO5EAoK9EnnjYyZqvarbQm4xSimm7bw9XozfAxXpQ6bXMK4wr9P932DkXY58/n1RtzxFSsDhlSE+1yuekpRuwJi91jfnhV7w/w5RF6EUbMGkTrnfoZhqB+MCx8HyfD6PGhNtvIBUm9q0bH7qoOQT2ou3bY0R5Ie+ECb4v5uP3NoSUw/KPlKSHR8XuEp+tl5dl2hxUjbam+uk57lWxqTLIY5CU6ICnFDjmIkHxSsQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:MWHPR03MB2447; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2447; 31:LRwcT8NqAi/IaSqm2djsQbpDy1VwBRqmKC0EIIpl0CYorNIheLHT+b9TKUX3jyheu7+mzfE4r2EG9EQ3mTQnetQSxg2tZUlQKleUSlNd1xz2VPv6BR0c5u04DI+54pC2qFbedKOry5P/AqOJ+Kq8b5J9pHzbPZ3P2hhVBPXde9I8fcKoEGBPIQwWp3O31DjA35uj51xxvpeDn74JIqTDUevI3zEQC24+N3DT+mbo+1g=; 4:mwUmy8l0GIoJRiqtzzXFNqSJSZE2O6rE5J+GDGgtUuCkbx555j5XCxXFhowhL97+aqyqlvA1BITGI6MWAviBam9+Jv/FWPNF2xy4kOwAa0I9ntJjBqlxfUuHmf7tb8oKyr8Dqa31DNMkj4pA3q1qzY4fP8LL+XDPRCQf8csrgCbISt5oRSxrPYVDDngNWHg4p9KAJ2xedYIXc/TS8O5AjXfir5S9YaFgFD60nAYzV6yhc7S3RLi6ko3vrlHRY1hr1IC8ubneFHoLA5zi48/CY6KU99yg0YVbQE13U0mOSCDNbQn8JAn/2HioLvQ3kLlyRkHzlQtHFRvNmudgH9fj5p7+diiJ+31n/Du0VudTNKIMz0nP42oAAUqms1zzCl6Lmzfs+KIiVyrKKaDwnXTQNIfWs76a4Uzk3E95VJh5VaLyN0pVw0N0HHXiW1uacCROfb8kt6MGsDZMr6z4AX89axeE/tY8CcJRFZjnF9oclQjNPXx8QyeC32y3bMKRY6mxqsGjjqExDbYe55O9nWC8WxhS5mqoz/4TmWPLGDfLWBo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:MWHPR03MB2447; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2447; X-Forefront-PRVS: 0052308DC6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2447; 23:y//AWCEi/V7kNHcWwME3+S+O9bfbcT9VfQ1Fe2pY5?= =?us-ascii?Q?atTA451hHnLjWr1jVM9fCdkziYHGq2e7+FccX+DoLZemP/b0W1i/yjQzLbEF?= =?us-ascii?Q?uai1nNnMwbGGPWMaZbB+/rtz+2lHkd1XK89lbnrimZWZkZIA0nqh9apsOJSx?= =?us-ascii?Q?cDaGMeW0gXfV06Rs0JUE698pVnf3TVJVZ4GiyrlrHHY6UL8dRqZrzpaEdbob?= =?us-ascii?Q?DCzZTaahOHNaBclhW7X8XEBYmfk8BVEtQo5RkOlum7PMLAzrZe4m3RO09eYp?= =?us-ascii?Q?N5dMbScbIb7UIkm/Z53iko64CUjyg1QNPNO/9R0BIqczNLyEFuQ1ROEIxDsD?= =?us-ascii?Q?dh8eRdpeOHPm2mypYWADtW/PtpoQ7BhdJxDBx/MjaOfAVMW9mlv0BeopHu2S?= =?us-ascii?Q?obw4wFmzTZGv6Xm0zu5GyN6JrnXBb9NpAgw+/x3YvN484XVfkfm9loEuur8w?= =?us-ascii?Q?fP32j1dfz9/1Vk1pHLK00hDv7AWEkapcPvJcy0/u92AGok6OhF9gVpRRXKJl?= =?us-ascii?Q?SPNcLvtRYWDmWv17Y9NP2RqIFigD654leOyRvVUUwMhYVSvkwpaT71ZrZB/N?= =?us-ascii?Q?H7euumYOF2DW6Ff72L6FsEGu33GTWhE2sHXlQYk4vdCJqpalZwtWqBlRzCJc?= =?us-ascii?Q?eSM6CrwFfftmbIcEpi9BxpvkOs2Rz9Rw5OWAaRxI77MprT4R4bghSXB6advy?= =?us-ascii?Q?UKGboE8py5qhb8AwavlcPjoR+5rCwJs3x+cdQhM9aIinJRSx2om9Y8+atOMh?= =?us-ascii?Q?xHUFCxOe2NM9B/EUuGhJl9/5Y7ivzBMyrZlTnwcniAdhHkfWmpHybHtRbGB3?= =?us-ascii?Q?IG9c1gGqo/TaOB6KY199grhBYzSB0Pu5zJyeWofKNVgMN1VGzyH6fGV/kSpN?= =?us-ascii?Q?1oXOtWy5OxnqJRzURLGCLqGLZ6YkuvM0S4o1g0qDbAzRXKza35Ukt/oYLf4h?= =?us-ascii?Q?UvUQC76LkNtDEUdlIcjKsC6dE3GzfD7t9chgppzAEQCaFoiiPXBM012ofNRL?= =?us-ascii?Q?i0UO6i1SHlvy8hRVzJSFrUivCfy/F2oN+Oo2RRZwSiV2J64X26akDFr6FrrF?= =?us-ascii?Q?qESF+ESR4GcUMSKkcdk1kfm31Xndee2um3vZU0Cljq5u8L+O3gPLWEKAV43s?= =?us-ascii?Q?xO6U5v9J3R27PQa4kAU1MmpaV2xHbDUTlPnLS46aFLylKOwMU9Z2SXuFu67z?= =?us-ascii?Q?7osxLcDxya1pPs=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2447; 6:J0mx0CfCYAy+5xvXJnDNu/tiofipzXpaWJx76XMjIDV74B+GrMDwsYxUP2NIVnVvS+tLX7r+IpKlpieakhxIXAiStEmeTAFGxd37yMf+06WHr0lJftzYAPg8uJqGdvEOZ2/47AbHR1KYLYObg5sMErFhjsyTwo+7vzw7STF3HABwWwUKjezUTrc28DlAgB78lyQJsCqEYHYWQme4Lh8m5dYToMIYNme+MExuP+YQdywZvKLeOWsm460x6Dvqp24gl4cdoXWgXMWXEmh61NDkiQ5V326LOJBd/cKM1yEmI8Q=; 5:dgmbRnNh0N+JantE7GlVXJBPCwkhirUt8YJIBds3TpeqFs5bG0ggiC6qRBfZdesrUdhEj/5AXnG0XrJgPhPkiHNqhchFI7N4ii6GZEu6/TuHXHIJoP4JYObwIZlJACaIjYT88RfaV3buLt+nG1TnfCM1A5wzSZ+3ewnwt97Iz0A=; 24:K7u13xIXq5AU94oRWC1qlUk9aAzqTS6LCk0UGXph81Tl64Raba2NvIL6vc1wo34AGPeGDcNhDEnfSI3HugzlI0Oam6ELUIG3k69NHz33lcQ=; 7:GYQhNzXf0FAfkKloxqBL9vBwgI5bYB4V64vp3q/bemkl1wqjhHTpBPIaA8Dv4shTo5MkMOEFB9xN6MZUFjkJXRLGawz5LNwWIIInTGS0Kmb41iVFobktbhus+VH36The4wuO8B/oGnGc2NmnYJYnE2OJSCK62x5bUtDxdgPLYcVxrSSbRzpTCToO95ohugGMmiBmDkVIrBERiD3GQ+I+pBe4y49NrmYp5YvP2ma94g8nt1MREn4B1FV27lB1zEE2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2016 10:36:30.2629 (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: MWHPR03MB2447 Cc: ruchika.gupta@nxp.com, Aneesh Bansal Subject: [U-Boot] [PATCH v2 1/2] board: ls1043ardb: move sec_init to board_init 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" sec_init() which was earlier called in misc_init_r() is now done in board_init() before PPA init as SEC block will be used during PPA image validation. Signed-off-by: Aneesh Bansal Signed-off-by: Sumit Garg --- Changes in v2: Rebased Aneesh's patchset. No dependency. Link to patchset: https://patchwork.ozlabs.org/patch/586783/ board/freescale/ls1043ardb/ls1043ardb.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index d3e37b4..70fef79 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -94,6 +94,23 @@ int board_init(void) enable_layerscape_ns_access(); #endif +#ifdef CONFIG_SECURE_BOOT + /* In case of Secure Boot, the IBR configures the SMMU + * to allow only Secure transactions. + * SMMU must be reset in bypass mode. + * Set the ClientPD bit and Clear the USFCFG Bit + */ + u32 val; + val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_SCR0, val); + val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_NSCR0, val); +#endif + +#ifdef CONFIG_FSL_CAAM + sec_init(); +#endif + #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif @@ -137,21 +154,6 @@ int config_board_mux(void) int misc_init_r(void) { config_board_mux(); -#ifdef CONFIG_SECURE_BOOT - /* In case of Secure Boot, the IBR configures the SMMU - * to allow only Secure transactions. - * SMMU must be reset in bypass mode. - * Set the ClientPD bit and Clear the USFCFG Bit - */ - u32 val; - val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); - out_le32(SMMU_SCR0, val); - val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); - out_le32(SMMU_NSCR0, val); -#endif -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif return 0; } #endif