andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rcar: Use generic console_t data structure 

Since now the generic console_t structure holds the UART base address as
well, let's use that generic location and drop the UART driver specific
data structure at all.

Change-Id: I836e26ff1771abf21fd460d0ee40e90a452e9b43
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2020-01-25 00:58:35 +00:00
parent 3968bc08ab
commit c01ee06b53
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/renesas/rcar/console/rcar_console.S
View File

@ -20,14 +20,14 @@
/* ----------------------------------------------- /* -----------------------------------------------
* int console_rcar_register( * int console_rcar_register(
* uintptr_t base, uint32_t clk, uint32_t baud, * uintptr_t base, uint32_t clk, uint32_t baud,
* console_rcar_t *console) * console_t *console)
* Function to initialize and register a new rcar * Function to initialize and register a new rcar
* console. Storage passed in for the console struct * console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack). * *must* be persistent (i.e. not from the stack).
* In: x0 - UART register base address * In: x0 - UART register base address
* w1 - UART clock in Hz * w1 - UART clock in Hz
* w2 - Baud rate * w2 - Baud rate
* x3 - pointer to empty console_rcar_t struct * x3 - pointer to empty console_t struct
* Out: return 1 on success, 0 on error * Out: return 1 on success, 0 on error
* Clobber list : x0, x1, x2, x6, x7, x14 * Clobber list : x0, x1, x2, x6, x7, x14
* ----------------------------------------------- * -----------------------------------------------
@ -36,7 +36,7 @@ func console_rcar_register
mov x7, x30 mov x7, x30
mov x6, x3 mov x6, x3
cbz x6, register_fail cbz x6, register_fail
str x0, [x6, #CONSOLE_T_RCAR_BASE] str x0, [x6, #CONSOLE_T_BASE]
bl rcar_log_init bl rcar_log_init
cbz x0, register_fail cbz x0, register_fail
@ -68,11 +68,11 @@ func console_rcar_init
endfunc console_rcar_init endfunc console_rcar_init
/* -------------------------------------------------------- /* --------------------------------------------------------
* int console_rcar_putc(int c, console_rcar_t *console) * int console_rcar_putc(int c, console_t *console)
* Function to output a character over the console. It * Function to output a character over the console. It
* returns the character printed on success or -1 on error. * returns the character printed on success or -1 on error.
* In : w0 - character to be printed * In : w0 - character to be printed
* x1 - pointer to console_rcar_t structure * x1 - pointer to console_t structure
* Out : return -1 on error else return character. * Out : return -1 on error else return character.
* Clobber list : x2 * Clobber list : x2
* -------------------------------------------------------- * --------------------------------------------------------

6
drivers/renesas/rcar/scif/scif.S
View File

@ -126,14 +126,14 @@
/* ----------------------------------------------- /* -----------------------------------------------
* int console_rcar_register( * int console_rcar_register(
* uintptr_t base, uint32_t clk, uint32_t baud, * uintptr_t base, uint32_t clk, uint32_t baud,
* console_rcar_t *console) * console_t *console)
* Function to initialize and register a new rcar * Function to initialize and register a new rcar
* console. Storage passed in for the console struct * console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack). * *must* be persistent (i.e. not from the stack).
* In: x0 - UART register base address * In: x0 - UART register base address
* w1 - UART clock in Hz * w1 - UART clock in Hz
* w2 - Baud rate * w2 - Baud rate
* x3 - pointer to empty console_rcar_t struct * x3 - pointer to empty console_t struct
* Out: return 1 on success, 0 on error * Out: return 1 on success, 0 on error
* Clobber list : x0, x1, x2, x6, x7, x14 * Clobber list : x0, x1, x2, x6, x7, x14
* ----------------------------------------------- * -----------------------------------------------
@ -142,7 +142,7 @@ func console_rcar_register
mov x7, x30 mov x7, x30
mov x6, x3 mov x6, x3
cbz x6, register_fail cbz x6, register_fail
str x0, [x6, #CONSOLE_T_RCAR_BASE] str x0, [x6, #CONSOLE_T_BASE]
bl console_rcar_init bl console_rcar_init

9
include/drivers/renesas/rcar/console/console.h
View File

@ -7,17 +7,10 @@
#ifndef RCAR_PRINTF_H #ifndef RCAR_PRINTF_H
#define RCAR_PRINTF_H #define RCAR_PRINTF_H
#define CONSOLE_T_RCAR_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
typedef struct {
console_t console;
uintptr_t base;
} console_rcar_t;
/* /*
* Initialize a new rcar console instance and register it with the console * Initialize a new rcar console instance and register it with the console
* framework. The |console| pointer must point to storage that will be valid * framework. The |console| pointer must point to storage that will be valid
@ -25,7 +18,7 @@ typedef struct {
* Its contents will be reinitialized from scratch. * Its contents will be reinitialized from scratch.
*/ */
int console_rcar_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_rcar_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_rcar_t *console); console_t *console);
#endif /*__ASSEMBLER__*/ #endif /*__ASSEMBLER__*/

8
plat/renesas/rcar/rcar_common.c
View File

@ -70,8 +70,8 @@ void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
#include <drivers/renesas/rcar/console/console.h> #include <drivers/renesas/rcar/console/console.h>
static console_rcar_t rcar_boot_console; static console_t rcar_boot_console;
static console_rcar_t rcar_runtime_console; static console_t rcar_runtime_console;
void rcar_console_boot_init(void) void rcar_console_boot_init(void)
{ {
@ -81,7 +81,7 @@ void rcar_console_boot_init(void)
if (!ret) if (!ret)
panic(); panic();
console_set_scope(&rcar_boot_console.console, CONSOLE_FLAG_BOOT); console_set_scope(&rcar_boot_console, CONSOLE_FLAG_BOOT);
} }
void rcar_console_boot_end(void) void rcar_console_boot_end(void)
@ -96,7 +96,7 @@ void rcar_console_runtime_init(void)
if (!ret) if (!ret)
panic(); panic();
console_set_scope(&rcar_boot_console.console, CONSOLE_FLAG_RUNTIME); console_set_scope(&rcar_boot_console, CONSOLE_FLAG_RUNTIME);
} }
void rcar_console_runtime_end(void) void rcar_console_runtime_end(void)