Message ID | 20210325093036.3270101-6-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 6d7b27033726fe32583ced72f144c288699eed04 |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=ifXwaSLD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F5fzm5ZKXz9sRN for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:33:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 80455828BF; Thu, 25 Mar 2021 10:32:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ifXwaSLD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 91FFB8284D; Thu, 25 Mar 2021 10:32:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::62a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4A472827BC for <u-boot@lists.denx.de>; Thu, 25 Mar 2021 10:32:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cgt+AqZ6ZHJvnci5TE7DCxAePH3RTZIaWp2zU4dK4M3V+EFqN/peX+1R7DsRA1P4C73e5+OXscXLaYHfiWK0wi6TznPtoXcKgHS3mzI9x3x8bcb8y66Af8AXvPVcl7llPwhrYbASnZrDXhLEVWZVuzTrUYaqlDACRGK4VmvWama0VPwxlPzar2DS/ZanU4t6mh4jclPQlo+LFfGH26AsCK8PJmKciD1/l/yUAzzBrBQlrIvqjLb7hrKsIL5HSEtHv1sRovlnLOZ5A7KBdbwkV4pe2WTm8LzDTa3ab8I2pX6uvMJzFv5N1tMZij35Afqq9mo1gDOkT8UGon0uPfj6SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tZlYO22pPBLaQ9qwVvn3V7StAGwzJOEH7BOngL31JYg=; b=MoGLtSMHZ+4ErCIQT0r87f63Rx3iOMOd4CftuJi8FcO1iJD84rVR7Wo3yopEFG4Lxl8GoNm24B+81JAm2v6bYJh5s9dGs3brjC9y5YWD1F/jwAKbihWiuCg8dPOGha+8eg7qaA/0Oy0gIqbW1VzYDR9c0IkNOwCWj9gu/L9AZKsw8XOud9qmixInFWGq4uu24eu7FCMD8mBS5tVDRvAdEJ5HS0CU7iaRnxTW9fBFcUqagpdEK9kqwZ3KNWcbv80bCjYb+6l/3uZrgwdbRUJTD8feSd2KK5azhGtV81aPuYHggDieFoBS3jA/XAyTFpRAASXZeBIBKCoaPEKuwD81Iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tZlYO22pPBLaQ9qwVvn3V7StAGwzJOEH7BOngL31JYg=; b=ifXwaSLDrfoLmqGofeXiKRik3RTxX83kglbajzE19bGtB6Y5oaFcIeSs2LY1nzSdxO3g2OQSXvXdGBkAcBPT2f1i5uQPjzPOkXDvmoN32mcWwRnfG1/zMjN/3LnIkhuXj2ZOxpO4e0CzPhEiwgl63P8bfDlp616rYBt2J5ijI1M= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR04MB3127.eurprd04.prod.outlook.com (2603:10a6:6:c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.26; Thu, 25 Mar 2021 09:32:01 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3955.025; Thu, 25 Mar 2021 09:32:01 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Breno Lima <breno.lima@nxp.com>, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 05/37] imx: Ensure CAAM clock is enabled prior getting out_jr_size Date: Thu, 25 Mar 2021 17:30:04 +0800 Message-Id: <20210325093036.3270101-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325093036.3270101-1-peng.fan@oss.nxp.com> References: <20210325093036.3270101-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.16 via Frontend Transport; Thu, 25 Mar 2021 09:31:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2fb082a0-32a4-4f48-9a60-08d8ef70d692 X-MS-TrafficTypeDiagnostic: DB6PR04MB3127: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB6PR04MB31271BF8F617C4B5086E816EC9629@DB6PR04MB3127.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s3k5dj/Hjl7Jn9GVZybp7PKT5PsijOQAUYkLI/zEOj8E60DIp30C1FvcWadCNvA7e8EYA91cfWCVdk+lht54JFUs0sW/h5H0Szxyonu85/9OZc2aTNs9AD5bQKKnGY/7PZCMS14bB4tLcall4GVrpEOYXCHuFE8HkE+pO8Ez3vASQc/YLKEOnJpNUE1JG9eMjsBlLqdrcnUTQCsVfEHm9IZVQ/Cle1z4GI500FMG6XUNPkGwPgta9P3ADvh15fULKR7OjZk/4n+avWUxtAVLhmRZQEEJ/+LnZYJheSSx0IAQcKqsVy0JNU2aQGpJefgXPG1NmIrtUDxzQbXlacNX2VrZ+VF5sSbFcm44MW4eCi2MkbWHwJAEF4tbfi1WE6zktoMqSnIF3NETz6sNo3DYVuHABbKQLLijuMfV6mBUNFfBkfjF080BsoDoA1IL8DlMPjmxNfYnLlQbF2f2eS6sk0eyDgUY4g0SQmgqgMn6nmEocWpE8QtOTID9Ki/ruaU6mp8o9qwVQ2vAZmmlseRBcDipcW83TiQCIbDtit7sU9YdgAYU9yysFp1SjbnP2A1o1VqvUZvouVCoiymptoJXDn9LwrqBH5kH4Sm0hQeJoBXwz8WG8oGkR5JkXgD+cj9YfsuR5g1a4PYRrIWXIcn/atGx7gG8gOVa1m9Ibhpg9b7JIInTs75eg86EH5UxfGTS X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(136003)(376002)(39860400002)(346002)(26005)(66556008)(66476007)(8936002)(6486002)(6666004)(66946007)(54906003)(478600001)(4326008)(52116002)(69590400012)(6506007)(83380400001)(86362001)(1076003)(316002)(5660300002)(186003)(16526019)(38100700001)(6512007)(2616005)(8676002)(2906002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: snljgh94ZHFLxuJegPe7JGstwFspsR7UvxIRzrHTCfqhwwGPcPJfOxO9s1NcDWATHb1ZF9NN3BA6ohLd2PNt40c/U+S3JXjU2u60Lxdm7pMr7minBueXGXOJ5dmf3OpxM74eI09bR08zskZo8Pg23siMl+k4NCcEEH4r5PQXlsYrW3W1t2/0iZ0rmb11fWP/F15psFCgPF/U6MFE4QP3vMFTX5B2Jf0QaQ01JlChqXMZ8pdyIB37dwNbuOsOyqJ+hVpZ4EBWJNSMxBhpeaLVX8ssw/Bsy/rVXojv/bvrtBF2NCNVaQRmZjS/F0IltTTQ759saM5EIK3loMF0ty0hwC7LH3OjMlCFXBJeQr3afKDEskqKoEykDsvxS5PPfybK97EM0FLvKjmxoD2Um2zjxt8z31Ehfl54o622jh/1vc/mB8Dq8cQlIejOy0cUfGtfaDNV5OPmEwKQ+e4YvBlc8/BkKzxO80nasSlb9F7e2PhzGOg8xCekwtEGJHEZReN1a5c7QBD/AXkFDHXwECYM54/hqzbkGPpYzGq7C5vCTGmxo11eUHt60gYcy3fKtLjeBPPOrM3QYVT4iW0WZN8erCgrFOFYGsdQhQSwH/ElaHSyHRrhSrNM5DjEliDlE94NtykfuY/Oi5v8y0TCPjOLI6rav4Cj2ncsAOS7YH3RTXh3+uPGAwIfaXQC+/5qYs/tr8onjpMyB5NN2fNyuzI4D7BjrNd39QYkGckKIphjajFpsXqOsr9ENRV1D/x7Pew17tGF5Lp0kkXp+y/0Fiulk5ZuaGaHM4bCgJPvlOuA4JwURrBoZjcROa77Fb59Pv+5cTuEHLP8o9qcdQxZJNxIcGnKqRhN+rk5B83WK8ggv4ZB67fZu4g4Wh1JGLu2xopahnubh4/r1a5twSy0M2Dx3Di0mwTvJ8pwQmfXC4J38mNhtkCErpG5QGSFvl08810OPlaZVcNNXKX2Gi6K+qeP/STmLVnhIHkc0GdE6zsUQbM9yBEL35n65U6r5N+F975NzQF44aaOYTl1Pj1RV7lwMCmcxxZQ/ypJDNudswfZvA47hmr3YGfil6T1qdGuOkc4owKr9P7Sr73lPI0vNbVAnPmpC+i7YFYAXZj3MivlQf4xsB90LBo99D9Qch0HmkB327rsCjA985wgceqDcSqDeh93TZpOIfegBXaxgEvKQNR/bYREJRO1a4cgkQEuYuB9RlJak3nwJcOMSRHeEhM89wKLG4mF3aSRQdS59EHl9bhypSFFcIg3j+Ca8BZjzVUGVU6n12qLvHurs6mgoI8MWkQ9vUGrAnuhOsAmtf1t2GhUtolNwpnYap3EPthqe6KL/11O6tQ0KrgcWf0lRpas3A== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fb082a0-32a4-4f48-9a60-08d8ef70d692 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2021 09:31:59.1231 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YuS5h3iPV73xldgOJqhvU43z5aVoIGjT3JyUXm3TGIRYroep3DHjD+CJdwqpC+6hEENzO3SFgkDhf0Nj8+SEww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3127 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: hab/caam new feature and update
|
expand
|
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 5bf92cbecf..9a965576c7 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -28,12 +28,12 @@ static int blob_encap_dek(const u8 *src, u8 *dst, u32 len) int ret = 0; u32 jr_size = 4; + hab_caam_clock_enable(1); + u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + FSL_CAAM_ORSR_JRa_OFFSET); - if (out_jr_size != jr_size) { - hab_caam_clock_enable(1); + if (out_jr_size != jr_size) sec_init(); - } if (!((len == 128) | (len == 192) | (len == 256))) { debug("Invalid DEK size. Valid sizes are 128, 192 and 256b\n"); diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index 6e567027c0..dd506a16e8 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -42,13 +42,14 @@ static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) /* Enable HAB clock */ u32 jr_size = 4; + + hab_caam_clock_enable(1); + u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + FSL_CAAM_ORSR_JRa_OFFSET); - if (out_jr_size != jr_size) { - hab_caam_clock_enable(1); + if (out_jr_size != jr_size) sec_init(); - } if (strcmp(sel, pubk) == 0) { dst_ptr = malloc_cache_aligned(FSL_CAAM_MP_PUBK_BYTES);