hal: renesas: Migrate RA FSP to version 6.0.0

Migrate RA FSP from version 5.8.0 to version 6.0.0

Signed-off-by: Khoa Nguyen <[email protected]>

Author: khoa-nguyen-18

drivers/ra/CMakeLists.txt

@@ -103,12 +103,12 @@ if(CONFIG_USE_RA_FSP_SCE)
 
 	if(CONFIG_HAS_RENESAS_RA_RSIP_E51A)
 		zephyr_include_directories(
-			fsp/src/r_sce/crypto_procedures/src/rsip7/plainkey/public/inc
-			fsp/src/r_sce/crypto_procedures/src/rsip7/plainkey/private/inc)
-		file(GLOB rsip7_srcs
-			"fsp/src/r_sce/crypto_procedures/src/rsip7/plainkey/adaptors/*.c"
-			"fsp/src/r_sce/crypto_procedures/src/rsip7/plainkey/primitive/*.c")
-		zephyr_library_sources(${rsip7_srcs})
+			fsp/src/r_sce/crypto_procedures/src/rsip_e51a/plainkey/public/inc
+			fsp/src/r_sce/crypto_procedures/src/rsip_e51a/plainkey/private/inc)
+		file(GLOB rsip_e51a_srcs
+			"fsp/src/r_sce/crypto_procedures/src/rsip_e51a/plainkey/adaptors/*.c"
+			"fsp/src/r_sce/crypto_procedures/src/rsip_e51a/plainkey/primitive/*.c")
+		zephyr_library_sources(${rsip_e51a_srcs})
 	endif()
 
 	if (CONFIG_HAS_RENESAS_RA_SCE5)

drivers/ra/README

@@ -6,7 +6,7 @@ Origin:
    https://www.renesas.com/us/en/software-tool/flexible-software-package-fsp
 
 Status:
-   version v5.8.0
+   version v6.0.0
 
 Purpose:
    Flexible Software Package (FSP) for Renesas RA MCU Family.
@@ -139,13 +139,8 @@ Patch List:
          drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA8D1BH.h
          drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA8T1AH.h
 
-   * Keep a backport for UCK, OCTA, U60CK clock marcro in bsp_clocks.c
+   * Keep OSPI_B at fsp 5.8.0 since it need big change for OSPI driver in zephyr
       Impacted files:
-         drivers/ra/fsp/src/bsp/mcu/all/bsp_clocks.c
-      Note: This will be remove in next FSP version
-
-   * Keep a backport for BSP_FEATURE_LPM_HAS_LDO_CONTROL macro in r_lpm
-      Impacted files:
-         drivers/ra/fsp/inc/api/r_lpm_api.h
-         drivers/ra/fsp/src/r_lpm/r_lpm.c
-      Note: This will be remove in next FSP version.
+         drivers/ra/fsp/src/r_ospi_b/r_ospi_b.c
+         drivers/ra/fsp/inc/api/r_spi_flash_api.h
+         drivers/ra/fsp/inc/instances/r_ospi_b.h

drivers/ra/fsp/inc/api/fsp_common_api.h

@@ -138,6 +138,7 @@ typedef enum e_fsp_err
     FSP_ERR_FCLK                   = 502,                   ///< FCLK must be >= 4 MHz
     FSP_ERR_INVALID_LINKED_ADDRESS = 503,                   ///< Function or data are linked at an invalid region of memory
     FSP_ERR_BLANK_CHECK_FAILED     = 504,                   ///< Blank check operation failed
+    FSP_ERR_HUK_ZEROIZATION        = 505,                   ///< W-HUK zeroization is in progress
 
     /* Start of CAC Specific */
     FSP_ERR_INVALID_CAC_REF_CLOCK = 600,                    ///< Measured clock rate < reference clock rate
@@ -339,13 +340,17 @@ typedef enum e_fsp_err
     FSP_ERR_CRYPTO_SCE_PARAMETER         = 0x10014,  ///< Input date is illegal.
     FSP_ERR_CRYPTO_SCE_PROHIBIT_FUNCTION = 0x10015,  ///< An invalid function call occurred.
 
+    FSP_ERR_CRYPTO_SCE_LBIST_CHECK_BUSY  = 0x100ff,  ///< LBIST Check BUSY
+
     /* Start of Crypto RSIP specific (0x10100) */
     FSP_ERR_CRYPTO_RSIP_RESOURCE_CONFLICT = 0x10100, ///< Hardware resource is busy
     FSP_ERR_CRYPTO_RSIP_FATAL             = 0x10101, ///< Hardware fatal error or unexpected return
     FSP_ERR_CRYPTO_RSIP_FAIL              = 0x10102, ///< Internal error
     FSP_ERR_CRYPTO_RSIP_KEY_SET_FAIL      = 0x10103, ///< Input key type is illegal
     FSP_ERR_CRYPTO_RSIP_AUTHENTICATION    = 0x10104, ///< Authentication failed
 
+    FSP_ERR_CRYPTO_RSIP_LBIST_CHECK_BUSY  = 0x101ff, ///< LBIST Check BUSY
+
     /* Start of SF_CRYPTO specific */
     FSP_ERR_CRYPTO_COMMON_NOT_OPENED      = 0x20000, ///< Crypto Framework Common is not opened
     FSP_ERR_CRYPTO_HAL_ERROR              = 0x20001, ///< Cryoto HAL module returned an error

drivers/ra/fsp/inc/api/r_adc_api.h

@@ -33,6 +33,10 @@
 #endif
 #include "r_transfer_api.h"
 
+#if __has_include("r_adc_device_types.h")
+ #include "r_adc_device_types.h"
+#endif
+
 /* Common macro for FSP header files. There is also a corresponding FSP_FOOTER macro at the end of this file. */
 FSP_HEADER
 
@@ -203,7 +207,7 @@ typedef struct st_adc_callback_args
 {
     uint16_t         unit;             ///< ADC device in use
     adc_event_t      event;            ///< ADC callback event
-    void const     * p_context;        ///< Placeholder for user data
+    void           * p_context;        ///< Placeholder for user data
     adc_channel_t    channel;          ///< Channel of conversion result
     uint64_t         channel_mask;     ///< Channel mask for conversion result. Only valid for r_adc_b and r_sdadc_b
     adc_group_mask_t group_mask;       ///< Group Mask
@@ -214,14 +218,16 @@ typedef struct st_adc_callback_args
 /** ADC Information Structure for Transfer Interface */
 typedef struct st_adc_info
 {
-    __I void * p_address;                 ///< The address to start reading the data from
-    uint32_t   length;                    ///< The total number of transfers to read
-
-    transfer_size_t  transfer_size;       ///< The size of each transfer
-    elc_peripheral_t elc_peripheral;      ///< Name of the peripheral in the ELC list
-    elc_event_t      elc_event;           ///< Name of the ELC event for the peripheral
-    uint32_t         calibration_data;    ///< Temperature sensor calibration data (0xFFFFFFFF if unsupported) for reference voltage
-    int16_t          slope_microvolts;    ///< Temperature sensor slope in microvolts/degrees C
+    __I void * p_address;                   ///< The address to start reading the data from
+    uint32_t   length;                      ///< The total number of transfers to read
+
+    transfer_size_t  transfer_size;         ///< The size of each transfer
+    elc_peripheral_t elc_peripheral;        ///< Name of the peripheral in the ELC list
+    elc_event_t      elc_event;             ///< Name of the ELC event for the peripheral
+    uint32_t         calibration_data;      ///< Temperature sensor calibration data (0xFFFFFFFF if unsupported) for reference voltage
+    uint16_t         room_calibration_data; ///< Room temperature sensor calibration data (0xFFFFFFFF if unsupported) for reference voltage
+    uint16_t         low_calibration_data;  ///< Low temperature sensor calibration data (0xFFFFFFFF if unsupported) for reference voltage
+    int16_t          slope_microvolts;      ///< Temperature sensor slope in microvolts/degrees C
 } adc_info_t;
 
 #endif
@@ -241,7 +247,7 @@ typedef struct st_adc_cfg
     uint8_t          scan_end_b_ipl;                   ///< Scan end group B interrupt priority
     uint8_t          scan_end_c_ipl;                   ///< Scan end group C interrupt priority
     void (* p_callback)(adc_callback_args_t * p_args); ///< Callback function; set to NULL for none
-    void const * p_context;                            ///< Placeholder for user data. Passed to the user callback in @ref adc_callback_args_t.
+    void       * p_context;                            ///< Placeholder for user data. Passed to the user callback in @ref adc_callback_args_t.
     void const * p_extend;                             ///< Extension parameter for hardware specific settings
 } adc_cfg_t;
 
@@ -338,7 +344,7 @@ typedef struct st_adc_api
      *                                       Callback arguments allocated here are only valid during the callback.
      */
     fsp_err_t (* callbackSet)(adc_ctrl_t * const p_ctrl, void (* p_callback)(adc_callback_args_t *),
-                              void const * const p_context, adc_callback_args_t * const p_callback_memory);
+                              void * const p_context, adc_callback_args_t * const p_callback_memory);
 
     /** Close the specified ADC unit by ending any scan in progress, disabling interrupts, and removing power to the
      * specified A/D unit.

drivers/ra/fsp/inc/api/r_can_api.h

@@ -166,8 +166,8 @@ typedef struct st_can_callback_args
         uint32_t mailbox;              ///< Mailbox number of interrupt source.
         uint32_t buffer;               ///< Buffer number of interrupt source.
     };
-    void const * p_context;            ///< Context provided to user during callback.
-    can_frame_t  frame;                ///< Received frame data.
+    void      * p_context;             ///< Context provided to user during callback.
+    can_frame_t frame;                 ///< Received frame data.
 } can_callback_args_t;
 
 #endif
@@ -181,7 +181,7 @@ typedef struct st_can_cfg
 
     /* Configuration for CAN Event processing */
     void (* p_callback)(can_callback_args_t * p_args); ///< Pointer to callback function
-    void const * p_context;                            ///< User defined callback context.
+    void * p_context;                                  ///< User defined callback context.
 
     /* Pointer to CAN peripheral specific configuration */
     void const * p_extend;                             ///< CAN hardware dependent configuration
@@ -249,7 +249,7 @@ typedef struct st_can_api
      *                                       Callback arguments allocated here are only valid during the callback.
      */
     fsp_err_t (* callbackSet)(can_ctrl_t * const p_ctrl, void (* p_callback)(can_callback_args_t *),
-                              void const * const p_context, can_callback_args_t * const p_callback_memory);
+                              void * const p_context, can_callback_args_t * const p_callback_memory);
 } can_api_t;
 
 /** This structure encompasses everything that is needed to use an instance of this interface. */