Xen project Mailing List

[Xen-devel] [PATCH v3 1/3] xen/arm: Add R-Car Gen2 support for early printk

Signed-off-by: Oleksandr Tyshchenko <oleksandr.tyshchenko@xxxxxxxxxxxxxxx> Reviewed-by: Julien Grall <julien.grall@xxxxxxxxxx> --- docs/misc/arm/early-printk.txt | 1 + xen/arch/arm/Rules.mk | 4 ++ xen/arch/arm/arm32/debug-rcar2.inc | 49 +++++++++++++++++ xen/include/asm-arm/rcar2-uart.h | 107 +++++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 xen/arch/arm/arm32/debug-rcar2.inc create mode 100644 xen/include/asm-arm/rcar2-uart.h diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index 71a0247..1ca2a55 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -19,6 +19,7 @@ where mach is the name of the machine: - brcm: printk with 8250 on Broadcom 7445D0 boards with A15 processors. - hip04-d01: printk with 8250 on HiSilicon Hip-04 D01 - seattle: printk with pl011 for AMD Seattle processor + - lager: printk with SCIF0 on Renesas R-Car H2 processors The base address and baud rate is hardcoded in xen/arch/arm/Rules.mk, see there when adding support for new machines. diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 4ee51a9..ff02893 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -109,6 +109,10 @@ ifeq ($(CONFIG_EARLY_PRINTK), seattle) EARLY_PRINTK_INC := pl011 EARLY_UART_BASE_ADDRESS := 0xe1010000 endif +ifeq ($(CONFIG_EARLY_PRINTK), lager) +EARLY_PRINTK_INC := rcar2 +EARLY_UART_BASE_ADDRESS := 0xe6e60000 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y diff --git a/xen/arch/arm/arm32/debug-rcar2.inc b/xen/arch/arm/arm32/debug-rcar2.inc new file mode 100644 index 0000000..e8d17f3 --- /dev/null +++ b/xen/arch/arm/arm32/debug-rcar2.inc @@ -0,0 +1,49 @@ +/* + * xen/arch/arm/arm32/debug-rcar2.inc + * + * R-Car Gen2 specific debug code + * + * Oleksandr Tyshchenko <oleksandr.tyshchenko@xxxxxxxxxxxxxxx> + * Copyright (C) 2014, Globallogic. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <asm/rcar2-uart.h> + +/* R-Car Gen2 UART wait UART to be ready to transmit + * rb: register which contains the UART base address + * rc: scratch register + */ +.macro early_uart_ready rb rc +1: + ldrh \rc, [\rb, #SCIF_SCFSR] /* <- SCFSR (status register) */ + tst \rc, #SCFSR_TDFE /* Check TDFE bit */ + beq 1b /* Wait for the UART to be ready */ +.endm + +/* R-Car Gen2 UART transmit character + * rb: register which contains the UART base address + * rt: register which contains the character to transmit + */ +.macro early_uart_transmit rb rt + strb \rt, [\rb, #SCIF_SCFTDR] /* -> SCFTDR (data register) */ + ldrh \rt, [\rb, #SCIF_SCFSR] /* <- SCFSR (status register) */ + and \rt, \rt, #(~(SCFSR_TEND | SCFSR_TDFE)) /* Clear TEND and TDFE bits */ + strh \rt, [\rb, #SCIF_SCFSR] /* -> SCFSR (status register) */ +.endm + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/rcar2-uart.h b/xen/include/asm-arm/rcar2-uart.h new file mode 100644 index 0000000..3a5871a --- /dev/null +++ b/xen/include/asm-arm/rcar2-uart.h @@ -0,0 +1,107 @@ +/* + * xen/include/asm-arm/rcar2-uart.h + * + * Common constant definition between early printk and the UART driver + * for the R-Car Gen2 UART. + * + * Oleksandr Tyshchenko <oleksandr.tyshchenko@xxxxxxxxxxxxxxx> + * Copyright (C) 2014, Globallogic. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARM_RCAR2_UART_H +#define __ASM_ARM_RCAR2_UART_H + +#define SCIF_FIFO_MAX_SIZE 16 +#define SCIF_CLK_FREQ 14745600 + +/* Register offsets */ +#define SCIF_SCSMR (0x00) /* Serial mode register */ +#define SCIF_SCBRR (0x04) /* Bit rate register */ +#define SCIF_SCSCR (0x08) /* Serial control register */ +#define SCIF_SCFTDR (0x0C) /* Transmit FIFO data register */ +#define SCIF_SCFSR (0x10) /* Serial status register */ +#define SCIF_SCFRDR (0x14) /* Receive FIFO data register */ +#define SCIF_SCFCR (0x18) /* FIFO control register */ +#define SCIF_SCFDR (0x1C) /* FIFO data count register */ +#define SCIF_SCSPTR (0x20) /* Serial port register */ +#define SCIF_SCLSR (0x24) /* Line status register */ +#define SCIF_DL (0x30) /* Frequency division register */ +#define SCIF_CKS (0x34) /* Clock Select register */ + +/* Serial Control Register (SCSCR) */ +#define SCSCR_TIE (1 << 7) /* Transmit Interrupt Enable */ +#define SCSCR_RIE (1 << 6) /* Receive Interrupt Enable */ +#define SCSCR_TE (1 << 5) /* Transmit Enable */ +#define SCSCR_RE (1 << 4) /* Receive Enable */ +#define SCSCR_REIE (1 << 3) /* Receive Error Interrupt Enable */ +#define SCSCR_TOIE (1 << 2) /* Timeout Interrupt Enable */ +#define SCSCR_CKE1 (1 << 1) /* Clock Enable 1 */ +#define SCSCR_CKE0 (1 << 0) /* Clock Enable 0 */ + +#define SCSCR_CKE00 (0) +#define SCSCR_CKE01 (SCSCR_CKE0) +#define SCSCR_CKE10 (SCSCR_CKE1) +#define SCSCR_CKE11 (SCSCR_CKE1 | SCSCR_CKE0) + +/* Serial Mode Register (SCSMR) */ +#define SCSMR_CHR (1 << 6) /* 7-bit Character Length */ +#define SCSMR_PE (1 << 5) /* Parity Enable */ +#define SCSMR_ODD (1 << 4) /* Odd Parity */ +#define SCSMR_STOP (1 << 3) /* Stop Bit Length */ + +/* Serial Status Register (SCFSR) */ +#define SCFSR_ER (1 << 7) /* Receive Error */ +#define SCFSR_TEND (1 << 6) /* Transmission End */ +#define SCFSR_TDFE (1 << 5) /* Transmit FIFO Data Empty */ +#define SCFSR_BRK (1 << 4) /* Break Detect */ +#define SCFSR_FER (1 << 3) /* Framing Error */ +#define SCFSR_PER (1 << 2) /* Parity Error */ +#define SCFSR_RDF (1 << 1) /* Receive FIFO Data Full */ +#define SCFSR_DR (1 << 0) /* Receive Data Ready */ + +#define SCIF_ERRORS (SCFSR_PER | SCFSR_FER | SCFSR_ER | SCFSR_BRK) + +/* Line Status Register (SCLSR) */ +#define SCLSR_TO (1 << 2) /* Timeout */ +#define SCLSR_ORER (1 << 0) /* Overrun Error */ + +/* FIFO Control Register (SCFCR) */ +#define SCFCR_RTRG1 (1 << 7) /* Receive FIFO Data Count Trigger 1 */ +#define SCFCR_RTRG0 (1 << 6) /* Receive FIFO Data Count Trigger 0 */ +#define SCFCR_TTRG1 (1 << 5) /* Transmit FIFO Data Count Trigger 1 */ +#define SCFCR_TTRG0 (1 << 4) /* Transmit FIFO Data Count Trigger 0 */ +#define SCFCR_MCE (1 << 3) /* Modem Control Enable */ +#define SCFCR_TFRST (1 << 2) /* Transmit FIFO Data Register Reset */ +#define SCFCR_RFRST (1 << 1) /* Receive FIFO Data Register Reset */ +#define SCFCR_LOOP (1 << 0) /* Loopback Test */ + +#define SCFCR_RTRG00 (0) +#define SCFCR_RTRG01 (SCFCR_RTRG0) +#define SCFCR_RTRG10 (SCFCR_RTRG1) +#define SCFCR_RTRG11 (SCFCR_RTRG1 | SCFCR_RTRG0) + +#define SCFCR_TTRG00 (0) +#define SCFCR_TTRG01 (SCFCR_TTRG0) +#define SCFCR_TTRG10 (SCFCR_TTRG1) +#define SCFCR_TTRG11 (SCFCR_TTRG1 | SCFCR_TTRG0) + +#endif /* __ASM_ARM_RCAR2_UART_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.