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:   meenakshi.aggarwal@nxp.com
To:     horia.geanta@nxp.com, V.sethi@nxp.com, pankaj.gupta@nxp.com,
        gaurav.jain@nxp.com, herbert@gondor.apana.org.au,
        davem@davemloft.net, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Subject: [PATCH] crypto: caam - optimize RNG sample size
Date:   Mon, 12 Jun 2023 10:30:42 +0200
Message-Id: <20230612083042.1256966-1-meenakshi.aggarwal@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TjFzUGpxUkd4R0hjQkc2ajhYK3JaSHN5ckxDazU3RnVDWEQ5V21XNno1ajYy?=
 =?utf-8?B?dWdtYzlWS0FXcjJFdmxRdXdpbHo5UklsSGFzZ3NBcHN6cjdqbTBOTnRvSUdr?=
 =?utf-8?B?SHZmY2xWbFdhcDlyZGVoWnBKTGltYUJzZDRNODRPQWRqTE1sVDVwSEZBRE1M?=
 =?utf-8?B?Qk9sb2l5OEwwYVEvQy9qWXl5SWxYcjlnZVZFSlpoalVCNU9TaUxqNzJOTzQz?=
 =?utf-8?B?eDFVbTEvVlZ0a2RMMHBKS0drcmZhOU9nc0JQcXc0OFpvUVBMeW9jRmdsMnd5?=
 =?utf-8?B?NjhVMjFRRk5aT0gxdHNaYlNtRWxpSWpJY0VWb1pNa2JMOHBaaHhtbVNGbjVp?=
 =?utf-8?B?WWpFeTRuR2xNdEl3TE4rbk9FRGFCMXZrYWFwbkJtZHRqd2FKRnlHbzlVdTB3?=
 =?utf-8?B?Nm9yd250dS9tUy9Iak5kSGd1RXNleThyYk1USFdBZWhHV0Z6dUNmbW1LRWdr?=
 =?utf-8?B?ekRweWRNL1M4azJEQ1JwdVZLWUY3MFBMMGtnd0IvTWlEa3dRVTQ1QlVzL2lw?=
 =?utf-8?B?SXpJMkk2Wlo2eGYzTVd4enhKUVcxOUM4bERuWWVyMFovNWtpUHN2NHBMTWFC?=
 =?utf-8?B?VC9WejlZL3VlR2NpY2dFS3RsTmRCT3R2QzRxbEVTa1dNR1NMZFBRN01tMFlY?=
 =?utf-8?B?K3k4ZEJ5WDVhNE02T1hzRWIrWk9jUmc2bWs3dWt0UmpxQStzaStXKzNXYUlz?=
 =?utf-8?B?Q0hDdVUzVTNyNVhHNFBxRE9NR2F5YTBNNlpsME9WVFZqaGlxNlViSDc1bFJL?=
 =?utf-8?B?MUxqMlVVaHZwVi8yMGw5MGtic0ZxYTlxSDNUZmhqSjVWSWlnNlFETFFLN1lR?=
 =?utf-8?B?VFltYUVMNHdyMkJ4Y1hUNW1NVjZLTGNuL2N5dTIvbjNmcjd1REk0cnlwT3Zn?=
 =?utf-8?B?ZnMwdjJmSFBTdTBiK1dFWFowdnpmRlp5RVlLNTNKc0Ezb29qcEsvaU0rSEZp?=
 =?utf-8?B?M3E4RXo4RUV3YnN6U3owMTh3cWdqNTNRaWFQUUZ3TDcwaG0xcHdHVVg5SlVH?=
 =?utf-8?B?RGpaV2ZYZHlTVHFNdUR1WHBqS3N2VlhBaC95MEdPMVBnM2dQVE5XZjV1eE9t?=
 =?utf-8?B?WFFhTU5EQlE4QXIzWW5XdlVwdllvbExhOVNVaEJ6R1l5SzFMOFc0UkxwVmlX?=
 =?utf-8?B?VzgrcTJ0SFltU3FETFlRRlg3NXdCczZtTWFxcnY1OVhmb25WSHFtcjlFTGs0?=
 =?utf-8?B?ZmlLMUJYZ0EwYVc0eVRUNFJnMUpROC9BbDhOWGV3V2t3OS8wa0d2dmpWSzBv?=
 =?utf-8?B?ek1wZWpONWQ3WGRNdnNreHJlSkZwc2R0TmZOZ093bWRNZVNUV2xSa3hqVTFK?=
 =?utf-8?B?enRBQVlLWEVLQnhNOHdLMjZyMnAyT09rVGtRc1M5NmVKU0J2d1l2M0dqK0xU?=
 =?utf-8?B?RzVoNS82MS9ST0tGaEc2OGdqNHRDcEE1ZnA3TE1GTFpXdnp4WXBoNkc2TGdF?=
 =?utf-8?B?SE5iZGYzSGFWdDY0VllVU2JMUE5wT1k4dEZsdFV1R0tKZTVYSWVXWTBJOHpa?=
 =?utf-8?B?NEZmcDZLTkV3ZitvcDB6bUVROUJEc0NVaUNBSW40V0VaWHhrai9ya1BTNFl4?=
 =?utf-8?B?QS9yclVBeHhnTnVEY3lVb1BNZlhib2ZwVTdrdTJwdzBzakg2UktzeUIxT2ht?=
 =?utf-8?B?SkNrRTJhVzVheEdQRWdqSWNXUDhmcVJqV2VIVHoyTWxmS1FrdW1yMytVdWZX?=
 =?utf-8?B?YW1COVNBdVNBRWFnYm45cEVodlV1Uk1ibFlvZzBJaGpkdmVxVFAvRnBIMzBZ?=
 =?utf-8?B?YjkrZ3hDWGFudkJHQlAvOWhPeHJyTm9JQWpnRFVWRXhvbERZTEZkZ2RZTENu?=
 =?utf-8?B?Y2FBZ21NNExoZ01XQy9jVk1IWkdwNDVYNWF2Z0prVjNnOGZqRjlUTnFOWjBX?=
 =?utf-8?B?Q282ejA1cUplYktTTVFPUkw3YWRpVGVkMklLK25ONy9TV2l1MnpHMDd0eGFi?=
 =?utf-8?B?WFVBTmdIeUdhTlJCV1IyVmx6M2Rtc3RRZTBiOVR5UW5hcDFsaEs0TG9uc0w3?=
 =?utf-8?B?Y0dkTFJ2YTcxUTNIK3FWSVhyTmxUd1k2MFN3dkJXUDh5M3Yzc2RjN0lqSHp0?=
 =?utf-8?B?a2F4b1B1eC9sSXliM0pxNlFFaG1nZkozdWs3L1JtT3NjcFpGaGpNT0ZMMnhC?=
 =?utf-8?B?RjVMSjJBRGIxczhabXA2NWVDZW1VbVFCbmFYUW9BZjlwTEhTeklyejRib2p2?=
 =?utf-8?B?M1E9PQ==?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da55d51b-f565-49ca-8969-08db6b1f5aae
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 08:31:01.3910
 (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: UpJIR0VVqL3493v/NMd5XaV+ClC+yVetAwEdPxR3Y78GCZj+k6NqKPbuD/MwbYL8XCLIduNpBL6vUBZpwjb9xw0n3ZirzoLTRbg+WZjAB8k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8930
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

From: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>

TRNG "sample size" (the total number of entropy samples that will be taken
during entropy generation) default / POR value is very conservatively
set to 2500.

Let's set it to 512, the same as the caam driver in U-boot
(drivers/crypto/fsl_caam.c) does.

This solves the issue of RNG performance dropping after a suspend/resume
cycle on parts where caam loses power, since the initial U-boot setttings
are lost and kernel does not restore them when resuming.

Note: when changing the sample size, the self-test parameters need to be
updated accordingly.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
---
 drivers/crypto/caam/ctrl.c | 52 +++++++++++++++++++++++---------------
 drivers/crypto/caam/regs.h | 14 ++++++++--
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 62dd069942e4..b06bb64c6c23 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -352,7 +352,7 @@ static void kick_trng(struct device *dev, int ent_delay)
 	struct caam_drv_private *ctrlpriv = dev_get_drvdata(dev);
 	struct caam_ctrl __iomem *ctrl;
 	struct rng4tst __iomem *r4tst;
-	u32 val;
+	u32 val, rtsdctl;
 
 	ctrl = (struct caam_ctrl __iomem *)ctrlpriv->ctrl;
 	r4tst = &ctrl->r4tst[0];
@@ -368,26 +368,38 @@ static void kick_trng(struct device *dev, int ent_delay)
 	 * Performance-wise, it does not make sense to
 	 * set the delay to a value that is lower
 	 * than the last one that worked (i.e. the state handles
-	 * were instantiated properly. Thus, instead of wasting
-	 * time trying to set the values controlling the sample
-	 * frequency, the function simply returns.
+	 * were instantiated properly).
 	 */
-	val = (rd_reg32(&r4tst->rtsdctl) & RTSDCTL_ENT_DLY_MASK)
-	      >> RTSDCTL_ENT_DLY_SHIFT;
-	if (ent_delay <= val)
-		goto start_rng;
-
-	val = rd_reg32(&r4tst->rtsdctl);
-	val = (val & ~RTSDCTL_ENT_DLY_MASK) |
-	      (ent_delay << RTSDCTL_ENT_DLY_SHIFT);
-	wr_reg32(&r4tst->rtsdctl, val);
-	/* min. freq. count, equal to 1/4 of the entropy sample length */
-	wr_reg32(&r4tst->rtfrqmin, ent_delay >> 2);
-	/* max. freq. count, equal to 16 times the entropy sample length */
-	wr_reg32(&r4tst->rtfrqmax, ent_delay << 4);
-	/* read the control register */
-	val = rd_reg32(&r4tst->rtmctl);
-start_rng:
+	rtsdctl = rd_reg32(&r4tst->rtsdctl);
+	val = (rtsdctl & RTSDCTL_ENT_DLY_MASK) >> RTSDCTL_ENT_DLY_SHIFT;
+	if (ent_delay > val) {
+		val = ent_delay;
+		/* min. freq. count, equal to 1/4 of the entropy sample length */
+		wr_reg32(&r4tst->rtfrqmin, val >> 2);
+		/* max. freq. count, equal to 16 times the entropy sample length */
+		wr_reg32(&r4tst->rtfrqmax, val << 4);
+	}
+
+	wr_reg32(&r4tst->rtsdctl, (val << RTSDCTL_ENT_DLY_SHIFT) |
+		 RTSDCTL_SAMP_SIZE_VAL);
+
+	/*
+	 * To avoid reprogramming the self-test parameters over and over again,
+	 * use RTSDCTL[SAMP_SIZE] as an indicator.
+	 */
+	if ((rtsdctl & RTSDCTL_SAMP_SIZE_MASK) != RTSDCTL_SAMP_SIZE_VAL) {
+		wr_reg32(&r4tst->rtscmisc, (2 << 16) | 32);
+		wr_reg32(&r4tst->rtpkrrng, 570);
+		wr_reg32(&r4tst->rtpkrmax, 1600);
+		wr_reg32(&r4tst->rtscml, (122 << 16) | 317);
+		wr_reg32(&r4tst->rtscrl[0], (80 << 16) | 107);
+		wr_reg32(&r4tst->rtscrl[1], (57 << 16) | 62);
+		wr_reg32(&r4tst->rtscrl[2], (39 << 16) | 39);
+		wr_reg32(&r4tst->rtscrl[3], (27 << 16) | 26);
+		wr_reg32(&r4tst->rtscrl[4], (19 << 16) | 18);
+		wr_reg32(&r4tst->rtscrl[5], (18 << 16) | 17);
+	}
+
 	/*
 	 * select raw sampling in both entropy shifter
 	 * and statistical checker; ; put RNG4 into run mode
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 66928f8a0c4b..189e74c21f0c 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -3,7 +3,7 @@
  * CAAM hardware register-level view
  *
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
- * Copyright 2018 NXP
+ * Copyright 2018, 2023 NXP
  */
 
 #ifndef REGS_H
@@ -523,6 +523,8 @@ struct rng4tst {
 #define RTSDCTL_ENT_DLY_MASK (0xffff << RTSDCTL_ENT_DLY_SHIFT)
 #define RTSDCTL_ENT_DLY_MIN 3200
 #define RTSDCTL_ENT_DLY_MAX 12800
+#define RTSDCTL_SAMP_SIZE_MASK 0xffff
+#define RTSDCTL_SAMP_SIZE_VAL 512
 	u32 rtsdctl;		/* seed control register */
 	union {
 		u32 rtsblim;	/* PRGM=1: sparse bit limit register */
@@ -534,7 +536,15 @@ struct rng4tst {
 		u32 rtfrqmax;	/* PRGM=1: freq. count max. limit register */
 		u32 rtfrqcnt;	/* PRGM=0: freq. count register */
 	};
-	u32 rsvd1[40];
+	union {
+		u32 rtscmc;	/* statistical check run monobit count */
+		u32 rtscml;	/* statistical check run monobit limit */
+	};
+	union {
+		u32 rtscrc[6];	/* statistical check run length count */
+		u32 rtscrl[6];	/* statistical check run length limit */
+	};
+	u32 rsvd1[33];
 #define RDSTA_SKVT 0x80000000
 #define RDSTA_SKVN 0x40000000
 #define RDSTA_PR0 BIT(4)
-- 
2.25.1