Skip to content

GitLab

Commit dfe577a8 authored by Mark Dykes's avatar Mark Dykes Committed by TrustedFirmware Code Review
Browse files

Merge "Don't return error information from console_flush" into integration

parents 5dfe680f 831b0e98
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 39 deletions
plat/mediatek/mt6795/aarch64/plat_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -123,10 +123,10 @@ func plat_crash_console_putc ...@@ -123,10 +123,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/nvidia/tegra/common/tegra_pm.c
View file @ dfe577a8
/* /*
* 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. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
...@@ -138,7 +138,7 @@ static __dead2 void tegra_pwr_domain_power_down_wfi(const psci_power_state_t ...@@ -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] == if (target_state->pwr_domain_state[PLAT_MAX_PWR_LVL] ==
PSTATE_ID_SOC_POWERDN) { PSTATE_ID_SOC_POWERDN) {
INFO("%s: complete. Entering System Suspend...\n", __func__); INFO("%s: complete. Entering System Suspend...\n", __func__);
(void)console_flush(); console_flush();
console_switch_state(0); console_switch_state(0);
} }
......
plat/nvidia/tegra/drivers/spe/shared_console.S
View file @ dfe577a8
/* /*
* 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. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <asm_macros.S> #include <asm_macros.S>
#include <assert_macros.S>
#include <console_macros.S> #include <console_macros.S>
#define CONSOLE_NUM_BYTES_SHIFT 24 #define CONSOLE_NUM_BYTES_SHIFT 24
...@@ -151,33 +152,32 @@ func console_spe_getc ...@@ -151,33 +152,32 @@ func console_spe_getc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* In : x0 - console base address * In : x0 - console base address
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* ------------------------------------------------- * -------------------------------------------------
*/ */
func console_spe_core_flush func console_spe_core_flush
cbz x0, flush_error #if ENABLE_ASSERTIONS
cmp x0, #0
ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */
/* flush console */ /* flush console */
mov w1, #(CONSOLE_RING_DOORBELL | CONSOLE_FLUSH_DATA_TO_PORT) mov w1, #(CONSOLE_RING_DOORBELL | CONSOLE_FLUSH_DATA_TO_PORT)
str w1, [x0] str w1, [x0]
mov w0, #0
ret
flush_error:
mov w0, #-1
ret ret
endfunc console_spe_core_flush 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 * 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
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/qemu/common/aarch32/plat_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -125,10 +125,10 @@ func plat_crash_console_putc ...@@ -125,10 +125,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/qemu/common/aarch64/plat_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -121,10 +121,10 @@ func plat_crash_console_putc ...@@ -121,10 +121,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/qti/qtiseclib/inc/qtiseclib_cb_interface.h
View file @ dfe577a8
...@@ -44,7 +44,7 @@ void qtiseclib_cb_switch_console_to_crash_state(void); ...@@ -44,7 +44,7 @@ void qtiseclib_cb_switch_console_to_crash_state(void);
void qtiseclib_cb_udelay(uint32_t usec); void qtiseclib_cb_udelay(uint32_t usec);
int qtiseclib_cb_console_flush(void); void qtiseclib_cb_console_flush(void);
#if QTI_SDI_BUILD #if QTI_SDI_BUILD
int qtiseclib_cb_mmap_remove_dynamic_region(uintptr_t base_va, size_t size); int qtiseclib_cb_mmap_remove_dynamic_region(uintptr_t base_va, size_t size);
......
plat/qti/qtiseclib/src/qtiseclib_cb_interface.c
View file @ dfe577a8
...@@ -121,7 +121,7 @@ void qtiseclib_cb_udelay(uint32_t usec) ...@@ -121,7 +121,7 @@ void qtiseclib_cb_udelay(uint32_t usec)
udelay(usec); udelay(usec);
} }
int qtiseclib_cb_console_flush(void) void qtiseclib_cb_console_flush(void)
{ {
return console_flush(); return console_flush();
} }
......
plat/renesas/rcar/aarch64/plat_helpers.S
View file @ dfe577a8
...@@ -295,7 +295,7 @@ func plat_crash_console_putc ...@@ -295,7 +295,7 @@ func plat_crash_console_putc
endfunc plat_crash_console_putc endfunc plat_crash_console_putc
/* --------------------------------------------- /* ---------------------------------------------
* int plat_crash_console_flush() * void plat_crash_console_flush()
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_flush func plat_crash_console_flush
......
plat/rpi/common/aarch64/plat_helpers.S
View file @ dfe577a8
...@@ -183,10 +183,10 @@ func plat_crash_console_putc ...@@ -183,10 +183,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/socionext/synquacer/sq_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -98,10 +98,10 @@ func plat_crash_console_putc ...@@ -98,10 +98,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
*/ */
func plat_crash_console_flush func plat_crash_console_flush
......
plat/socionext/uniphier/uniphier_console.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -61,6 +61,5 @@ func uniphier_console_flush ...@@ -61,6 +61,5 @@ func uniphier_console_flush
0: ldr w1, [x0, #UNIPHIER_UART_LSR] 0: ldr w1, [x0, #UNIPHIER_UART_LSR]
tbz w1, #UNIPHIER_UART_LSR_TEMT_BIT, 0b tbz w1, #UNIPHIER_UART_LSR_TEMT_BIT, 0b
mov w0, #0
ret ret
endfunc uniphier_console_flush endfunc uniphier_console_flush
plat/socionext/uniphier/uniphier_console_setup.c
View file @ dfe577a8
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/* These callbacks are implemented in assembly to use crash_console_helpers.S */ /* These callbacks are implemented in assembly to use crash_console_helpers.S */
int uniphier_console_putc(int character, struct console *console); int uniphier_console_putc(int character, struct console *console);
int uniphier_console_getc(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 = { static console_t uniphier_console = {
.flags = CONSOLE_FLAG_BOOT | .flags = CONSOLE_FLAG_BOOT |
......
plat/st/stm32mp1/stm32mp1_helper.S
View file @ dfe577a8
...@@ -198,7 +198,7 @@ func plat_crash_console_init ...@@ -198,7 +198,7 @@ func plat_crash_console_init
endfunc 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. * Flush the crash console without a C Runtime stack.
* --------------------------------------------- * ---------------------------------------------
......
plat/ti/k3/common/k3_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -141,10 +141,10 @@ func plat_crash_console_putc ...@@ -141,10 +141,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : x0, x1 * Clobber list : x0, x1
* --------------------------------------------- * ---------------------------------------------
*/ */
......
plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S
View file @ dfe577a8
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -106,10 +106,10 @@ func plat_crash_console_putc ...@@ -106,10 +106,10 @@ func plat_crash_console_putc
endfunc 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 * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : void.
* Clobber list : r0 * Clobber list : r0
* --------------------------------------------- * ---------------------------------------------
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment