Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-02 08:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LS 16550: Use generic console_t data structure

Browse source 
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: Ifd6aff1064ba1c3c029cdd8a83f715f7a9976db5
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 c10db6deb1
commit 9536a25e03
7 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plat/layerscape/common/aarch64/ls_console.S
View file

@ -81,7 +81,7 @@ endfunc console_ls_16550_core_init
.globl console_ls_16550_register .globl console_ls_16550_register
/* ----------------------------------------------- /* -----------------------------------------------
* int console_ls_16550_register(console_ls_16550_t *console, * int console_ls_16550_register(console_t *console,
* uintptr_t base, uint32_t clk, uint32_t baud) * uintptr_t base, uint32_t clk, uint32_t baud)
* Function to initialize and register a new 16550 * Function to initialize and register a new 16550
* console. Storage passed in for the console struct * console. Storage passed in for the console struct
@ -89,7 +89,7 @@ endfunc console_ls_16550_core_init
* 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_ls_16550_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
* ----------------------------------------------- * -----------------------------------------------
@ -98,7 +98,7 @@ func console_ls_16550_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_16550_BASE] str x0, [x6, #CONSOLE_T_BASE]
bl console_ls_16550_core_init bl console_ls_16550_core_init
cbz x0, register_fail cbz x0, register_fail
@ -150,7 +150,7 @@ func console_ls_16550_core_putc
endfunc console_ls_16550_core_putc endfunc console_ls_16550_core_putc
/* -------------------------------------------------------- /* --------------------------------------------------------
* int console_16550_putc(int c, console_ls_16550_t *console) * int console_16550_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
@ -164,7 +164,7 @@ func console_ls_16550_putc
cmp x1, #0 cmp x1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x1, [x1, #CONSOLE_T_16550_BASE] ldr x1, [x1, #CONSOLE_T_BASE]
b console_ls_16550_core_putc b console_ls_16550_core_putc
endfunc console_ls_16550_putc endfunc console_ls_16550_putc
@ -195,7 +195,7 @@ no_char:
endfunc console_ls_16550_core_getc endfunc console_ls_16550_core_getc
/* --------------------------------------------- /* ---------------------------------------------
* int console_ls_16550_getc(console_ls_16550_t *console) * int console_ls_16550_getc(console_t *console)
* Function to get a character from the console. * Function to get a character from the console.
* It returns the character grabbed on success * It returns the character grabbed on success
* or -1 on if no character is available. * or -1 on if no character is available.
@ -209,7 +209,7 @@ func console_ls_16550_getc
cmp x1, #0 cmp x1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_16550_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_ls_16550_core_getc b console_ls_16550_core_getc
endfunc console_ls_16550_getc endfunc console_ls_16550_getc
@ -239,7 +239,7 @@ func console_ls_16550_core_flush
endfunc console_ls_16550_core_flush endfunc console_ls_16550_core_flush
/* --------------------------------------------- /* ---------------------------------------------
* int console_ls_16550_flush(console_ls_16550_t *console) * int console_ls_16550_flush(console_t *console)
* Function to force a write of all buffered * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* In : x0 - pointer to console_t structure * In : x0 - pointer to console_t structure
@ -252,6 +252,6 @@ func console_ls_16550_flush
cmp x0, #0 cmp x0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_16550_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_ls_16550_core_flush b console_ls_16550_core_flush
endfunc console_ls_16550_flush endfunc console_ls_16550_flush

9
plat/layerscape/common/include/ls_16550.h
View file

@ -61,17 +61,10 @@
#define UARTLSR_OVRF (1 << 2) /* Rx Overrun Error */ #define UARTLSR_OVRF (1 << 2) /* Rx Overrun Error */
#define UARTLSR_RDR (1 << 2) /* Rx Data Ready */ #define UARTLSR_RDR (1 << 2) /* Rx Data Ready */
#define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
typedef struct {
console_t console;
uintptr_t base;
} console_ls_16550_t;
/* /*
* Initialize a new 16550 console instance and register it with the console * Initialize a new 16550 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
@ -79,7 +72,7 @@ typedef struct {
* Its contents will be reinitialized from scratch. * Its contents will be reinitialized from scratch.
*/ */
int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_ls_16550_t *console); console_t *console);
#endif /*__ASSEMBLER__*/ #endif /*__ASSEMBLER__*/

2
plat/layerscape/common/ls_bl1_setup.c
View file

@ -23,7 +23,7 @@ meminfo_t *bl1_plat_sec_mem_layout(void)
******************************************************************************/ ******************************************************************************/
void ls_bl1_early_platform_setup(void) void ls_bl1_early_platform_setup(void)
{ {
static console_ls_16550_t console; static console_t console;
#if !LS1043_DISABLE_TRUSTED_WDOG #if !LS1043_DISABLE_TRUSTED_WDOG
/* TODO: Enable watchdog */ /* TODO: Enable watchdog */

2
plat/layerscape/common/ls_bl2_setup.c
View file

@ -23,7 +23,7 @@ static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
******************************************************************************/ ******************************************************************************/
void ls_bl2_early_platform_setup(meminfo_t *mem_layout) void ls_bl2_early_platform_setup(meminfo_t *mem_layout)
{ {
static console_ls_16550_t console; static console_t console;
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK, console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK,

4
plat/layerscape/common/ls_bl31_setup.c
View file

@ -67,7 +67,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
void ls_bl31_early_platform_setup(void *from_bl2, void ls_bl31_early_platform_setup(void *from_bl2,
void *plat_params_from_bl2) void *plat_params_from_bl2)
{ {
static console_ls_16550_t console; static console_t console;
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK, console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK,
@ -182,7 +182,7 @@ void ls_bl31_platform_setup(void)
******************************************************************************/ ******************************************************************************/
void ls_bl31_plat_runtime_setup(void) void ls_bl31_plat_runtime_setup(void)
{ {
static console_ls_16550_t console; static console_t console;
/* Initialize the runtime console */ /* Initialize the runtime console */
console_ls_16550_register(PLAT_LS1043_UART_BASE, PLAT_LS1043_UART_CLOCK, console_ls_16550_register(PLAT_LS1043_UART_BASE, PLAT_LS1043_UART_CLOCK,

2
plat/layerscape/common/tsp/ls_tsp_setup.c
View file

@ -30,7 +30,7 @@ gicv2_driver_data_t ls_gic_data = {
******************************************************************************/ ******************************************************************************/
void ls_tsp_early_platform_setup(void) void ls_tsp_early_platform_setup(void)
{ {
static console_ls_16550_t console; static console_t console;
/* /*
* Initialize a different console than already in use to display * Initialize a different console than already in use to display
* messages from TSP * messages from TSP

4
plat/nvidia/tegra/soc/t194/plat_setup.c
View file

@ -170,7 +170,7 @@ void plat_enable_console(int32_t id)
console_clock, console_clock,
TEGRA_CONSOLE_BAUDRATE, TEGRA_CONSOLE_BAUDRATE,
&spe_console); &spe_console);
console_set_scope(&spe_console.console, CONSOLE_FLAG_BOOT | console_set_scope(&spe_console, CONSOLE_FLAG_BOOT |
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
#else #else
@ -190,7 +190,7 @@ void plat_enable_console(int32_t id)
console_clock, console_clock,
TEGRA_CONSOLE_BAUDRATE, TEGRA_CONSOLE_BAUDRATE,
&uart_console); &uart_console);
console_set_scope(&uart_console.console, CONSOLE_FLAG_BOOT | console_set_scope(&uart_console, CONSOLE_FLAG_BOOT |
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
#endif #endif