From patchwork Tue Dec 27 10:04:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 708904 X-Patchwork-Delegate: sbabic@denx.de 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 3tnsMW4b1Hz9s5g for ; Tue, 27 Dec 2016 21:20:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="jcg8T0Df"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9CD3BA767C; Tue, 27 Dec 2016 11:20:48 +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 33kVi1MYeHm3; Tue, 27 Dec 2016 11:20:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 323EFB38D0; Tue, 27 Dec 2016 11:20:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9DA5BA767D for ; Tue, 27 Dec 2016 11:20:40 +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 2t14VjXP1XXb for ; Tue, 27 Dec 2016 11:20:40 +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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0089.outbound.protection.outlook.com [104.47.2.89]) by theia.denx.de (Postfix) with ESMTPS id 8CB1DA7676 for ; Tue, 27 Dec 2016 11:20:37 +0100 (CET) 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=z1Xq0YANwoiWw1+IppXFY4fmJR0HceuSLU5xKki6YBQ=; b=jcg8T0DfyEmS80VZ1KV10qWtHvLWIJlPjlmjaiKg9jZp6izKOswlkQAfluzwRzA8y4KFi+z4pU6CBZJmy7MK/yAIX3UxJIyovVOnDaCUiriwrka8l9K3cXGxm4CU4RM2fIESq17wTPY+S8mr0H2ZGAHB4Dqn2otkl5HHqpEvS3M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-7smt.suse (192.158.241.86) by AM4PR0401MB1793.eurprd04.prod.outlook.com (10.165.244.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Tue, 27 Dec 2016 10:06:14 +0000 From: Peng Fan To: Date: Tue, 27 Dec 2016 18:04:22 +0800 Message-ID: <1482833066-29291-17-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1482833066-29291-1-git-send-email-peng.fan@nxp.com> References: <1482833066-29291-1-git-send-email-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.158.241.86] X-ClientProxiedBy: KL1PR03CA0003.apcprd03.prod.outlook.com (10.165.63.13) To AM4PR0401MB1793.eurprd04.prod.outlook.com (10.165.244.151) X-MS-Office365-Filtering-Correlation-Id: 834d5894-e2d2-47ce-8714-08d42e3fff28 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:AM4PR0401MB1793; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0401MB1793; 3:Q4L/m8Ss/3dxIiyhCwl7CZKFPRpwasyfOogU9u9bp50/l6qmcq1SlFmYJr7Xgr3smesirr/WFb3uunoVCtXfKNfA96DtrnM0zsY9ThkzC/ygI2bRVEy1sVpIJlGE4Z4Esngn3JZpEQCMikXRabOTONFRi4glCmTmR4yFAEVt7wb+5wDSaD6egr2ETTbbL1GTggIckV67NKv1xxPLitJIO231sHYUOHXEXGYFMvdkFXHCHzxB2Kzj1r91DbcRmle0xhSLCWnaH6zZqlSvlW5D6w==; 25:065+z//UfhXehIOThQPbRW7LckFIeoLyZ91PIFWByW7k1hbPPnDX4j4XsvBKF7K4AL6evNVoYwOQjOJNrgPw/jOXNDvN73QT2a+7g0l0XgJ4Wbp5M3l9NderyU4/4HWSZtarzkGFdFy5K9iRtpgbpR5iRU3A4R3Tmp4aa7dhhq76stK9QyzMgB8N7dupu61r71eKcsFcEGgt80Tkg7QK0hwd1dgM8EF32cIkMSXdvfpQxmvyl3P7/z+7ip98vxzPNSosvNmAjQC7zXl4Ertr7i3d4MXdZyONL7FBlPG3N+qq1pOY5+erd6q3J/BssgbPtWkTmL9f4X5kHo2zkuFoa46Xdo+NwsTHyK6XxK4cxM9nnocGvzHJYQJVLKv+YJNXJKbHHN5X/e+wj+c0swuT2g9wAqYPMrimgXsAeEAlqgSuvP47j5YbM1DyowPduGkXUtzNfppFScvI1d5KG7tFLA== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0401MB1793; 31:MLnK/sp2rIgrTjvc2s8nC1uu1sL1axh3yzXJQoI1+3Y5BaoP4GPPiMOEYV92TXeCA++Uzozgvc+uiq1KgI2hFG17pj+k0zBCN6byPUGDh1JGTRax4MIGl7B0fIGxHL7roN47dt5R5XNR2oEwW9AGatz6SXdTGtsVwnj5P7BqbWIl3JiAJeM6LI6TaeL1kjfMGPPhYqjLDWa5ajSoqmAYizU4fqYi8F/2WbEo3xG+Y++1QHZqRUrvGmanaXy9hf3n; 20:RqTPEshdFjm9Qhlbt5NZyYvpT6U0NF38UUWaWXgww2rghsB48yXKE2WRmEyeA5zfzg2U5uY0u7CApMtMZYKt6ZUrS/Z7FcoDEaNS/BLuLOfDDMtKm2Lo9wM7urwB1xJ/RNmXidkA7wIpOQO78TdcHMGmmqeHB3Yzamr42ZMXxluzCjfjosmQPRIaQzrl3/6QAfLjt0RWAV4BZqlWfuJ3W82oKrQmLMKXqEBxLxVEK1qi6g+XtuY/N4ZUEpPodxS3SKAQ4R75+eWRw8iXXZQf8BzqP4+rYf9EzR804KPGHS7b5epYZoMTFYfAsFXJwj2SKEdFsAUbzenUDHJWNaVnBdEPFWxJ18qZ3JZHBm9mPhFmbb78D8wQ1y1ahCfQ/Un3GRgAsO5BJP0IOqIKsDCwIO7Qk54jGdfnyErISPrF8G5vqVZROL+bvwMyGBh5n1lvIu5ixo5yGYSjQbRLJtuItocLWWCHCW5W0Pba7Dh6YWAbuVxsUb0AGDeeMzxiGc85 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148)(6047074); SRVR:AM4PR0401MB1793; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0401MB1793; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0401MB1793; 4:jkGGM4EjSV0QIx+wpFB4fWu2SB9Bwqr4YrAUlDaGWlBMJS2+c9v/dpeJTQqT8urBJ9TVg3f4Fb4jKMgmdfionPIZFUFSzJu/igAUl3NgvhYuwhWHDHBjPEygGns4NaN7842YUl0N6zthEtmG5cs1JTZfZA0U9w8htDx5dKw1DbsgzvNRiFkG/y5YbjvZKzfCIqSITD8O9jFc9FjHC/KaBWb5DvsYLyhsoBzpZQGkDK0+5Vomqm+Rh7L+N0if8t4R6Yj5Y3rtyjznc3aJlgZqgulqGoTDtO1T6fAR4J/FVLeTti2OVOUUFKP/iSvlwS/cwTiLOFLC+ALDboowBERTqv397l/tpGrMq+aQpjFkff7uJ/vQFwXwpRdpNFKXKGvHnjHZkK8W2PUEX7+LHVeR7WUN4ExMfcG1GXxz9IpIXgbpprO0rXOvZq194GhaosTFIiskoZlDUM7+Q4jZ/OedDKbR1aiMp4DyEScRrY9QeqeilB7jArva6dHO5m6Wwl2Nk8HMY27k/yjPDiS6SvbYVt8qxMtRLzaY5SKx+g4pZQ6GGPYodd3ORiv/MmK6z/tQKjpweSQdygLFEgmjwxSXLjF9OAb7IlpPCapW2ZQnPqhixlXWBYq6sqrcAGqIixEEgHlbd4GXMCx2H8Qpn2bBiw== X-Forefront-PRVS: 0169092318 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39860400002)(39850400002)(39840400002)(39450400003)(39410400002)(199003)(189002)(33646002)(50226002)(47776003)(7736002)(8676002)(81156014)(81166006)(25786008)(110136003)(5003940100001)(6486002)(69596002)(86362001)(68736007)(5660300001)(6512006)(305945005)(6506006)(50986999)(76176999)(21086003)(92566002)(38730400001)(189998001)(105586002)(2351001)(66066001)(4326007)(6666003)(101416001)(2906002)(3846002)(6116002)(97736004)(42186005)(50466002)(6916009)(2950100002)(36756003)(48376002)(106356001)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR0401MB1793; H:linux-7smt.suse; 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; AM4PR0401MB1793; 23:etPYMH9MJJxdWemCpucjcQPVkvfsi9UdpUxGGR9?= =?us-ascii?Q?IMf29fhypJCVKh0/+oNcPM/7TUQa1zZOuDrp9jJnQWShFDachCocAlXHH9RH?= =?us-ascii?Q?yrB/QpSS/wMAQLH605dADAcjdW7al641M0BtEoWtfP2UlMyul/iAfozF3LND?= =?us-ascii?Q?j+/TUk/VQmP+BfHnfsPtDFgescy3LTz7MxorXMshaHkm3FyxxweXJXze8tqt?= =?us-ascii?Q?94oLjkGCONcPIfMYX21cZu8eZYEmZEjqZMtHiCtD5Ep9nWry5mNE6UT+8paA?= =?us-ascii?Q?V7XZvH751x6jV1NFYX6FjlUg2ffnR5kdbBFb267hDpJOTKZSt32YtRbN3T9h?= =?us-ascii?Q?V+XIN8N2ryezYkJHgLUVV0X7hxjcKBpp1APv3JcNZoRlNPY7qNCeQ4nGXvCb?= =?us-ascii?Q?uv70LQAzpT+aQuktVQd6aSmLaXoANTX5xkTaFWQ7zn533QGJpY+xfNIF9RDU?= =?us-ascii?Q?OnW0aEpbkxyv4eBqenoaBoXvTzjO5ra5uWqFRexTGM0v0wHQTVL7gaPw8ywe?= =?us-ascii?Q?IaQOo9ti/3vnIBrR2g4uIJH+Lf/8x2GZrW1lD7f+sDSt519YA3130avKUSqs?= =?us-ascii?Q?ngVdzdIYSinT9ZZQLhyv521EXwcvBsUyLdBOhf7MBTZF8llpyCsmGVsPHv2Z?= =?us-ascii?Q?HHL8c9ug/4n6yqE813JEP7TwjwpHxeyF2qllTNXVh4ghZQfL+EkpQXDetJTT?= =?us-ascii?Q?2lJfJkdzluWTIfelnYHSsNHCbj/uV4yoOPXT6fNYisL96TUMru4xCJJh0ggV?= =?us-ascii?Q?Tfq4NsLmN/nUWwKBo4pExyS+w2WUpBHv+LmR/cYw4S/VxQ5X+6wtYhvbYtkh?= =?us-ascii?Q?s/II41xR+hWP40w0FTlS5pIQU+fF7KX2LtCtEy3TY8wNDglAUh18uzVyG8eP?= =?us-ascii?Q?Lgl72nU+Xn4dkAGcRA1iQANY6uHWyxH0qyacKsuF4n8lmL8Lrri+Ui4pcjsg?= =?us-ascii?Q?EOXu7mYGk89Tp/TsrD8kKcSqQ0GpwbuhN1o0YJg+C+8U/tCMmCqkBY8/Sjh2?= =?us-ascii?Q?U69/IyTaX4CZ7OzeeabdlDrmwJDvTlxcAd5nXNttcTFv9Bk0585xk1gWYS5V?= =?us-ascii?Q?azOBdtDaD0COkJKFL0cD9WRLNYeK8b4kuliB89/YV3m0KHe6sHqwh65hIMzX?= =?us-ascii?Q?U3+kfVX6i7cUdnJrYqkwXK343yjtFFLixm5M7aWFv8eV8Is5ss2j40Uk8Ok0?= =?us-ascii?Q?AP7tejNWLvZz1+JG40Fy6acPZBAu5h67/ywOo0mcI0coATGF1YJqDBlxGwgu?= =?us-ascii?Q?h1k5yIIsPCRlIH+ODiXCq+eWJktV+vAqDS4cpXXf8?= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0401MB1793; 6:auaAMB4rWoZq75K6ae5bOYAQpPett7B/cc1cKCwtvbHl9YGeOaiPdCyDJc4ZQKXQO5tLJXfLZrd/2YzL2WqOE5/CyVMIVoVcK7U+HduK0h2ih+cUXBfyReh72RvRf5ITW3VAfaVKUhH21VNRNEHQ61rWaUDw8eFKug8B4kFmU+CcaXVcTZTxQ03gP9GBKLTTY0ogrl7Q24MInnFh6oW2wxVskQWxk0hU7omXEO9i/YieceWrmAk68EcaESujQq6cZxJlWsvvETUSvgg8dSP57RVhY3pCS+ZiXGo320vfqr4mfHInY5NfdVxX05+Xt1yzOzXB2/QPCST8CtiCrqYd88wrmP+EQ6Nj5LYFFPywAVlLaKEnBUkzVHUCn/pKMHxssT/mEdkUFAdzp7FVUgrlqPIL8U8e8H03U6aRwyh19iTHydbgrh2z+tv5kjAMXvBofQzQLhm5IFtsp/hKgmpfSA==; 5:TJ/gJKaMt65UnSzLGhq/JxCKY/VacS7yBh2F9TipWSvQLNjU1ssUpqyApyd4l7k1n8HLODSU8UT1v1iEbhwenJO9OPFlH9eBUKYhDCFVnYXz02o+UANQnXLminSOJNAQpDK3xAsIJsuvRl8+/G0Mgg==; 24:0cJ8UkNqCT8WR/QZmn8sUv4Xe7Fku1ZFSpFTLYVAalLqqmJY01BoQ1OfQfL/JO6oT7g9rSmTBW3fOm3RrUr6UMfGCxnPnCw25vGUSc94Ot8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR0401MB1793; 7:PAzUol+hlztAfGCFKBHmVxZAOCn6Rubfytrbh9pnOblLseCiFU/z1KNRXncFuUC0si6mX5bQaKJrfglT/8wRmjQFuGV3XowXJkpwDmK3j1eiGmVKkvKjKbqri1rLOcLi9uPNSo1a/puLT4ZhbafRq7ryfluAyXuJl+bjgvNdYMStG+HMMn962s/jRXpdNxcFwWmFA8xaklrqRmeqOeuB/ymZ/erGgj+o45F3UUrCFDJTFbPF1m7nTG4A4LdUmnF2oKw+fEIMU96NtTbdGyq3jg/TP/M0mXkMRrAAhrfIiiX53ABIjXXjkj/eqM0SERzAw5o1FZGwNBHhZ/LO2OgaQ7UDoRP4xwyFiEralftw4vU9kL6P/OQmhQfQMMClnEgDrMwSKt4t3Pz48VcvASUJqwUPYjpa/oFIGx1pDjolFocDZR0A/ZxU4Qk8PJcpiztgZ9w+I0QYpO0Q2BBtv9FcMw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2016 10:06:14.4829 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0401MB1793 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 16/20] mx7ulp: Add HAB boot support 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" Add CAAM clock functions, SEC_CONFIG[1] fuse checking, and default CSF size for HAB support boot on mx7ulp. Users need to uncomment the CONFIG_SECURE_BOOT in mx7ulp_evk.h to build secure uboot. Signed-off-by: Peng Fan Signed-off-by: Ye Li Cc: Stefano Babic --- V2: New arch/arm/cpu/armv7/mx7ulp/clock.c | 10 ++++++++++ arch/arm/cpu/armv7/mx7ulp/soc.c | 8 ++++++++ arch/arm/imx-common/hab.c | 3 ++- arch/arm/include/asm/arch-mx7ulp/clock.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx7ulp/clock.c b/arch/arm/cpu/armv7/mx7ulp/clock.c index 30db67d..f7eaa4b 100644 --- a/arch/arm/cpu/armv7/mx7ulp/clock.c +++ b/arch/arm/cpu/armv7/mx7ulp/clock.c @@ -312,6 +312,16 @@ void clock_init(void) enable_usboh3_clk(1); } +#ifdef CONFIG_SECURE_BOOT +void hab_caam_clock_enable(unsigned char enable) +{ + if (enable) + pcc_clock_enable(PER_CLK_CAAM, true); + else + pcc_clock_enable(PER_CLK_CAAM, false); +} +#endif + /* * Dump some core clockes. */ diff --git a/arch/arm/cpu/armv7/mx7ulp/soc.c b/arch/arm/cpu/armv7/mx7ulp/soc.c index d04edc5..6fa97bb 100644 --- a/arch/arm/cpu/armv7/mx7ulp/soc.c +++ b/arch/arm/cpu/armv7/mx7ulp/soc.c @@ -7,9 +7,17 @@ #include #include #include +#include static char *get_reset_cause(char *); +#if defined(CONFIG_SECURE_BOOT) +struct imx_sec_config_fuse_t const imx_sec_config_fuse = { + .bank = 29, + .word = 6, +}; +#endif + u32 get_cpu_rev(void) { /* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */ diff --git a/arch/arm/imx-common/hab.c b/arch/arm/imx-common/hab.c index 6731825..74bb3ff 100644 --- a/arch/arm/imx-common/hab.c +++ b/arch/arm/imx-common/hab.c @@ -77,7 +77,8 @@ #define MX6DLS_PU_IROM_MMU_EN_VAR 0x00901dd0 #define MX6SL_PU_IROM_MMU_EN_VAR 0x00900a18 #define IS_HAB_ENABLED_BIT \ - (is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2) + (is_soc_type(MXC_SOC_MX7ULP) ? 0x80000000 : \ + (is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2)) /* * +------------+ 0x0 (DDR_UIMAGE_START) - diff --git a/arch/arm/include/asm/arch-mx7ulp/clock.h b/arch/arm/include/asm/arch-mx7ulp/clock.h index ebf32c6..170a9b3 100644 --- a/arch/arm/include/asm/arch-mx7ulp/clock.h +++ b/arch/arm/include/asm/arch-mx7ulp/clock.h @@ -39,4 +39,5 @@ void enable_usboh3_clk(unsigned char enable); #endif void init_clk_usdhc(u32 index); void clock_init(void); +void hab_caam_clock_enable(unsigned char enable); #endif