plat: renesas: Improve RZ/A platform

Improve RZ/A platform

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

Author: nhutnguyenkc

plat/renesas/rza/common/drivers/scifa.S renamed to drivers/renesas/common/scifa/scifa.S

@@ -8,61 +8,69 @@
 #include <asm_macros.S>
 #include <console_macros.S>
 
-#define	SMR				(0x00)
-#define	BRR				(0x02)
+#define	SMR			(0x00)
+#define	BRR			(0x02)
 #define	MDDR			(0x02)
-#define	SCR				(0x04)
+#define	SCR			(0x04)
 #define FTDR			(0x06)
-#define FSR				(0x08)
+#define FSR			(0x08)
 #define FRDR			(0x0A)
-#define FCR				(0x0C)
-#define FDR				(0x0E)
+#define FCR			(0x0C)
+#define FDR			(0x0E)
 #define SPTR			(0x10)
-#define LSR				(0x12)
+#define LSR			(0x12)
 #define SEMR			(0x14)
 #define FTCR			(0x16)
 
-#define SCR_CKE_MASK	(0x03)
-#define SCR_CKE_INTERN	(0x00)
+#define SCR_CKE_MASK		(0x03)
+#define SCR_CKE_INTERN		(0x00)
 #define SCR_RE_ON		(0x10)
 #define SCR_TE_ON		(0x20)
 #define SCR_INIT		(0x00)
 #define SCR_READY		(SCR_INIT | SCR_RE_ON | SCR_TE_ON)
 
-#define FCR_RFRST_RST	(0x02)
-#define FCR_TFRST_RST	(0x04)
+#define FCR_RFRST_RST		(0x02)
+#define FCR_TFRST_RST		(0x04)
 #define FCR_BASE		(0x00)
 #define FCR_RST			(FCR_BASE | FCR_RFRST_RST | FCR_TFRST_RST)
 #define FCR_RUN			(FCR_BASE)
 
 #define SMR_INIT		(0x00)
 
-#define SEMR_NFEN_ON	(0x04)
-#define SEMR_MDDRS_BRR	(0x00)
-#define SEMR_MDDRS_MDDR (0x10)
-#define SEMR_BRME_ON	(0x20)
-//#define SEMR_BASE		(SEMR_NFEN_ON)
+#define SEMR_NFEN_ON		(0x04)
+#define SEMR_MDDRS_BRR		(0x00)
+#define SEMR_MDDRS_MDDR 	(0x10)
+#define SEMR_BRME_ON		(0x20)
 #define SEMR_BASE		(0x00)
 #define SEMR_BRR		(SEMR_BASE | SEMR_MDDRS_BRR)
 #define SEMR_MDDR		(SEMR_BASE | SEMR_MDDRS_MDDR | SEMR_BRME_ON)
 
 #define FTCR_TTRGS		(0x0080)
 #define FTCR_RTRGS		(0x8000)
 
-#define FSR_TDFE_SHIFT	(5)
-#define FSR_TEND_SHIFT	(6)
+#define FSR_TDFE_SHIFT		(5)
+#define FSR_TEND_SHIFT		(6)
 #define FSR_TEND		(1<<FSR_TEND_SHIFT)
 
-#define BRR_C_RSHIFT	(5)
+#define BRR_C_RSHIFT		(5)
 #define BRR_C_SUB		(1)
 
-	.globl	console_rza_register
-	.globl	console_rza_init
-	.globl	console_rza_putc
-	.globl	console_rza_flush
+/* Define a global flag */
+	.section .bss.putc_called_flag
+	.align 3
+	.global putc_called_flag
+putc_called_flag:
+	.skip 8
+
+	.text
+
+	.globl	console_scifa_register
+	.globl	console_scifa_init
+	.globl	console_scifa_putc
+	.globl	console_scifa_flush
 
 	/* -----------------------------------------------
-	 * int console_rza_register(
+	 * int console_scifa_register(
 	 *      uintptr_t base, uint32_t clk, uint32_t baud,
 	 *      console_t *console)
 	 * Function to initialize and register a new console.
@@ -76,32 +84,32 @@
 	 * Clobber list : x0, x1, x2, x6, x7, x14
 	 * -----------------------------------------------
 	 */
