Mailing List Archive

[xen master] xen/arm: debug-pl011.inc: Use macros instead of hardcoded values
commit dae2839c5490a8145e2b77dcd99c3b637988bf71
Author: Michal Orzel <michal.orzel@amd.com>
AuthorDate: Fri Nov 18 12:46:17 2022 +0100
Commit: Julien Grall <jgrall@amazon.com>
CommitDate: Tue Dec 6 18:19:50 2022 +0000

xen/arm: debug-pl011.inc: Use macros instead of hardcoded values

Make use of the macros defined in asm/pl011-uart.h instead of hardcoding
the values. Also, take the opportunity to fix the file extension in a
top-level comment.

No functional change intended.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
Acked-by: Julien Grall <jgrall@amazon.com>
---
xen/arch/arm/arm64/debug-pl011.inc | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-pl011.inc
index 1928a2e3ff..d82f2f1de1 100644
--- a/xen/arch/arm/arm64/debug-pl011.inc
+++ b/xen/arch/arm/arm64/debug-pl011.inc
@@ -1,5 +1,5 @@
/*
- * xen/arch/arm/arm64/debug-pl011.S
+ * xen/arch/arm/arm64/debug-pl011.inc
*
* PL011 specific debug code
*
@@ -16,6 +16,8 @@
* GNU General Public License for more details.
*/

+ #include <asm/pl011-uart.h>
+
/*
* PL011 UART initialization
* xb: register which containts the UART base address
@@ -23,13 +25,13 @@
*/
.macro early_uart_init xb, c
mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE % 16)
- strh w\c, [\xb, #0x28] /* -> UARTFBRD (Baud divisor fraction) */
+ strh w\c, [\xb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */
mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE / 16)
- strh w\c, [\xb, #0x24] /* -> UARTIBRD (Baud divisor integer) */
+ strh w\c, [\xb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */
mov x\c, #0x60 /* 8n1 */
- str w\c, [\xb, #0x2C] /* -> UARTLCR_H (Line control) */
- ldr x\c, =0x00000301 /* RXE | TXE | UARTEN */
- str w\c, [\xb, #0x30] /* -> UARTCR (Control Register) */
+ str w\c, [\xb, #LCR_H] /* -> UARTLCR_H (Line control) */
+ ldr x\c, =(RXE | TXE | UARTEN)
+ str w\c, [\xb, #CR] /* -> UARTCR (Control Register) */
.endm

/*
@@ -39,8 +41,8 @@
*/
.macro early_uart_ready xb, c
1:
- ldrh w\c, [\xb, #0x18] /* <- UARTFR (Flag register) */
- tst w\c, #0x8 /* Check BUSY bit */
+ ldrh w\c, [\xb, #FR] /* <- UARTFR (Flag register) */
+ tst w\c, #BUSY /* Check BUSY bit */
b.ne 1b /* Wait for the UART to be ready */
.endm

@@ -50,7 +52,7 @@
* wt: register which contains the character to transmit
*/
.macro early_uart_transmit xb, wt
- strb \wt, [\xb] /* -> UARTDR (Data Register) */
+ strb \wt, [\xb, #DR] /* -> UARTDR (Data Register) */
.endm

/*
--
generated by git-patchbot for /home/xen/git/xen.git#master