Message ID | 20210325093036.3270101-24-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 68a905d1ff5454201e1617d1cf920aa3648a5855 |
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=Mnafa0wU; 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 4F5g3L6C2jz9s1l for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:36:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1CCA8293E; Thu, 25 Mar 2021 10:33:46 +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="Mnafa0wU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 09B80828F4; Thu, 25 Mar 2021 10:32:56 +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 EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::609]) (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 812EB828FF for <u-boot@lists.denx.de>; Thu, 25 Mar 2021 10:32:52 +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=jeqfQgy68Ryh3DC5vXEyA88J1JpaJUa9mNiT/xQYQa8++ukoNbwYtX+GZ5SFcQn3yZPX6IBNIqdsrqAqrkzMDaSFyEJlbdO6ZF3EAGp1fWNsRqRDmjyDvjHDK/ORuPUElojvXqqG5R9gpncLVgED4i6/oCfLkh3CIlWkkFi+hdKZ9TPDEZTAb2v3xjuLu1znBBrN/cZ/lEChiKDfR7+ROg6zAU7PH+lZuH+3bcHn0F44LWFTC6+flUYCqT6hbETvQqp9csK8GNPQT6aX/OMJjPks5yl7tQ3hgnKm2/Llt4Emo+5YY/Z7gCBoLiZEfBLwbmP8s6OmN4L53InIuzcDww== 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=e7kgJTxez7ECk9g4ZIsfnIuvBQ7YYCljkYao4i3IaHk=; b=KnBV820g4D3IvHaQA+Yx71AAzZivVLPLKtzvYOxDogdC0DebJ9R9yvFMAch3Srimp4XLuNXuX0v49sy0VPFFwnlFTemVEB6AVHLxPrbx90O//1sqxzA1xHmRYYKoevkDruH9nX15AsBaFGEU9TgXdsGHVU8sAtSfRHR6dMAx3R131EUUQ4BIwWTe49/mPTdwEL5sRiLuQ+7nthlhX4Ze4EVVrSZ91lUauoYDpwSGR4xSPVzo1RgPZVHqtWRHH7AZ3/O3oF4AqSFhOFXuh6vROM+byVKPEgXFPqv2F8oztfLnHXkVDe547LO7IQdynqdY41MSR5TlYaTP5c5Nm2ZjIw== 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=e7kgJTxez7ECk9g4ZIsfnIuvBQ7YYCljkYao4i3IaHk=; b=Mnafa0wUowWRev02Wu/Y7EjMouoYOqe99v72Ki5lzTqszm3PErxqurZBJUaLpyvcdy8J0AdV3mUOzP+i+kx8E5urPqXciG5UmmP3jWjc1HvjruSdBvg8MQpfq0LX0q8yz/ZezQO7fzHboSsKiEtkHQy4jsbujsOH23eJa+TyCSE= 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 DB7PR04MB5243.eurprd04.prod.outlook.com (2603:10a6:10:17::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25; Thu, 25 Mar 2021 09:32:51 +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:51 +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, Franck LENORMAND <franck.lenormand@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 23/37] crypto: caam: change JR running loop Date: Thu, 25 Mar 2021 17:30:22 +0800 Message-Id: <20210325093036.3270101-24-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:32:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 57297a13-f452-48ad-31bd-08d8ef70f5ae X-MS-TrafficTypeDiagnostic: DB7PR04MB5243: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB7PR04MB524304F333984BF7B1C03BFFC9629@DB7PR04MB5243.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:597; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnx/xdF+5HHk9iQg6MwDt0BBKJL6skc+ZHj7y6R7FxIrfaog3NjDdErbVHKkP9mrPQIk1vNs+7EuiRqVLVMaPJJ9okg50DTTSmZTIIkOqCByEXGFBx5pug70UubQfCPge0+9W3zOcxfg+a+4bVDK4x0b+89e7DYSjsiPzvP6yD/C+rTRuaGgYyTjxG2ruhPqNxH5T8Vh9uzVHFOxRcJ4mkaQ3ORYseNiI5UMWnc2ILR6HUwLqUb05cPEj+Lkyz+IDR3FdzWtAwXRdcHeDhW2PSoy+ll4qpf6OWrKTO9/WRj8nJAEoJSrXX5Uc6EYEq49MvYfewR3nYzH05zPMFzkeSzV+Dk+JBLfDhDI7uuhGP53RBMjhF68weOMVFqeU4854PfHts9AL3e4T+hxYWhBStC0H/4xosHqnWs+/reuDNdXPKYqvRbKkdjYOo3MM/Snhs+Bea0IU5p/a7OdHOmkIY9TP4iQDgvgpIUQv3d6ztl2Rkr2fq+Rg7zbL2FjMKWBGcW8iEwccmKKhh+6mxR+U+mZEVj2NBBzo+1IpfEThUPpzEfr2N4ZvGBwjogy7aqKKRZfFgk6J4IQX7++WUB5PrYiaetNyfjf1y6FccQ26Epwt41Rfj7VPfrdSABDpDWwa4y7uzipDFFeK55VKNx6qFRHFLTkQiOsC1iXsPvUmFYzFGGG3mRq14Oyi2rxUnmj 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)(136003)(366004)(396003)(346002)(39860400002)(376002)(83380400001)(38100700001)(956004)(316002)(2616005)(5660300002)(66946007)(6666004)(66476007)(1076003)(66556008)(86362001)(69590400012)(6512007)(2906002)(8936002)(6486002)(4326008)(8676002)(26005)(186003)(16526019)(52116002)(6506007)(54906003)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: g1IHfcWF7cnYKVPnx6ndRlfIV8k/hfQLxK5kpxY6vNkrK2wgAScRvseBmkDeIXt+kSfECBuJCT2crLlpOtweKYoCOkG13XvNyFYWCGduak7WGkv8ff62tE5DiKVUB46XjTXcWPtlOzeu9SSl20UdFA8s2offP4vJzywBXrjqwiAy0aRP3Pg/9nehECTQKB4cqlgI8b5nwkv53AO8C++41dlWq8yvEmXT4eTDiz2oISyFG+J1xqtW7CDG07ofMyFag8wWXW0f2e0GJxwWgBblbISxvWnAzVeGkNFzp76tKAWrWR0Glm5AAULhD7vTHkkiyfV7DKlgDi7dwMKKpM7+ZwR0B8bzX4swbr1+6cnXVzOihiSWdwLl2MNTbAt5O1uUQt1a1Me4W36bcBSx0deuUqgJ26HZN6TFKY9z26Avb/5Ffv1R9TDQJVZ+cq+ORQiFv3Dl8BL6XfsQSn/fbLtbN04J6uQ0xTIfd/gLnbG/kjjP0yLDLcLqyLzQi67n2BE4js6qNIXsIW+sre5Q8vLR6RZVePNaT+fq3aR1GbC1Rth04il4J22yomUNyqSmv0r9XQ1Trm6T6tD6f1m6NCAwgTYVswxRt3cWqwLgD+zuUMBYKogskmRNmzYMhL0q0+MG+wOFsxjwct/haIg1yDQbyZXA5RkW3haYgJdvpmEl5RsIMg68szGS2w+GNaKYyGldAli3O82oGYAK7dIcsu/xTohOzVxw2MM7D+S8FiSdd9/kiMXMjOFC40rhR/Sj0UEFAgqeISSmGy+esvS/CWWWFWBHAXc3ecri2wBEoang8MPN6UcIK20CYStQ5z1gcBL3lFLCfukVJosNzGI6yxa3M+nsP7pnxK47IPL8Irf+RRBokU5382TiBch4WI+iQt/xplslFqP/gk7zQ5F63GRAYnMRDCdWV5U143Y7QMEdVR/T7hqqyeceUKlo37hRsn6WXXAR/UVNuP9owtCcpI8cddrsto0Nam35K/bznALauhjk+4M+G+woZwuPP9SzzHZUwjQEHY6ee1aeVeCWfcwwH/ObTgrJ898icesmsm2c6jwlAEL+f7lcRjmCWIPPIPj5g3llEM5K/p1m0uy7eL1nCE0n4zrwS/XNEdf0eNDibyY9yQ5EB6FYgDKQy6FE1GbWDuhAVduKG3wrlLG0/H3udRGjm9Cov0iLyS4wXc6BDZ2MmOG1R5+1oCwiEh2Kc5f179nR7csHaF/pcgpRs1B4G0ZClbCcT9ZAcil1/Cgf0s4b+UlFxouB3EwCJrgWnVpG1mvIvG879Iy+oP4DA3/vNcTs+Gko7diuYL0YVZnmLHn8utFWS1SzuCxgd7qsQUrLKk/S+YAQ/8madlHV+9kqOg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57297a13-f452-48ad-31bd-08d8ef70f5ae 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:51.1873 (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: gtVHtL5I+6q56xUyJeY5pY90GL3CjmczT/gOYJLhKFSAV2SMhJPUMj/LpJTAPIiIk8stKCFHzP1ti5Ksj/joUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5243 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/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 44273c345f..de5e68bf8e 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -21,6 +21,7 @@ #include <asm/fsl_pamu.h> #endif #include <dm/lists.h> +#include <linux/delay.h> #define CIRC_CNT(head, tail, size) (((head) - (tail)) & (size - 1)) #define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), (head) + 1, (size)) @@ -355,8 +356,8 @@ static void desc_done(uint32_t status, void *arg) static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) { - unsigned long long timeval = get_ticks(); - unsigned long long timeout = usec2ticks(CONFIG_SEC_DEQ_TIMEOUT); + unsigned long long timeval = 0; + unsigned long long timeout = CONFIG_USEC_DEQ_TIMEOUT; struct result op; int ret = 0; @@ -369,9 +370,10 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) goto out; } - timeval = get_ticks(); - timeout = usec2ticks(CONFIG_SEC_DEQ_TIMEOUT); while (op.done != 1) { + udelay(1); + timeval += 1; + ret = jr_dequeue(sec_idx); if (ret) { debug("Error in SEC deq\n"); @@ -379,7 +381,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) goto out; } - if ((get_ticks() - timeval) > timeout) { + if (timeval > timeout) { debug("SEC Dequeue timed out\n"); ret = JQ_DEQ_TO_ERR; goto out; diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index ffd3a19273..1a215143d9 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -10,8 +10,8 @@ #include <linux/compiler.h> #define JR_SIZE 4 -/* Timeout currently defined as 90 sec */ -#define CONFIG_SEC_DEQ_TIMEOUT 90000000U +/* Timeout currently defined as 10 sec */ +#define CONFIG_USEC_DEQ_TIMEOUT 10000000U #define DEFAULT_JR_ID 0 #define DEFAULT_JR_LIODN 0