Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vabhav Sharma <vabhav.sharma@nxp.com>
To:     horia.geanta@nxp.com, gaurav.jain@nxp.com, pankaj.gupta@nxp.com,
        herbert@gondor.apana.org.au, davem@davemloft.net,
        shawnguo@kernel.org, robh+dt@kernel.org
Cc:     linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
        NXP Linux Team <linux-imx@nxp.com>,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        silvano.dininno@nxp.com, V.Sethi@nxp.com
Subject: [PATCH 3/3] crypto: caam: read entropy delay from device tree
Date:   Mon, 30 May 2022 23:39:24 +0530
Message-Id: <20220530180924.1792399-4-vabhav.sharma@nxp.com>
In-Reply-To: <20220530180924.1792399-1-vabhav.sharma@nxp.com>
References: <20220530180924.1792399-1-vabhav.sharma@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?F+XTNmdbI40FoT3uP/w5f17REplrj4R12UxDeca3GamXQgMQgN3OaujvGkyB?=
 =?us-ascii?Q?om/VCQDcaLBc1zUw80w0thDo6kiF8f3zp0tx2YPoW0briGlHpYCDFsKbzpTh?=
 =?us-ascii?Q?QXGtleW8b0+0zSMs+NsIojgyCzFafImPPIUT1Egs8c5YfEBfEMOu5XhKT+dG?=
 =?us-ascii?Q?y9JZUe99o3Ps+dB3zBKMiQV0I68hAVk4KeCS9zg0VEdVnvukcjyY3eMBlk01?=
 =?us-ascii?Q?MZTYK5J25JOL+FVp4Lr86II3p8W39flET5nwy8l99biw/S48o1PMXlV9//JX?=
 =?us-ascii?Q?BVDCl/RZlYBI/6I9BctZ69SFiavLfJbUFMzNc9Xm7qXjrFSyFyvVUy67N3GH?=
 =?us-ascii?Q?9U4NAciIrUreFDMtyMXul/pb7LKztGL5+rDeHseNiTwZW6doEmrj3dilOMuN?=
 =?us-ascii?Q?5mXgMYk6+kim2n2i/cycNs7sSvAxAP+WIfNjVcXsp+VldC8OSMk/J5nsXIGq?=
 =?us-ascii?Q?7bE/I0XG9VLzrhG46ltCmD8SX1z2Y7BWM3aqMbAC5SE14kzzUdADMRHzndsn?=
 =?us-ascii?Q?+TGO6u9aZthjDImdtV05gRn1+i1KmgiXwjZn4WO02zbDJHFwM1L7tJFsOJOz?=
 =?us-ascii?Q?B8vKW4rxdtg4NqaIFqWCTMoMvc9oiKoJQE2kAI/rkaKh2kcfI213a5mmQH/Q?=
 =?us-ascii?Q?c9oYCO1+p6M7zIgRuq68mFZpjvqWwbsOr397osQj/vKw2k51e256ZzDLrlzj?=
 =?us-ascii?Q?HSdpvcdC8hQ7LKntRPau/LvG3NaoLvbL0M6299+m9rFhiCmPNDPfklGfaLe5?=
 =?us-ascii?Q?O8LUZZFNYd4us6KdYZOZ6/lj4FIiLLZoPY2uJvpycnfAfOv56uXWVXJazzm1?=
 =?us-ascii?Q?2PoxWPYTl1mL+euBHAaac67Z4sXi9bS9O5hTQjbytA+i1w0XFD6cgntD5pVy?=
 =?us-ascii?Q?BXuQXYZZy2geefTTOSFeaAHPHyeghHFvPvMEINcw+oUSJmYvycjdXKxCXdYG?=
 =?us-ascii?Q?lyY53aK2Otq8JNaSYlD3eGgzojesZFCciU9pf3RXiW7m0N9psHoiZt/K+lGt?=
 =?us-ascii?Q?P7SFHnyBnds9O+gY9O4+K2UMUUCcI+BuwLOj6TWtvoeQL1C+dwPvZfMfJk+I?=
 =?us-ascii?Q?tYvC/B6U5uLemjsQdKF7NuXk7tT0RPb6fN7aQvOtH14XkXVvWSNaIV8AJmrI?=
 =?us-ascii?Q?FMeDP1FYb7RigaTWGcoYpvKwMUgJkkutLunqIqLhb6BC7JotBYii3SxPJPM+?=
 =?us-ascii?Q?gMLL05yl34ZyL1T5qpIDwGr2f4WZbdKZFPMfPJmb3A2HUa72uiCYD41YiW/Q?=
 =?us-ascii?Q?VOCxeANEzWtv/mRgHwWmFB/sBwyNZW0ut78vsr5iVrpzQM4DRw88KyArSVi1?=
 =?us-ascii?Q?DGJzavHso8oJRJPZ2jLq0kZWncIv7Pmn5DurFp+nEmAn+1rLRNKgCDm51DZ2?=
 =?us-ascii?Q?u6fHIw88YX31VKu6QRb3XQIfVHT8GC+NF5dxz5qxWtqSSSesvlhSWdPcIczt?=
 =?us-ascii?Q?TqDeS2M0HquaObVhq8+037eBbUDX8/t5gOevhZk6yQCnic2zGyrnqYh6Eq9Q?=
 =?us-ascii?Q?OAlSHMJHoRx1/vjIj+Eup5ZfQHviy755EBddbz0YEEFNkzrNmRusirvlqb2d?=
 =?us-ascii?Q?5W2l19EVmtLW2zGHvzDdB4cGtQ/pNY4fnKkEDimxsLJIqlK/KMI4Uuf1vVe0?=
 =?us-ascii?Q?UBxxj5bsEkfdn1h1GrONgVEc6LT6WrpcltVNDEPxLU0V4g5t1snp1jAZgrEl?=
 =?us-ascii?Q?d26VUHlSWU1wdPHVs/RiTPr9W3l4A4Z42m4tQnppHWtBk8oiETNrmxFSsYOT?=
 =?us-ascii?Q?L0I/JWpjsJh+Goo2D4MaKKJkIBU99RE=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 465b5490-841b-4b19-fcdc-08da42679cd5
