2 files changed, 20 insertions, 1 deletions

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 111ac1ffbc11..c6210373b1be 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -357,8 +357,17 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)
         wr_reg32(&r4tst->rtfrqmin, ent_delay >> 2);
         /* disable maximum frequency count */
         wr_reg32(&r4tst->rtfrqmax, RTFRQMAX_DISABLE);
+        /* read the control register */
+        val = rd_reg32(&r4tst->rtmctl);
+        /*
+         * select raw sampling in both entropy shifter
+         * and statistical checker
+         */
+        setbits32(&val, RTMCTL_SAMP_MODE_RAW_ES_SC);
         /* put RNG4 into run mode */
-        clrbits32(&r4tst->rtmctl, RTMCTL_PRGM);
+        clrbits32(&val, RTMCTL_PRGM);
+        /* write back the control register */
+        wr_reg32(&r4tst->rtmctl, val);
 }
 
 /**
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 5fa739c290a7..bc9cd62b96e0 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -269,6 +269,16 @@ struct rngtst {
 /* RNG4 TRNG test registers */
 struct rng4tst {
 #define RTMCTL_PRGM     0x00010000      /* 1 -> program mode, 0 -> run mode */
+#define RTMCTL_SAMP_MODE_VON_NEUMANN_ES_SC      0 /* use von Neumann data in
+                                                     both entropy shifter and
+                                                     statistical checker */
+#define RTMCTL_SAMP_MODE_RAW_ES_SC              1 /* use raw data in both
+                                                     entropy shifter and
+                                                     statistical checker */
+#define RTMCTL_SAMP_MODE_VON_NEUMANN_ES_RAW_SC  2 /* use von Neumann data in
+                                                     entropy shifter, raw data
+                                                     in statistical checker */
+#define RTMCTL_SAMP_MODE_INVALID                3 /* invalid combination */
         u32 rtmctl;             /* misc. control register */
         u32 rtscmisc;           /* statistical check misc. register */
         u32 rtpkrrng;           /* poker range register */