mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 01:54:22 +00:00
cc5859ca19
The `finish_console_register` macro is used by the multi console framework to register the `console_t` driver callbacks. It relied on weak references to the `ldr` instruction to populate 0 to the callback in case the driver has not defined the appropriate function. Use of `ldr` instruction to load absolute address to a reference makes the binary position dependant. These instructions should be replaced with adrp/adr instruction for position independant executable(PIE). But adrp/adr instructions don't work well with weak references as described in GNU ld bugzilla issue 22589. This patch defines a new version of `finish_console_register` macro which can spcify which driver callbacks are valid and deprecates the old one. If any of the argument is not specified, then the macro populates 0 for that callback. Hence the functionality of the previous deprecated macro is preserved. The USE_FINISH_CONSOLE_REG_2 define is used to select the new variant of the macro and will be removed once the deprecated variant is removed. All the upstream console drivers have been migrated to use the new macro in this patch. NOTE: Platforms be aware that the new variant of the `finish_console_register` should be used and the old variant is deprecated. Change-Id: Ia6a67aaf2aa3ba93932992d683587bbd0ad25259 Signed-off-by: Soby Mathew <soby.mathew@arm.com>
72 lines
1.3 KiB
ArmAsm
72 lines
1.3 KiB
ArmAsm
/*
|
|
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <arch.h>
|
|
#include <asm_macros.S>
|
|
#define USE_FINISH_CONSOLE_REG_2
|
|
#include <console_macros.S>
|
|
#include <assert_macros.S>
|
|
#include "imx8_lpuart.h"
|
|
|
|
.globl console_lpuart_register
|
|
.globl console_lpuart_init
|
|
.globl console_lpuart_putc
|
|
.globl console_lpuart_getc
|
|
|
|
func console_lpuart_register
|
|
mov x7, x30
|
|
mov x6, x3
|
|
cbz x6, register_fail
|
|
str x0, [x6, #CONSOLE_T_DRVDATA]
|
|
|
|
bl console_lpuart_init
|
|
cbz x0, register_fail
|
|
|
|
mov x0, x6
|
|
mov x30, x7
|
|
finish_console_register lpuart putc=1, getc=1
|
|
|
|
register_fail:
|
|
ret x7
|
|
endfunc console_lpuart_register
|
|
|
|
func console_lpuart_init
|
|
mov w0, #1
|
|
ret
|
|
endfunc console_lpuart_init
|
|
|
|
func console_lpuart_putc
|
|
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
|
cbz x1, putc_error
|
|
/* Prepare '\r' to '\n' */
|
|
cmp w0, #0xA
|
|
b.ne 2f
|
|
1:
|
|
/* Check if the transmit FIFO is full */
|
|
ldr w2, [x1, #STAT]
|
|
tbz w2, #23, 1b
|
|
mov w2, #0xD
|
|
str w2, [x1, #DATA]
|
|
2:
|
|
/* Check if the transmit FIFO is full */
|
|
ldr w2, [x1, #STAT]
|
|
tbz w2, #23, 2b
|
|
str w0, [x1, #DATA]
|
|
ret
|
|
putc_error:
|
|
mov w0, #-1
|
|
ret
|
|
endfunc console_lpuart_putc
|
|
|
|
func console_lpuart_getc
|
|
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
|
cbz x0, getc_error
|
|
/* Check if the receive FIFO state */
|
|
ret
|
|
getc_error:
|
|
mov w0, #-1
|
|
ret
|
|
endfunc console_lpuart_getc
|