-func console_rza_register
+func console_scifa_register
 	mov	x7, x30
 	mov	x6, x3
 	cbz	x6, register_fail
 	str	x0, [x6, #CONSOLE_T_BASE]
 
-	bl	console_rza_init
+	bl	console_scifa_init
 
 	mov	x0, x6
 	mov	x30, x7
-	finish_console_register rza, putc=1, getc=0, flush=1
+	finish_console_register scifa, putc=1, getc=0, flush=1
 	b l_ret
 
 register_fail:
 	mov x0, #0
 
 l_ret:
 	ret	x7
-endfunc console_rza_register
+endfunc console_scifa_register
 
 	/* -----------------------------------------------
-	 * int console_rza_init(unsigned long base_addr,
+	 * int console_scifa_init(unsigned long base_addr,
 	 * unsigned int uart_clk, unsigned int baud_rate)
 	 * Function to initialize the console without a
 	 * C Runtime to print debug information. This
-	 * function will be accessed by console_rza_register
+	 * function will be accessed by console_scifa_register
 	 * and crash reporting.
 	 * In: x0 - console base address
 	 *     w1 - Uart clock in Hz
@@ -110,7 +118,7 @@ endfunc console_rza_register
 	 * Clobber list : x3
 	 * -----------------------------------------------
 	 */
-func console_rza_init
+func console_scifa_init
 	mov w3, #(SCR_INIT)
 	strh w3, [x0, #SCR]
 
@@ -163,10 +171,10 @@ func console_rza_init
 
 	mov	x0, #1
 	ret
-endfunc console_rza_init
+endfunc console_scifa_init
 
 	/* --------------------------------------------------------
-	 * int console_rza_putc(int c, console_t *console)
+	 * int console_scifa_putc(int c, console_t *console)
 	 * Function to output a character over the console. It
 	 * returns the character printed on success or -1 on error.
 	 * In : w0 - character to be printed
@@ -175,7 +183,7 @@ endfunc console_rza_init
 	 * Clobber list : x2
 	 * --------------------------------------------------------
 	 */
-func console_rza_putc
+func console_scifa_putc
 	ldr x1, [x1, #CONSOLE_T_BASE]
 	cmp w0, #0xA
 	/* Prepend '\r' to '\n' */
@@ -202,10 +210,10 @@ func console_rza_putc
 	strh w2, [x1, #FSR]
 
 	ret
-endfunc console_rza_putc
+endfunc console_scifa_putc
 
 	/* ---------------------------------------------
-	 * int console_rza_flush(console_t *console)
+	 * int console_scifa_flush(console_t *console)
 	 * Function to force a write of all buffered
 	 * data that hasn't been output. It returns 0
 	 * upon successful completion, otherwise it
@@ -215,15 +223,23 @@ endfunc console_rza_putc
 	 * Clobber list : x1
 	 * ---------------------------------------------
 	 */
-func console_rza_flush
+func console_scifa_flush
 	ldr x0, [x0, #CONSOLE_T_BASE]
+
+	/* Check if putc_called_flag is set */
+	adrp x1, putc_called_flag
+	add x1, x1, :lo12:putc_called_flag
+	ldr x1, [x1]
+	cbz x1, flush_done
+
 1:
 	/* Check TEND flag */
 	ldrh w1, [x0, #FSR]
 	and w1, w1, #FSR_TEND
 	cmp	w1, #FSR_TEND
 	bne	1b
 
+flush_done:
 	mov	w0, #0
 	ret
-endfunc console_rza_flush
+endfunc console_scifa_flush

plat/renesas/rza/common/drivers/syc.c renamed to drivers/renesas/common/syc/syc.c

@@ -20,13 +20,6 @@
 #include "../../include/drivers/auth/auth_common.h"
 #include "../../include/drivers/auth/sblib/crypto_sblib.h"
 
-#define return_if_error(rc)        \
-	do {                       \
-		if (rc != 0) {     \
-			return rc; \
-		}                  \
-	} while (0)
-
 #define TBBR_COT_GETTER(id)                   \
 	__extension__({                       \
 		assert((id) < cot_desc_size); \
@@ -110,24 +103,30 @@ static int auth_sblib(const auth_method_param_sblib_t *param,
 
 	/* Get the content certificate that is the parent of the image */
 	content_cert_desc = img_desc->parent;
-	rc = auth_get_param(param->key_cert, content_cert_desc,
+	rc = auth_get_param(param->content_cert, content_cert_desc,
 			    &content_cert_ptr, &content_cert_len);
-	return_if_error(rc);
+	if (rc != 0) {
+		return rc;
+	}
 
 	/* Get the key certificate that is the parent of the content certificate */
 	key_cert_desc = content_cert_desc->parent;
-	rc = auth_get_param(param->content_cert, key_cert_desc, &key_cert_ptr,
+	rc = auth_get_param(param->key_cert, key_cert_desc, &key_cert_ptr,
 			    &key_cert_len);
-	return_if_error(rc);
+	if (rc != 0) {
+		return rc;
+	}
 
 	/* Get the data to authenticate from the current image */
 	rc = img_parser_get_auth_param(img_desc->img_type, param->data, img,
 				       img_len, &data_ptr, &data_len);
-	return_if_error(rc);
+	if (rc != 0) {
+		return rc;
+	}
 
 	/* Ask Renesas SB-Lib to authenticate this image */
-	rc = crypto_sblib_auth(data_ptr, data_len, key_cert_ptr, key_cert_len,
-			       content_cert_ptr, content_cert_len);
+	rc = crypto_sblib_auth(key_cert_ptr, key_cert_len, content_cert_ptr,
+			       content_cert_len);
 
 	return rc;
 }
@@ -196,7 +195,9 @@ int auth_mod_verify_img(unsigned int img_id, void *img_ptr,
 
 	/* Ask the parser to check the image integrity */
 	rc = img_parser_check_integrity(img_desc->img_type, img_ptr, img_len);
-	return_if_error(rc);
+	if (rc != 0) {
+		return rc;
+	}
 
 	/* Authenticate the image using the methods indicated in the image descriptor. */
 	if (img_desc->img_auth_methods == NULL)
@@ -216,7 +217,10 @@ int auth_mod_verify_img(unsigned int img_id, void *img_ptr,
 			rc = 1;
 			break;
 		}
-		return_if_error(rc);
+
+		if (rc != 0) {
+			return rc;
+		}
 	}
 
 	/* Extract the parameters indicated in the image descriptor to
@@ -233,7 +237,9 @@ int auth_mod_verify_img(unsigned int img_id, void *img_ptr,
 				img_desc->img_type,
 				img_desc->authenticated_data[i].type_desc,
 				img_ptr, img_len, &param_ptr, &param_len);
-			return_if_error(rc);
+			if (rc != 0) {
+				return rc;
+			}
 
 			/* Check parameter size */
 			if (param_len >

plat/renesas/rza/common/drivers/auth/auth_mod.c renamed to drivers/renesas/rza/auth/auth_mod.c

@@ -17,17 +17,16 @@
 
 static sb_secure_boot_api_t secure_boot_api;
 
-int crypto_sblib_auth(void *data_ptr, size_t len, const void *key_cert,
-		      unsigned int key_cert_len, const void *content_cert,
-		      unsigned int content_cert_len)
+int crypto_sblib_auth(const void *key_cert, unsigned int key_cert_len,
+		      const void *content_cert, unsigned int content_cert_len)
 {
 	sb_ret_t rc;
 
 	assert(secure_boot_api != NULL);
 
 	rc = secure_boot_api(key_cert, key_cert_len, content_cert,
 			     content_cert_len, NULL);
-	if (SB_RET_SUCCESS != rc)
+	if (rc != SB_RET_SUCCESS)
 		return CRYPTO_ERR_UNKNOWN;
 
 	return CRYPTO_SUCCESS;

plat/renesas/rza/common/drivers/auth/sblib/crypto_sblib.c renamed to drivers/renesas/rza/auth/sblib/crypto_sblib.c

@@ -28,7 +28,7 @@
  */
 #define SB_RET_SAME_IMAGE_VERSION		((sb_ret_t)0x55005501UL)
 
-/** A internal failure */
+/** An internal failure */
 #define SB_RET_ERR_INTERNAL_FAIL		((sb_ret_t)0xAAAA0000UL)
 
 /** An invalid argument was entered */
@@ -82,7 +82,7 @@
 /** CRC mismatch */
 #define SB_RET_ERR_CRC_MISMATCH			((sb_ret_t)0xAAAA0300UL)
 
-/** Unsupported polynominal */
+/** Unsupported polynomial */
 #define SB_RET_ERR_CRC_UNSUPPORTED_POLYNOMIAL	((sb_ret_t)0xAAAA0301UL)
 
 /** Image version lower than the current image version is installed */

plat/renesas/rza/common/drivers/auth/sblib/sblib_api_private.h renamed to drivers/renesas/rza/auth/sblib/sblib_api_private.h

@@ -30,7 +30,7 @@ static void clear_temp_vars(void)
 	do {                                                    \
 		zeromem(&x, sizeof(x));                         \
 		clean_dcache_range((uintptr_t) &x, sizeof(x));  \
-	} while (0);
+	} while (0)
 
 #undef ZERO_AND_CLEAN
 }
@@ -61,7 +61,7 @@ static int check_integrity(void *img, unsigned int img_len)
 	int rc;
 	uint32_t magic;
 
-	if (SB_MANIFEST_LEN_MIN > img_len)
+	if (img_len < SB_MANIFEST_LEN_MIN)
 		return IMG_PARSER_ERR_FORMAT;
 
 	magic = *(uint32_t *)img;