Merge "Don't return error information from console_flush" into integration
This commit is contained in:
commit
dfe577a817
|
@ -261,7 +261,7 @@ void backtrace(const char *cookie)
|
|||
struct frame_record *fr = __builtin_frame_address(0U);
|
||||
|
||||
/* Printing the backtrace may crash the system, flush before starting */
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
fr = adjust_frame_record(fr);
|
||||
|
||||
|
|
|
@ -2724,12 +2724,11 @@ Function : plat_crash_console_flush [mandatory]
|
|||
::
|
||||
|
||||
Argument : void
|
||||
Return : int
|
||||
Return : void
|
||||
|
||||
This API is used by the crash reporting mechanism to force write of all buffered
|
||||
data on the designated crash console. It should only use general purpose
|
||||
registers x0 through x5 to do its work. The return value is 0 on successful
|
||||
completion; otherwise the return value is -1.
|
||||
registers x0 through x5 to do its work.
|
||||
|
||||
.. _External Abort handling and RAS Support:
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -224,11 +224,11 @@ func console_meson_core_getc
|
|||
endfunc console_meson_core_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_meson_flush(console_t *console)
|
||||
* void console_meson_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -242,11 +242,11 @@ func console_meson_flush
|
|||
endfunc console_meson_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_meson_core_flush(uintptr_t base_addr)
|
||||
* void console_meson_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -258,6 +258,5 @@ func console_meson_core_flush
|
|||
/* Wait until the transmit FIFO is empty */
|
||||
1: ldr w1, [x0, #MESON_STATUS_OFFSET]
|
||||
tbz w1, #MESON_STATUS_TX_EMPTY_BIT, 1b
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_meson_core_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -222,17 +222,19 @@ func console_pl011_getc
|
|||
endfunc console_pl011_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_core_flush(uintptr_t base_addr)
|
||||
* void console_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : r0, r1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
func console_pl011_core_flush
|
||||
#if ENABLE_ASSERTIONS
|
||||
cmp r0, #0
|
||||
beq flush_error
|
||||
ASM_ASSERT(ne)
|
||||
#endif /* ENABLE_ASSERTIONS */
|
||||
|
||||
1:
|
||||
/* Loop while the transmit FIFO is busy */
|
||||
|
@ -240,19 +242,15 @@ func console_pl011_core_flush
|
|||
tst r1, #PL011_UARTFR_BUSY
|
||||
bne 1b
|
||||
|
||||
mov r0, #0
|
||||
bx lr
|
||||
flush_error:
|
||||
mov r0, #-1
|
||||
bx lr
|
||||
endfunc console_pl011_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_pl011_flush(console_t *console)
|
||||
* void console_pl011_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list: r0, r1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -208,11 +208,11 @@ func console_pl011_getc
|
|||
endfunc console_pl011_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_pl011_core_flush(uintptr_t base_addr)
|
||||
* void console_pl011_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -225,17 +225,15 @@ func console_pl011_core_flush
|
|||
/* Loop until the transmit FIFO is empty */
|
||||
ldr w1, [x0, #UARTFR]
|
||||
tbnz w1, #PL011_UARTFR_BUSY_BIT, 1b
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_pl011_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_pl011_flush(console_t *console)
|
||||
* void console_pl011_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -184,11 +184,11 @@ func console_cdns_getc
|
|||
endfunc console_cdns_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_cdns_core_flush(uintptr_t base_addr)
|
||||
* void console_cdns_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -198,16 +198,15 @@ func console_cdns_core_flush
|
|||
ASM_ASSERT(ne)
|
||||
#endif /* ENABLE_ASSERTIONS */
|
||||
/* Placeholder */
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_cdns_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_cdns_flush(console_t *console)
|
||||
* void console_cdns_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -149,7 +149,7 @@ endfunc console_xxx_getc
|
|||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - pointer to console_xxx_t struct
|
||||
* Out: r0 - 0 on success, < 0 on error
|
||||
* Out: void
|
||||
* Clobber list : r0, r1, r2, r3, r4, r5
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -166,11 +166,5 @@ func console_xxx_flush
|
|||
* all data has been flushed or there was an unrecoverable error.
|
||||
*/
|
||||
|
||||
mov r0, #0
|
||||
bx lr
|
||||
|
||||
/* Jump here if an unrecoverable error has been encountered. */
|
||||
flush_error:
|
||||
mov r0, #-1
|
||||
bx lr
|
||||
endfunc console_xxx_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -145,11 +145,11 @@ getc_error:
|
|||
endfunc console_xxx_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_xxx_flush(console_xxx_t *console)
|
||||
* void console_xxx_flush(console_xxx_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_xxx_t struct
|
||||
* Out: w0 - 0 on success, < 0 on error
|
||||
* Out: void
|
||||
* Clobber list : x0, x1, x2, x3, x4, x5
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -166,11 +166,5 @@ func console_xxx_flush
|
|||
* all data has been flushed or there was an unrecoverable error.
|
||||
*/
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
|
||||
/* Jump here if an unrecoverable error has been encountered. */
|
||||
flush_error:
|
||||
mov w0, #-1
|
||||
ret
|
||||
endfunc console_xxx_flush
|
||||
|
|
|
@ -119,17 +119,12 @@ int console_getc(void)
|
|||
return err;
|
||||
}
|
||||
|
||||
int console_flush(void)
|
||||
void console_flush(void)
|
||||
{
|
||||
int err = ERROR_NO_VALID_CONSOLE;
|
||||
console_t *console;
|
||||
|
||||
for (console = console_list; console != NULL; console = console->next)
|
||||
if ((console->flags & console_state) && (console->flush != NULL)) {
|
||||
int ret = console->flush(console);
|
||||
if ((err == ERROR_NO_VALID_CONSOLE) || (ret < err))
|
||||
err = ret;
|
||||
console->flush(console);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -82,20 +82,17 @@ putc_write_back:
|
|||
endfunc console_cbmc_putc
|
||||
|
||||
/* -----------------------------------------------
|
||||
* int console_cbmc_flush(console_cbmc_t *console)
|
||||
* void console_cbmc_flush(console_cbmc_t *console)
|
||||
* Flushes the CBMEM console by flushing the
|
||||
* console buffer from the CPU's data cache.
|
||||
* In: x0 - pointer to console_cbmc_t struct
|
||||
* Out: x0 - 0 for success
|
||||
* Clobber list: x0, x1, x2, x3, x5
|
||||
* Out: void
|
||||
* Clobber list: x0, x1, x2, x3
|
||||
* -----------------------------------------------
|
||||
*/
|
||||
func console_cbmc_flush
|
||||
mov x5, x30
|
||||
ldr x1, [x0, #CONSOLE_T_CBMC_SIZE]
|
||||
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||
add x1, x1, #8 /* add size of console header */
|
||||
bl clean_dcache_range /* (clobbers x2 and x3) */
|
||||
mov x0, #0
|
||||
ret x5
|
||||
b clean_dcache_range /* (clobbers x2 and x3) */
|
||||
endfunc console_cbmc_flush
|
||||
|
|
|
@ -171,12 +171,11 @@ int console_imx_uart_core_getc(uintptr_t base_addr)
|
|||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : r0, r1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
int console_imx_uart_core_flush(uintptr_t base_addr)
|
||||
void console_imx_uart_core_flush(uintptr_t base_addr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -223,25 +223,24 @@ func console_a3700_getc
|
|||
endfunc console_a3700_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_a3700_core_flush(uintptr_t base_addr)
|
||||
* void console_a3700_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
func console_a3700_core_flush
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_a3700_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_a3700_flush(console_t *console)
|
||||
* void console_a3700_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -82,15 +82,12 @@ func console_rcar_putc
|
|||
endfunc console_rcar_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_rcar_flush(void)
|
||||
* void console_rcar_flush(void)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output. It returns 0
|
||||
* upon successful completion, otherwise it
|
||||
* returns -1.
|
||||
* data that hasn't been output. It returns void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
func console_rcar_flush
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_rcar_flush
|
||||
|
|
|
@ -305,11 +305,9 @@ func console_rcar_putc
|
|||
endfunc console_rcar_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_rcar_flush(void)
|
||||
* void console_rcar_flush(void)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output. It returns 0
|
||||
* upon successful completion, otherwise it
|
||||
* returns -1.
|
||||
* data that hasn't been output. It returns void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -327,6 +325,5 @@ func console_rcar_flush
|
|||
and w1, w1, #~(SCSCR_TE_EN + SCSCR_RE_EN)
|
||||
strh w1, [x0, #SCIF_SCSCR]
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_rcar_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -193,37 +193,35 @@ func console_stm32_core_getc
|
|||
endfunc console_stm32_core_getc
|
||||
|
||||
/* ---------------------------------------------------------------
|
||||
* int console_core_flush(uintptr_t base_addr)
|
||||
* void console_core_flush(uintptr_t base_addr)
|
||||
*
|
||||
* Function to force a write of all buffered data that hasn't been
|
||||
* output.
|
||||
*
|
||||
* In : r0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0, r1
|
||||
* ---------------------------------------------------------------
|
||||
*/
|
||||
func console_stm32_core_flush
|
||||
#if ENABLE_ASSERTIONS
|
||||
cmp r0, #0
|
||||
beq flush_error
|
||||
ASM_ASSERT(ne)
|
||||
#endif /* ENABLE_ASSERTIONS */
|
||||
/* Check Transmit Data Register Empty */
|
||||
txe_loop_3:
|
||||
ldr r1, [r0, #USART_ISR]
|
||||
tst r1, #USART_ISR_TXE
|
||||
beq txe_loop_3
|
||||
mov r0, #0
|
||||
bx lr
|
||||
flush_error:
|
||||
mov r0, #-1
|
||||
bx lr
|
||||
endfunc console_stm32_core_flush
|
||||
|
||||
/* ------------------------------------------------------
|
||||
* int console_stm32_flush(console_t *console)
|
||||
* void console_stm32_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list: r0, r1
|
||||
* ------------------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -232,11 +232,11 @@ func console_16550_getc
|
|||
endfunc console_16550_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_16550_core_flush(uintptr_t base_addr)
|
||||
* void console_16550_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0, r1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -252,16 +252,15 @@ func console_16550_core_flush
|
|||
cmp r1, #(UARTLSR_TEMT | UARTLSR_THRE)
|
||||
bne 1b
|
||||
|
||||
mov r0, #0
|
||||
bx lr
|
||||
endfunc console_16550_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_16550_flush(console_t *console)
|
||||
* void console_16550_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : r0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : r0, r1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -225,11 +225,11 @@ func console_16550_getc
|
|||
endfunc console_16550_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_16550_core_flush(uintptr_t base_addr)
|
||||
* void console_16550_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -245,16 +245,15 @@ func console_16550_core_flush
|
|||
cmp w1, #(UARTLSR_TEMT | UARTLSR_THRE)
|
||||
b.ne 1b
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_16550_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_16550_flush(console_t *console)
|
||||
* void console_16550_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -101,7 +101,7 @@ void __dead2 do_panic(void);
|
|||
#define panic() \
|
||||
do { \
|
||||
backtrace(__func__); \
|
||||
(void)console_flush(); \
|
||||
console_flush(); \
|
||||
do_panic(); \
|
||||
} while (false)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -43,7 +43,7 @@ typedef struct console {
|
|||
u_register_t flags;
|
||||
int (*const putc)(int character, struct console *console);
|
||||
int (*const getc)(struct console *console);
|
||||
int (*const flush)(struct console *console);
|
||||
void (*const flush)(struct console *console);
|
||||
uintptr_t base;
|
||||
/* Additional private driver data may follow here. */
|
||||
} console_t;
|
||||
|
@ -76,7 +76,7 @@ int console_putc(int c);
|
|||
/* Read a character (blocking) from any console registered for current state. */
|
||||
int console_getc(void);
|
||||
/* Flush all consoles registered for the current state. */
|
||||
int console_flush(void);
|
||||
void console_flush(void);
|
||||
|
||||
#endif /* __ASSEMBLER__ */
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ uintptr_t plat_get_my_stack(void);
|
|||
void plat_report_exception(unsigned int exception_type);
|
||||
int plat_crash_console_init(void);
|
||||
int plat_crash_console_putc(int c);
|
||||
int plat_crash_console_flush(void);
|
||||
void plat_crash_console_flush(void);
|
||||
void plat_error_handler(int err) __dead2;
|
||||
void plat_panic_handler(void) __dead2;
|
||||
const char *plat_log_get_prefix(unsigned int log_level);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -23,7 +23,7 @@ void __dead2 __assert(const char *file, unsigned int line,
|
|||
{
|
||||
printf("ASSERT: %s:%d:%s\n", file, line, assertion);
|
||||
backtrace("assert");
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
plat_panic_handler();
|
||||
}
|
||||
#elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO
|
||||
|
@ -31,14 +31,14 @@ void __dead2 __assert(const char *file, unsigned int line)
|
|||
{
|
||||
printf("ASSERT: %s:%d\n", file, line);
|
||||
backtrace("assert");
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
plat_panic_handler();
|
||||
}
|
||||
#else
|
||||
void __dead2 __assert(void)
|
||||
{
|
||||
backtrace("assert");
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
plat_panic_handler();
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -25,7 +25,7 @@ void __dead2 psci_system_off(void)
|
|||
psci_spd_pm->svc_system_off();
|
||||
}
|
||||
|
||||
(void) console_flush();
|
||||
console_flush();
|
||||
|
||||
/* Call the platform specific hook */
|
||||
psci_plat_pm_ops->system_off();
|
||||
|
@ -44,7 +44,7 @@ void __dead2 psci_system_reset(void)
|
|||
psci_spd_pm->svc_system_reset();
|
||||
}
|
||||
|
||||
(void) console_flush();
|
||||
console_flush();
|
||||
|
||||
/* Call the platform specific hook */
|
||||
psci_plat_pm_ops->system_reset();
|
||||
|
@ -77,7 +77,7 @@ u_register_t psci_system_reset2(uint32_t reset_type, u_register_t cookie)
|
|||
if ((psci_spd_pm != NULL) && (psci_spd_pm->svc_system_reset != NULL)) {
|
||||
psci_spd_pm->svc_system_reset();
|
||||
}
|
||||
(void) console_flush();
|
||||
console_flush();
|
||||
|
||||
return (u_register_t)
|
||||
psci_plat_pm_ops->system_reset2((int) is_vendor, reset_type,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -78,8 +78,8 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* Out : return -1 on error else return 0.
|
||||
* void plat_crash_console_flush()
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -49,6 +49,6 @@ void arm_console_runtime_init(void)
|
|||
|
||||
void arm_console_runtime_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
(void)console_unregister(&fvp_runtime_console);
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ __dead2 void plat_arm_error_handler(int err)
|
|||
break;
|
||||
}
|
||||
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
/* Setup the watchdog to reset the system as soon as possible */
|
||||
sp805_refresh(ARM_SP805_TWDG_BASE, 1U);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -64,10 +64,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -66,10 +66,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -43,7 +43,7 @@ void __init arm_console_boot_init(void)
|
|||
|
||||
void arm_console_boot_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
(void)console_unregister(&arm_boot_console);
|
||||
}
|
||||
|
||||
|
@ -62,5 +62,5 @@ void arm_console_runtime_init(void)
|
|||
|
||||
void arm_console_runtime_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ void bcm_console_boot_init(void)
|
|||
|
||||
void bcm_console_boot_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
(void)console_unregister(&bcm_boot_console);
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ void bcm_console_runtime_init(void)
|
|||
|
||||
void bcm_console_runtime_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
(void)console_unregister(&bcm_runtime_console);
|
||||
}
|
||||
|
|
|
@ -182,7 +182,7 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush(void)
|
||||
* void plat_crash_console_flush(void)
|
||||
* Function to flush crash console
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
|
|
|
@ -96,7 +96,7 @@ void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
|
|||
#if HANDLE_EA_EL3_FIRST
|
||||
/* Skip backtrace for lower EL */
|
||||
if (level != MODE_EL3) {
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
do_panic();
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -62,10 +62,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -66,10 +66,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -65,10 +65,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -84,6 +84,5 @@ getc_error:
|
|||
endfunc console_imx_uart_getc
|
||||
|
||||
func console_imx_uart_flush
|
||||
mov x0, #0
|
||||
ret
|
||||
endfunc console_imx_uart_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -72,6 +72,5 @@ getc_error:
|
|||
endfunc console_lpuart_getc
|
||||
|
||||
func console_lpuart_flush
|
||||
mov x0, #0
|
||||
ret
|
||||
endfunc console_lpuart_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -214,11 +214,11 @@ func console_ls_16550_getc
|
|||
endfunc console_ls_16550_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_ls_16550_core_flush(uintptr_t base_addr)
|
||||
* void console_ls_16550_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
@ -234,16 +234,15 @@ func console_ls_16550_core_flush
|
|||
cmp w1, #(UARTLSR_TEMT | UARTLSR_THRE)
|
||||
b.ne 1b
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_ls_16550_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_ls_16550_flush(console_t *console)
|
||||
* void console_ls_16550_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2020, ARM Limited. All rights reserved.
|
||||
* Copyright (C) 2018 Marvell International Ltd.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
|
@ -90,10 +91,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -49,7 +49,7 @@ void marvell_console_boot_init(void)
|
|||
|
||||
void marvell_console_boot_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
(void)console_unregister(&marvell_boot_console);
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ void marvell_console_runtime_init(void)
|
|||
|
||||
void marvell_console_runtime_end(void)
|
||||
{
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
|
||||
(void)console_unregister(&marvell_runtime_console);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -149,16 +149,15 @@ getc_error:
|
|||
endfunc console_core_getc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_core_flush(uintptr_t base_addr)
|
||||
* void console_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
func console_core_flush
|
||||
/* Placeholder */
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc console_core_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -123,10 +123,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush(int c)
|
||||
* void plat_crash_console_flush(int c)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
|
@ -138,7 +138,7 @@ static __dead2 void tegra_pwr_domain_power_down_wfi(const psci_power_state_t
|
|||
if (target_state->pwr_domain_state[PLAT_MAX_PWR_LVL] ==
|
||||
PSTATE_ID_SOC_POWERDN) {
|
||||
INFO("%s: complete. Entering System Suspend...\n", __func__);
|
||||
(void)console_flush();
|
||||
console_flush();
|
||||
console_switch_state(0);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
#include <asm_macros.S>
|
||||
#include <assert_macros.S>
|
||||
#include <console_macros.S>
|
||||
|
||||
#define CONSOLE_NUM_BYTES_SHIFT 24
|
||||
|
@ -151,33 +152,32 @@ func console_spe_getc
|
|||
endfunc console_spe_getc
|
||||
|
||||
/* -------------------------------------------------
|
||||
* int console_spe_core_flush(uintptr_t base_addr)
|
||||
* void console_spe_core_flush(uintptr_t base_addr)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - console base address
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* -------------------------------------------------
|
||||
*/
|
||||
func console_spe_core_flush
|
||||
cbz x0, flush_error
|
||||
#if ENABLE_ASSERTIONS
|
||||
cmp x0, #0
|
||||
ASM_ASSERT(ne)
|
||||
#endif /* ENABLE_ASSERTIONS */
|
||||
|
||||
/* flush console */
|
||||
mov w1, #(CONSOLE_RING_DOORBELL | CONSOLE_FLUSH_DATA_TO_PORT)
|
||||
str w1, [x0]
|
||||
mov w0, #0
|
||||
ret
|
||||
flush_error:
|
||||
mov w0, #-1
|
||||
ret
|
||||
endfunc console_spe_core_flush
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int console_spe_flush(console_t *console)
|
||||
* void console_spe_flush(console_t *console)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* In : x0 - pointer to console_t structure
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -125,10 +125,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush(int c)
|
||||
* void plat_crash_console_flush(int c)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -121,10 +121,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush(int c)
|
||||
* void plat_crash_console_flush(int c)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -44,7 +44,7 @@ void qtiseclib_cb_switch_console_to_crash_state(void);
|
|||
|
||||
void qtiseclib_cb_udelay(uint32_t usec);
|
||||
|
||||
int qtiseclib_cb_console_flush(void);
|
||||
void qtiseclib_cb_console_flush(void);
|
||||
|
||||
#if QTI_SDI_BUILD
|
||||
int qtiseclib_cb_mmap_remove_dynamic_region(uintptr_t base_va, size_t size);
|
||||
|
|
|
@ -121,7 +121,7 @@ void qtiseclib_cb_udelay(uint32_t usec)
|
|||
udelay(usec);
|
||||
}
|
||||
|
||||
int qtiseclib_cb_console_flush(void)
|
||||
void qtiseclib_cb_console_flush(void)
|
||||
{
|
||||
return console_flush();
|
||||
}
|
||||
|
|
|
@ -295,7 +295,7 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
func plat_crash_console_flush
|
||||
|
|
|
@ -183,10 +183,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -98,10 +98,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/*
|
||||
* int plat_crash_console_flush(int c)
|
||||
* void plat_crash_console_flush(int c)
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
*/
|
||||
func plat_crash_console_flush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -61,6 +61,5 @@ func uniphier_console_flush
|
|||
0: ldr w1, [x0, #UNIPHIER_UART_LSR]
|
||||
tbz w1, #UNIPHIER_UART_LSR_TEMT_BIT, 0b
|
||||
|
||||
mov w0, #0
|
||||
ret
|
||||
endfunc uniphier_console_flush
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
/* These callbacks are implemented in assembly to use crash_console_helpers.S */
|
||||
int uniphier_console_putc(int character, struct console *console);
|
||||
int uniphier_console_getc(struct console *console);
|
||||
int uniphier_console_flush(struct console *console);
|
||||
void uniphier_console_flush(struct console *console);
|
||||
|
||||
static console_t uniphier_console = {
|
||||
.flags = CONSOLE_FLAG_BOOT |
|
||||
|
|
|
@ -198,7 +198,7 @@ func plat_crash_console_init
|
|||
endfunc plat_crash_console_init
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush(void)
|
||||
* void plat_crash_console_flush(void)
|
||||
*
|
||||
* Flush the crash console without a C Runtime stack.
|
||||
* ---------------------------------------------
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -141,10 +141,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : x0, x1
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
@ -106,10 +106,10 @@ func plat_crash_console_putc
|
|||
endfunc plat_crash_console_putc
|
||||
|
||||
/* ---------------------------------------------
|
||||
* int plat_crash_console_flush()
|
||||
* void plat_crash_console_flush()
|
||||
* Function to force a write of all buffered
|
||||
* data that hasn't been output.
|
||||
* Out : return -1 on error else return 0.
|
||||
* Out : void.
|
||||
* Clobber list : r0
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue