Merge pull request #14722 from jeromecoutant/PR_RNG

STM32 TRNG: update init to match all configs

Author: adbridge

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/STM32L5xx_HAL_Driver/stm32l5xx_hal_rng.c

@@ -116,7 +116,6 @@
 /*  Health test control register information to use in CCM algorithm */
 #define RNG_HTCFG_1   0x17590ABCU /*!< Magic number */
 #define RNG_HTCFG     0x0000A2B3U /*!< Recommended value for NIST compliancy */
-#define RNG_HTCFG_REVB 0x000CAA74U /*!< Recommended value for old MCU cut - deprecated */
 /**
   * @}
   */
@@ -211,18 +210,10 @@ HAL_StatusTypeDef HAL_RNG_Init(RNG_HandleTypeDef *hrng)
   MODIFY_REG(hrng->Instance->CR, RNG_CR_CED | RNG_CR_CONDRST, hrng->Init.ClockErrorDetection | RNG_CR_CONDRST);
 
 #if defined(RNG_VER_3_2) || defined(RNG_VER_3_1) || defined(RNG_VER_3_0)
-if ( HAL_GetREVID() == 0x2000) { // Deprecated - old MCU
   /*!< magic number must be written immediately before to RNG_HTCRG */
   WRITE_REG(hrng->Instance->HTCR, RNG_HTCFG_1);
   /* for best latency and to be compliant with NIST */
-  WRITE_REG(hrng->Instance->HTCR, RNG_HTCFG_REVB);
-}
-else {
-    /*!< magic number must be written immediately before to RNG_HTCRG */
-    WRITE_REG(hrng->Instance->HTCR, RNG_HTCFG_1);
-    /* for best latency and to be compliant with NIST */
-    WRITE_REG(hrng->Instance->HTCR, RNG_HTCFG);
-  }
+  WRITE_REG(hrng->Instance->HTCR, RNG_HTCFG);
 #endif /* RNG_VER_3_2 || RNG_VER_3_1 || RNG_VER_3_0 */
 
   /* Writing bit CONDRST=0 */
@@ -691,10 +682,6 @@ HAL_StatusTypeDef HAL_RNG_GenerateRandomNumber(RNG_HandleTypeDef *hrng, uint32_t
         {
           hrng->State = HAL_RNG_STATE_READY;
           hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-          if (__HAL_RNG_GET_FLAG(hrng, RNG_FLAG_SECS) != RESET)
-          {
-            hrng->ErrorCode |= HAL_RNG_ERROR_SEED;
-          }
           /* Process Unlocked */
           __HAL_UNLOCK(hrng);
           return HAL_ERROR;

targets/TARGET_STM/trng_api.c

@@ -128,8 +128,8 @@ void trng_init(trng_t *obj)
     }
 
     /* first random number generated after setting the RNGEN bit should not be used */
-    if (HAL_RNG_GenerateRandomNumber(&obj->handle, &dummy) != HAL_OK) {
-        printf("trng_init: HAL_RNG_GenerateRandomNumber error 0x%x\n", obj->handle.ErrorCode); // should not occur
+    /* could be executed few times in case of long init (obj->handle.ErrorCode can be checked for debug) */
+    while (HAL_RNG_GenerateRandomNumber(&obj->handle, &dummy) != HAL_OK) {
     }
 
 #if defined(CFG_HW_RNG_SEMID)