Message ID | 20210325093036.3270101-7-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 55086e196eaca9403a636ea7079e7135bddbbece |
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=b7xeDg/o; 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 4F5fzX3NPsz9sRN for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:33:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D2E3828B6; Thu, 25 Mar 2021 10:32:37 +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="b7xeDg/o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35BD6828A4; 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 B36A882807 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=P2ceyZmidVjN20ZThq0vW8y9kZTgq7LWGgPPoeatAdDbPJFMb/Ry/G0zBMMZGTGAhZHfS1MuQSF1BBzm3/wwbz7n9MWxaewsIKDpdtXLKNYzda9/8RgNPjCC1nGLp+479AzCPA4rM5h6xkZsrfu+Ck7hFJ1ql5v5lRE0ywXFfHfOBsMqBaNqj9ymDnIm0TN2rRh3z2h9tNIHOpaizSCdvkM4mEsOk+wcT8ZkXGnSYH+KqRciYW+IjXWvFSRxSnkjd0M/CTDrOe7Kx6qXVG69f2EUtPcXIWODK32hm3XDccKDu52GvB03Pwbiq6kFBK+7GFiIFzJZHe4S5o6aHHFMEg== 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=Ks81c39XHJfREI+kolyxseNR+Z8XOQKRRYqKqKzdDwg=; b=a9Sg0E/yu4QqYtiHWbsZ/6YCsjo9bhCvsiuTJz0SdA5KOwbSVC0x7YA98QpTJto6DJwKZvmDQAXkvDMx0C46H29x/0dXFpYGJubRMwFmXVK4iXBaHpFDk4WlgASjVzY8q/ukogny26rsoKyh9AAjn3TkATbmyIL7PvL1LhEhIShdKnX1YiUsAxvAZzL/ln+zMu9ad3IUQstoCQZ5IOsGdHY2ONq/12A0aKRXqpSqbKKKwh9TR8pkpWb2B26DeM6c9CiI002635nl6XHK5zvDh7XlG2wDApTPbjsHB/Krd6PLCH31oDQWeF25Wfv0oC0OzXLpJTa2jXKeraMwg8jpnA== 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=Ks81c39XHJfREI+kolyxseNR+Z8XOQKRRYqKqKzdDwg=; b=b7xeDg/ofnLdtKNkzRaYAi6WK0L7gcCgTLFoDD35hEXI5RdFbyV3Ykf+iaQC9ppdTTLa5fPbrrPDVwk6YkgltU2Kx88EOoFfosc6QcsICq+apiepKoR3B59RICLefLjWTGhK3bmLKkJ/LH5UQM/1eGzeKiXXrcMaBPvSXn9jgAs= 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:02 +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:02 +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 06/37] imx: Avoid hardcoded Job Ring Max size Date: Thu, 25 Mar 2021 17:30:05 +0800 Message-Id: <20210325093036.3270101-7-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:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b0cf93d9-b529-42f8-9979-08d8ef70d855 X-MS-TrafficTypeDiagnostic: DB6PR04MB3127: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB6PR04MB3127FA957FE8657EE3D739CAC9629@DB6PR04MB3127.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /31y8gf+i5A+1Yl/chxUPNzF/LTIaaEQECFfvErqlqL4tAhutUaqmZiogLrPxds9yyCxHfEww/02uj0Tg8DLONynNfLAMmvdg1cbQv+4DK91W6FJSwbDm6ZLF+Lu62qt1T+AusC2FsDKnMuvq9+0yHgbwmxPciywT8ANa0jn3DjCDSfP1mmv+jBCJch0BVgqTCHXF2vnRicgykn4N7iguOSLkrFIN3FgsTPqV/rada19DHyn9mLnc/IcAXGyG90wuihjCh+DAelaRv4K85S4yxia9gOaAt5HDs6i6P8Pipgv9DkY5VdJcy1qu//K5cW+ot1gUYKXUM8YTOrkewToNRJL1wG25cezn+HLtaw3eBZ0v87dbAGZlB6lwYVB0aQIkuN/jIhqRVe9yH+zSX/v5BuZGw5AGMvLOJsu/Kcj0VlEio2pdGX/BQTg7mCGfQ4Af47QnMjg6c9IP60ykZqlZugYw9GOeF5Epwv0/W4ZDHYBpnOagL5NNkk6InAeOT/wqJQuIuhu3t7Zn4F/IObUnYyUBNmkYpRuozG/RTO7iG7HL4J9Q/a6+MFNJ1zcVxJYrqOccW5/1JQ54UbGDZSHPe0IFzKYhzf0szXkpJJPw8wFIbmCOKKRiU2OGjisMzXtDDomWvynpJsAVnWujlzrZTQxrHZo9hmca4OtxKa65Awb6dbLlNbZVacf/FBABUK4 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: PXwosY3Wvjqw/YZO3HL0meJYH4FvPQcUbPh7JoC91x/0L+bG8WCdOyvxv7yFjgbBWgKf19TFt45llCmzZWo57yD+6+2AFK0BnflN6sYV7+oJU3gAK0QfqZ7dUOXYwa9qU1Lva1atUg6tIhIh5c7DXnEUbg8OqYwlF0KnfAMiYwG33VOteeWAt3ob8geYJ0NeYhHy2Tyrq9XPeJYN+8//spTfxqFglznmJLuf/F9zWBpfMWExDeP68OcSlkpa3oBpDu++FnumPyyZZil1IclmvPQUoU7Ut4syZY7TLB7jxxUMHiiIfq03+96AchsjCqZ7tSQKuGz41GAmvEv81xh0fDhmX6quPKcMESBcpyXVw7DaEJwOpvpuW145Us+x3jmNw7lNQrq6Tw44Cft/nd3Pk+y5eJTiLCFkj6IKPQQJygZiP4PNWQwdvLs43jokvVbpkcUt+eQH4u8UInq8CwZYWSlzdaUey7uMf10eMcD7mUhPHrEsrRzDiXGZCKdNL6bDDiHaNhUwo4tg1a4fYMWRqTcmUpUGCXMAjKBitEc6UjU5jW02js4vmbtXE37lL9N6KRC0pi4sucZexCec6p7VFMy+grJ4WZM33rokE/ElaBOx9NPAhxwty29BKx7S4ORbejJRQktUrL6ELdw6GbwxgJqxOHln2ikUieTN/G1HL/y3y6MFzUhCcJfA12Qq1XrZpLcnp0MmWwLgBUmur7zStA3CszExTDycRWe97hX40WtnufSAnRaFtumB2Xq0LKL5McqWXpUx8LJWf70NmPsJPvJKwKLlXC3HJ67sjaz4suuvyWXMUBePenkqvGLNp8ZY6O73/gJku+2sKMLip2NFsnE7GUChnZe403uzL3WNjtyYs9K7xNTIgkpiGur6EyogrXT1Puhjyc4Bt75C2YsU70s4DuV8igY7oSHlfN2C69sPKgu1UYSotpimKNacjIJXvsBm6LNaXbc9cgPv3qqXeTwYuegSeCR4qLU7ABsQMc+4XCpHMy0p+8Yytg2qadRa1R86wggK9E7iedtRSBU4kpsWxkR3nEHw0YSkJid42fmF1y9QwxlmqU3l+AC/+e0a0pN2m2qWpJhurZBRNvYeqfJU4YBHsijp1zMiK3a9S7U/jPRnF/C+Cg6Ib++6BOaqwGws982icWPNQBbYAM3ojex3KQrxLVow2UigyxrV4884X01u9fcd06MvHMj1DWivJMG3TItikqM2khDhoFH3zu6xZ73rvYDjsbHiJTlHkNkm3esTHhI8oZZt1VDUw+MKqA4bmSxj0SBcwupWFy+c/KEFQ9kF1I5+tzv07NeG7z7V4EOycaboGpycjvvyYrtO3n5+So1vlkjAtW3DRs0gBg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0cf93d9-b529-42f8-9979-08d8ef70d855 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:32:01.9518 (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: hl+uygvFHbi0iR8zIR0SUSZVWblFe+JLNh4LbdXZzF8mIJg/lJSwhxNtmeHgA8aOFmg61Scax7DW6+7blUo33Q== 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 9a965576c7..bd380429c0 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -26,13 +26,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) + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) sec_init(); if (!((len == 128) | (len == 192) | (len == 256))) { diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index dd506a16e8..1430f61909 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -41,14 +41,12 @@ static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) sel = argv[1]; /* 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) + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) sec_init(); if (strcmp(sel, pubk) == 0) {