X-MS-Exchange-CrossTenant-AuthSource: AS1PR04MB9358.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 18:10:00.8087
 (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: iWXxdHCE1/xiowE/pg8pO2ltctPNKGuC0+UEfPPdr7I/mcEESrI2zPPc44ITaI/T64Q1samadIBIKKJgxIOx1w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4462
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Read entropy-delay property from device tree for
TRNG configuration.

update the value if entry is missing in DT.

Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com>
Reviewed-by: Gaurav Jain <gaurav.jain@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
---
 drivers/crypto/caam/ctrl.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 32253a064d0f..5ffab99d831c 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -619,7 +619,7 @@ static bool needs_entropy_delay_adjustment(void)
 /* Probe routine for CAAM top (controller) level */
 static int caam_probe(struct platform_device *pdev)
 {
-	int ret, ring, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
+	int ret, ring, gen_sk;
 	u64 caam_id;
 	const struct soc_device_attribute *imx_soc_match;
 	struct device *dev;
@@ -627,7 +627,7 @@ static int caam_probe(struct platform_device *pdev)
 	struct caam_ctrl __iomem *ctrl;
 	struct caam_drv_private *ctrlpriv;
 	struct dentry *dfs_root;
-	u32 scfgr, comp_params;
+	u32 scfgr, comp_params, ent_delay = RTSDCTL_ENT_DLY_MIN;
 	u8 rng_vid;
 	int pg_size;
 	int BLOCK_OFFSET = 0;
@@ -847,6 +847,16 @@ static int caam_probe(struct platform_device *pdev)
 			(rd_reg32(&ctrl->vreg.aesa) & CHA_VER_MISC_AES_NUM_MASK);
 	}
 
+	/*
+	 * Read entropy-delay property from device tree. If property is not
+	 * available or missing, update the entropy delay value only for imx6sx.
+	 */
+	if (device_property_read_u32(dev, "entropy-delay", &ent_delay)) {
+		dev_dbg(dev, "entropy-delay property missing in DT\n");
+		if (needs_entropy_delay_adjustment())
+			ent_delay = 12000;
+	}
+
 	/*
 	 * If SEC has RNG version >= 4 and RNG state handle has not been
 	 * already instantiated, do RNG instantiation
@@ -875,8 +885,6 @@ static int caam_probe(struct platform_device *pdev)
 			 * Also, if a handle was instantiated, do not change
 			 * the TRNG parameters.
 			 */
-			if (needs_entropy_delay_adjustment())
-				ent_delay = 12000;
 			if (!(ctrlpriv->rng4_sh_init || inst_handles)) {
 				dev_info(dev,
 					 "Entropy delay = %u\n",
-- 
2.25.1