Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-30 07:39:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "console_t_cleanup" into integration

Browse source 
* changes:
  coreboot: Use generic base address
  skeletton: Use generic console_t data structure
  cdns: Use generic console_t data structure
This commit is contained in:
Mark Dykes 2020-02-25 23:38:46 +00:00 • committed by TrustedFirmware Code Review
commit c723ef018f
9 changed files with 27 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/cadence/uart/aarch64/cdns_console.S
View file

@ -56,14 +56,14 @@ endfunc console_cdns_core_init
/* ----------------------------------------------- /* -----------------------------------------------
* int console_cdns_register(uintptr_t baseaddr, * int console_cdns_register(uintptr_t baseaddr,
* uint32_t clock, uint32_t baud, * uint32_t clock, uint32_t baud,
* console_cdns_t *console); * console_t *console);
* Function to initialize and register a new CDNS * Function to initialize and register a new CDNS
* 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_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
* ----------------------------------------------- * -----------------------------------------------
@ -72,7 +72,7 @@ func console_cdns_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_CDNS_BASE] str x0, [x6, #CONSOLE_T_BASE]
bl console_cdns_core_init bl console_cdns_core_init
cbz x0, register_fail cbz x0, register_fail
@ -119,7 +119,7 @@ func console_cdns_core_putc
endfunc console_cdns_core_putc endfunc console_cdns_core_putc
/* -------------------------------------------------------- /* --------------------------------------------------------
* int console_cdns_putc(int c, console_cdns_t *cdns) * int console_cdns_putc(int c, console_t *cdns)
* 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
@ -133,7 +133,7 @@ func console_cdns_putc
cmp x1, #0 cmp x1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x1, [x1, #CONSOLE_T_CDNS_BASE] ldr x1, [x1, #CONSOLE_T_BASE]
b console_cdns_core_putc b console_cdns_core_putc
endfunc console_cdns_putc endfunc console_cdns_putc
@ -165,7 +165,7 @@ no_char:
endfunc console_cdns_core_getc endfunc console_cdns_core_getc
/* --------------------------------------------- /* ---------------------------------------------
* int console_cdns_getc(console_cdns_t *console) * int console_cdns_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 if no character is available. * or -1 if no character is available.
@ -179,7 +179,7 @@ func console_cdns_getc
cmp x0, #0 cmp x0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_CDNS_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_cdns_core_getc b console_cdns_core_getc
endfunc console_cdns_getc endfunc console_cdns_getc
@ -203,7 +203,7 @@ func console_cdns_core_flush
endfunc console_cdns_core_flush endfunc console_cdns_core_flush
/* --------------------------------------------- /* ---------------------------------------------
* int console_cdns_flush(console_pl011_t *console) * int console_cdns_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
@ -216,6 +216,6 @@ func console_cdns_flush
cmp x0, #0 cmp x0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_CDNS_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_cdns_core_flush b console_cdns_core_flush
endfunc console_cdns_flush endfunc console_cdns_flush

8
drivers/console/aarch32/skeleton_console.S
View file

@ -50,7 +50,7 @@ func console_xxx_register
* by later console callback (e.g. putc). * by later console callback (e.g. putc).
* Example: * Example:
*/ */
str r1, [r0, #CONSOLE_T_XXX_BASE] str r1, [r0, #CONSOLE_T_BASE]
str r2, [r0, #CONSOLE_T_XXX_SOME_OTHER_VALUE] str r2, [r0, #CONSOLE_T_XXX_SOME_OTHER_VALUE]
/* /*
@ -87,7 +87,7 @@ func console_xxx_putc
* console_xxx_t structure pointed to by r1. * console_xxx_t structure pointed to by r1.
* Example: * Example:
*/ */
ldr r1, [r1, #CONSOLE_T_XXX_BASE] ldr r1, [r1, #CONSOLE_T_BASE]
/* /*
* Write r0 to hardware. * Write r0 to hardware.
@ -125,7 +125,7 @@ func console_xxx_getc
* console_xxx_t structure pointed to by r0. * console_xxx_t structure pointed to by r0.
* Example: * Example:
*/ */
ldr r1, [r0, #CONSOLE_T_XXX_BASE] ldr r1, [r0, #CONSOLE_T_BASE]
/* /*
* Try to read character into r0 from hardware. * Try to read character into r0 from hardware.
@ -159,7 +159,7 @@ func console_xxx_flush
* console_xxx_t structure pointed to by r0. * console_xxx_t structure pointed to by r0.
* Example: * Example:
*/ */
ldr r1, [r0, #CONSOLE_T_XXX_BASE] ldr r1, [r0, #CONSOLE_T_BASE]
/* /*
* Flush all remaining output from hardware FIFOs. Do not return until * Flush all remaining output from hardware FIFOs. Do not return until

8
drivers/console/aarch64/skeleton_console.S
View file

@ -50,7 +50,7 @@ func console_xxx_register
* by later console callback (e.g. putc). * by later console callback (e.g. putc).
* Example: * Example:
*/ */
str x1, [x0, #CONSOLE_T_XXX_BASE] str x1, [x0, #CONSOLE_T_BASE]
str x2, [x0, #CONSOLE_T_XXX_SOME_OTHER_VALUE] str x2, [x0, #CONSOLE_T_XXX_SOME_OTHER_VALUE]
/* /*
@ -87,7 +87,7 @@ func console_xxx_putc
* console_xxx_t structure pointed to by x1. * console_xxx_t structure pointed to by x1.
* Example: * Example:
*/ */
ldr x1, [x1, #CONSOLE_T_XXX_BASE] ldr x1, [x1, #CONSOLE_T_BASE]
/* /*
* Write w0 to hardware. * Write w0 to hardware.
@ -125,7 +125,7 @@ func console_xxx_getc
* console_xxx_t structure pointed to by x0. * console_xxx_t structure pointed to by x0.
* Example: * Example:
*/ */
ldr x1, [x0, #CONSOLE_T_XXX_BASE] ldr x1, [x0, #CONSOLE_T_BASE]
/* /*
* Try to read character into w0 from hardware. * Try to read character into w0 from hardware.
@ -159,7 +159,7 @@ func console_xxx_flush
* console_xxx_t structure pointed to by x0. * console_xxx_t structure pointed to by x0.
* Example: * Example:
*/ */
ldr x1, [x0, #CONSOLE_T_XXX_BASE] ldr x1, [x0, #CONSOLE_T_BASE]
/* /*
* Flush all remaining output from hardware FIFOs. Do not return until * Flush all remaining output from hardware FIFOs. Do not return until

6
drivers/coreboot/cbmem_console/aarch64/cbmem_console.S
View file

@ -35,7 +35,7 @@
* ----------------------------------------------- * -----------------------------------------------
*/ */
func console_cbmc_register func console_cbmc_register
str x0, [x1, #CONSOLE_T_CBMC_BASE] str x0, [x1, #CONSOLE_T_BASE]
ldr w2, [x0] ldr w2, [x0]
str w2, [x1, #CONSOLE_T_CBMC_SIZE] str w2, [x1, #CONSOLE_T_CBMC_SIZE]
mov x0, x1 mov x0, x1
@ -54,7 +54,7 @@ endfunc console_cbmc_register
*/ */
func console_cbmc_putc func console_cbmc_putc
ldr w2, [x1, #CONSOLE_T_CBMC_SIZE] ldr w2, [x1, #CONSOLE_T_CBMC_SIZE]
ldr x1, [x1, #CONSOLE_T_CBMC_BASE] ldr x1, [x1, #CONSOLE_T_BASE]
add x1, x1, #8 /* keep address of body in x1 */ add x1, x1, #8 /* keep address of body in x1 */
ldr w16, [x1, #-4] /* load cursor (one u32 before body) */ ldr w16, [x1, #-4] /* load cursor (one u32 before body) */
@ -93,7 +93,7 @@ endfunc console_cbmc_putc
func console_cbmc_flush func console_cbmc_flush
mov x5, x30 mov x5, x30
ldr x1, [x0, #CONSOLE_T_CBMC_SIZE] ldr x1, [x0, #CONSOLE_T_CBMC_SIZE]
ldr x0, [x0, #CONSOLE_T_CBMC_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
add x1, x1, #8 /* add size of console header */ add x1, x1, #8 /* add size of console header */
bl clean_dcache_range /* (clobbers x2 and x3) */ bl clean_dcache_range /* (clobbers x2 and x3) */
mov x0, #0 mov x0, #0

9
include/drivers/cadence/cdns_uart.h
View file

@ -25,17 +25,10 @@
#define R_UART_TX 0x30 #define R_UART_TX 0x30
#define R_UART_RX 0x30 #define R_UART_RX 0x30
#define CONSOLE_T_CDNS_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
typedef struct {
console_t console;
uintptr_t base;
} console_cdns_t;
/* /*
* Initialize a new Cadence console instance and register it with the console * Initialize a new Cadence 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
@ -43,7 +36,7 @@ typedef struct {
* Its contents will be reinitialized from scratch. * Its contents will be reinitialized from scratch.
*/ */
int console_cdns_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_cdns_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_cdns_t *console); console_t *console);
#endif /*__ASSEMBLER__*/ #endif /*__ASSEMBLER__*/

4
include/drivers/coreboot/cbmem_console.h
View file

@ -9,14 +9,12 @@
#include <drivers/console.h> #include <drivers/console.h>
#define CONSOLE_T_CBMC_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_CBMC_SIZE CONSOLE_T_DRVDATA
#define CONSOLE_T_CBMC_SIZE (CONSOLE_T_DRVDATA + REGSZ)
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
typedef struct { typedef struct {
console_t console; console_t console;
uintptr_t base;
uint32_t size; uint32_t size;
} console_cbmc_t; } console_cbmc_t;

2
lib/coreboot/coreboot_table.c
View file

@ -75,7 +75,7 @@ static void expand_and_mmap(uintptr_t baseaddr, size_t size)
static void setup_cbmem_console(uintptr_t baseaddr) static void setup_cbmem_console(uintptr_t baseaddr)
{ {
static console_cbmc_t console; static console_cbmc_t console;
assert(!console.base); /* should only have one CBMEM console */ assert(!console.console.base); /* should only have one CBMEM console */
/* CBMEM console structure stores its size in first header field. */ /* CBMEM console structure stores its size in first header field. */
uint32_t size = *(uint32_t *)baseaddr; uint32_t size = *(uint32_t *)baseaddr;

4
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
View file

@ -62,12 +62,12 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
{ {
uint64_t atf_handoff_addr; uint64_t atf_handoff_addr;
/* Register the console to provide early debug support */ /* Register the console to provide early debug support */
static console_cdns_t bl31_boot_console; static console_t bl31_boot_console;
(void)console_cdns_register(ZYNQMP_UART_BASE, (void)console_cdns_register(ZYNQMP_UART_BASE,
zynqmp_get_uart_clk(), zynqmp_get_uart_clk(),
ZYNQMP_UART_BAUDRATE, ZYNQMP_UART_BAUDRATE,
&bl31_boot_console); &bl31_boot_console);
console_set_scope(&bl31_boot_console.console, console_set_scope(&bl31_boot_console,
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT);
/* Initialize the platform config for future decision making */ /* Initialize the platform config for future decision making */

4
plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
View file

@ -21,12 +21,12 @@ void tsp_early_platform_setup(void)
* Register a different console than already in use to display * Register a different console than already in use to display
* messages from TSP * messages from TSP
*/ */
static console_cdns_t tsp_boot_console; static console_t tsp_boot_console;
(void)console_cdns_register(ZYNQMP_UART_BASE, (void)console_cdns_register(ZYNQMP_UART_BASE,
zynqmp_get_uart_clk(), zynqmp_get_uart_clk(),
ZYNQMP_UART_BAUDRATE, ZYNQMP_UART_BAUDRATE,
&tsp_boot_console); &tsp_boot_console);
console_set_scope(&tsp_boot_console.console, console_set_scope(&tsp_boot_console,
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT);
/* Initialize the platform config for future decision making */ /* Initialize the platform config for future decision making */