* [PATCH V5 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support
@ 2022-04-14 7:44 Peng Fan (OSS)
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-14 7:44 ` [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
0 siblings, 2 replies; 10+ messages in thread
From: Peng Fan (OSS) @ 2022-04-14 7:44 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, michal.orzel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
V5:
Align code
drop early_uart_init
V4:
Wrong v3 version, some BIT definition are mixed in patch 1,2.
V3:
Addressed Michal's comments.
Add Henry's T-b
V2:
Per Julien's comments, fix coding style issue, drop unneeded code
Add i.MX lpuart driver and i.MX8QM platform support.
- lpuart is the uart IP used in i.MX8QM/QXP/93.
- Very basic i.MX8QM platform support.
Peng Fan (2):
xen/arm: Add i.MX lpuart driver
xen/arm: Add i.MX lpuart early printk support
xen/arch/arm/Kconfig.debug | 14 ++
xen/arch/arm/arm64/debug-imx-lpuart.inc | 48 +++++
xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
xen/drivers/char/Kconfig | 7 +
xen/drivers/char/Makefile | 1 +
xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++
6 files changed, 410 insertions(+)
create mode 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
create mode 100644 xen/drivers/char/imx-lpuart.c
--
2.35.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-14 7:44 [PATCH V5 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
@ 2022-04-14 7:44 ` Peng Fan (OSS)
2022-04-14 7:50 ` Michal Orzel
` (2 more replies)
2022-04-14 7:44 ` [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
1 sibling, 3 replies; 10+ messages in thread
From: Peng Fan (OSS) @ 2022-04-14 7:44 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, michal.orzel, Peng Fan, Henry Wang
From: Peng Fan <peng.fan@nxp.com>
The i.MX LPUART Documentation:
https://www.nxp.com/webapp/Download?colCode=IMX8QMIEC
Chatper 13.6 Low Power Universal Asynchronous Receiver/
Transmitter (LPUART)
Tested-by: Henry Wang <Henry.Wang@arm.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
xen/drivers/char/Kconfig | 7 +
xen/drivers/char/Makefile | 1 +
xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++++
4 files changed, 348 insertions(+)
create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
create mode 100644 xen/drivers/char/imx-lpuart.c
diff --git a/xen/arch/arm/include/asm/imx-lpuart.h b/xen/arch/arm/include/asm/imx-lpuart.h
new file mode 100644
index 0000000000..fe859045dc
--- /dev/null
+++ b/xen/arch/arm/include/asm/imx-lpuart.h
@@ -0,0 +1,64 @@
+/*
+ * xen/arch/arm/include/asm/imx-lpuart.h
+ *
+ * Common constant definition between early printk and the LPUART driver
+ *
+ * Peng Fan <peng.fan@nxp.com>
+ * Copyright 2022 NXP
+ *
+ * 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_IMX_LPUART_H__
+#define __ASM_ARM_IMX_LPUART_H__
+
+/* 32-bit register definition */
+#define UARTBAUD (0x10)
+#define UARTSTAT (0x14)
+#define UARTCTRL (0x18)
+#define UARTDATA (0x1C)
+#define UARTMATCH (0x20)
+#define UARTMODIR (0x24)
+#define UARTFIFO (0x28)
+#define UARTWATER (0x2c)
+
+#define UARTSTAT_TDRE BIT(23, UL)
+#define UARTSTAT_TC BIT(22, UL)
+#define UARTSTAT_RDRF BIT(21, UL)
+#define UARTSTAT_OR BIT(19, UL)
+
+#define UARTBAUD_OSR_SHIFT (24)
+#define UARTBAUD_OSR_MASK (0x1f)
+#define UARTBAUD_SBR_MASK (0x1fff)
+#define UARTBAUD_BOTHEDGE (0x00020000)
+#define UARTBAUD_TDMAE (0x00800000)
+#define UARTBAUD_RDMAE (0x00200000)
+
+#define UARTCTRL_TIE BIT(23, UL)
+#define UARTCTRL_TCIE BIT(22, UL)
+#define UARTCTRL_RIE BIT(21, UL)
+#define UARTCTRL_ILIE BIT(20, UL)
+#define UARTCTRL_TE BIT(19, UL)
+#define UARTCTRL_RE BIT(18, UL)
+#define UARTCTRL_M BIT(4, UL)
+
+#define UARTWATER_RXCNT_OFF 24
+
+#endif /* __ASM_ARM_IMX_LPUART_H__ */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 2ff5b288e2..e5f7b1d8eb 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -13,6 +13,13 @@ config HAS_CADENCE_UART
This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
based board, say Y.
+config HAS_IMX_LPUART
+ bool "i.MX LPUART driver"
+ default y
+ depends on ARM_64
+ help
+ This selects the i.MX LPUART. If you have i.MX8QM based board, say Y.
+
config HAS_MVEBU
bool "Marvell MVEBU UART driver"
default y
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 7c646d771c..14e67cf072 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
obj-$(CONFIG_HAS_OMAP) += omap-uart.o
obj-$(CONFIG_HAS_SCIF) += scif-uart.o
obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
+obj-$(CONFIG_HAS_IMX_LPUART) += imx-lpuart.o
obj-$(CONFIG_ARM) += arm-uart.o
obj-y += serial.o
obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o
diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
new file mode 100644
index 0000000000..df44f91e5d
--- /dev/null
+++ b/xen/drivers/char/imx-lpuart.c
@@ -0,0 +1,276 @@
+/*
+ * xen/drivers/char/imx-lpuart.c
+ *
+ * Driver for i.MX LPUART.
+ *
+ * Peng Fan <peng.fan@nxp.com>
+ * Copyright 2022 NXP
+ *
+ * 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 <xen/errno.h>
+#include <xen/init.h>
+#include <xen/irq.h>
+#include <xen/mm.h>
+#include <xen/serial.h>
+#include <asm/device.h>
+#include <asm/imx-lpuart.h>
+#include <asm/io.h>
+
+#define imx_lpuart_read(uart, off) readl((uart)->regs + off)
+#define imx_lpuart_write(uart, off, val) writel((val), (uart)->regs + off)
+
+static struct imx_lpuart {
+ uint32_t baud, clock_hz, data_bits, parity, stop_bits, fifo_size;
+ uint32_t irq;
+ char __iomem *regs;
+ struct irqaction irqaction;
+ struct vuart_info vuart;
+} imx8_com;
+
+static void imx_lpuart_interrupt(int irq, void *data,
+ struct cpu_user_regs *regs)
+{
+ struct serial_port *port = data;
+ struct imx_lpuart *uart = port->uart;
+ uint32_t sts, rxcnt;
+
+ sts = imx_lpuart_read(uart, UARTSTAT);
+ rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;
+
+ if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
+ serial_rx_interrupt(port, regs);
+
+ if ( sts & UARTSTAT_TDRE )
+ serial_tx_interrupt(port, regs);
+
+ imx_lpuart_write(uart, UARTSTAT, sts);
+}
+
+static void __init imx_lpuart_init_preirq(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+ uint32_t ctrl, old_ctrl, bd;
+
+ old_ctrl = imx_lpuart_read(uart, UARTCTRL);
+ ctrl = (old_ctrl & ~UARTCTRL_M) | UARTCTRL_TE | UARTCTRL_RE;
+ bd = imx_lpuart_read(uart, UARTBAUD);
+
+ while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC) )
+ cpu_relax();
+
+ /* Disable transmit and receive */
+ imx_lpuart_write(uart, UARTCTRL, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE));
+
+ /* Reuse firmware baudrate settings, only disable DMA here */
+ bd &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
+
+ imx_lpuart_write(uart, UARTMODIR, 0);
+ imx_lpuart_write(uart, UARTBAUD, bd);
+ imx_lpuart_write(uart, UARTCTRL, ctrl);
+}
+
+static void __init imx_lpuart_init_postirq(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+ uint32_t temp;
+
+ uart->irqaction.handler = imx_lpuart_interrupt;
+ uart->irqaction.name = "imx_lpuart";
+ uart->irqaction.dev_id = port;
+
+ if ( setup_irq(uart->irq, 0, &uart->irqaction) != 0 )
+ {
+ dprintk(XENLOG_ERR, "Failed to allocate imx_lpuart IRQ %d\n",
+ uart->irq);
+ return;
+ }
+
+ /* Enable interrupts */
+ temp = imx_lpuart_read(uart, UARTCTRL);
+ temp |= (UARTCTRL_RIE | UARTCTRL_TIE);
+ temp |= UARTCTRL_ILIE;
+ imx_lpuart_write(uart, UARTCTRL, temp);
+}
+
+static void imx_lpuart_suspend(struct serial_port *port)
+{
+ BUG();
+}
+
+static void imx_lpuart_resume(struct serial_port *port)
+{
+ BUG();
+}
+
+static int imx_lpuart_tx_ready(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+
+ return imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC;
+}
+
+static void imx_lpuart_putc(struct serial_port *port, char c)
+{
+ struct imx_lpuart *uart = port->uart;
+
+ while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TDRE) )
+ cpu_relax();
+
+ imx_lpuart_write(uart, UARTDATA, c);
+}
+
+static int imx_lpuart_getc(struct serial_port *port, char *pc)
+{
+ struct imx_lpuart *uart = port->uart;
+ int ch;
+
+ while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_RDRF) )
+ return 0;
+
+ ch = imx_lpuart_read(uart, UARTDATA);
+ *pc = ch & 0xff;
+
+ if ( imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_OR )
+ imx_lpuart_write(uart, UARTSTAT, UARTSTAT_OR);
+
+ return 1;
+}
+
+static int __init imx_lpuart_irq(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+
+ return ((uart->irq > 0) ? uart->irq : -1);
+}
+
+static const struct vuart_info *imx_lpuart_vuart_info(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+
+ return &uart->vuart;
+}
+
+static void imx_lpuart_start_tx(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+ uint32_t temp;
+
+ temp = imx_lpuart_read(uart, UARTSTAT);
+ /* Wait until empty */
+ while ( !(temp & UARTSTAT_TDRE) )
+ cpu_relax();
+
+ temp = imx_lpuart_read(uart, UARTCTRL);
+ imx_lpuart_write(uart, UARTCTRL, (temp | UARTCTRL_TIE));
+}
+
+static void imx_lpuart_stop_tx(struct serial_port *port)
+{
+ struct imx_lpuart *uart = port->uart;
+ uint32_t temp;
+
+ temp = imx_lpuart_read(uart, UARTCTRL);
+ temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
+ imx_lpuart_write(uart, UARTCTRL, temp);
+}
+
+static struct uart_driver __read_mostly imx_lpuart_driver = {
+ .init_preirq = imx_lpuart_init_preirq,
+ .init_postirq = imx_lpuart_init_postirq,
+ .endboot = NULL,
+ .suspend = imx_lpuart_suspend,
+ .resume = imx_lpuart_resume,
+ .tx_ready = imx_lpuart_tx_ready,
+ .putc = imx_lpuart_putc,
+ .getc = imx_lpuart_getc,
+ .irq = imx_lpuart_irq,
+ .start_tx = imx_lpuart_start_tx,
+ .stop_tx = imx_lpuart_stop_tx,
+ .vuart_info = imx_lpuart_vuart_info,
+};
+
+static int __init imx_lpuart_init(struct dt_device_node *dev,
+ const void *data)
+{
+ const char *config = data;
+ struct imx_lpuart *uart;
+ int res;
+ u64 addr, size;
+
+ if ( strcmp(config, "") )
+ printk("WARNING: UART configuration is not supported\n");
+
+ uart = &imx8_com;
+
+ uart->baud = 115200;
+ uart->data_bits = 8;
+ uart->parity = 0;
+ uart->stop_bits = 1;
+
+ res = dt_device_get_address(dev, 0, &addr, &size);
+ if ( res )
+ {
+ printk("imx8-lpuart: Unable to retrieve the base"
+ " address of the UART\n");
+ return res;
+ }
+
+ res = platform_get_irq(dev, 0);
+ if ( res < 0 )
+ {
+ printk("imx8-lpuart: Unable to retrieve the IRQ\n");
+ return -EINVAL;
+ }
+ uart->irq = res;
+
+ uart->regs = ioremap_nocache(addr, size);
+ if ( !uart->regs )
+ {
+ printk("imx8-lpuart: Unable to map the UART memory\n");
+ return -ENOMEM;
+ }
+
+ uart->vuart.base_addr = addr;
+ uart->vuart.size = size;
+ uart->vuart.data_off = UARTDATA;
+ /* tmp from uboot */
+ uart->vuart.status_off = UARTSTAT;
+ uart->vuart.status = UARTSTAT_TDRE;
+
+ /* Register with generic serial driver */
+ serial_register_uart(SERHND_DTUART, &imx_lpuart_driver, uart);
+
+ dt_device_set_used_by(dev, DOMID_XEN);
+
+ return 0;
+}
+
+static const struct dt_device_match imx_lpuart_dt_compat[] __initconst =
+{
+ DT_MATCH_COMPATIBLE("fsl,imx8qm-lpuart"),
+ { /* sentinel */ },
+};
+
+DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
+ .dt_match = imx_lpuart_dt_compat,
+ .init = imx_lpuart_init,
+DT_DEVICE_END
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support
2022-04-14 7:44 [PATCH V5 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
@ 2022-04-14 7:44 ` Peng Fan (OSS)
2022-04-14 7:52 ` Michal Orzel
2022-04-14 13:03 ` Bertrand Marquis
1 sibling, 2 replies; 10+ messages in thread
From: Peng Fan (OSS) @ 2022-04-14 7:44 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, michal.orzel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
xen/arch/arm/Kconfig.debug | 14 ++++++++
xen/arch/arm/arm64/debug-imx-lpuart.inc | 48 +++++++++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
diff --git a/xen/arch/arm/Kconfig.debug b/xen/arch/arm/Kconfig.debug
index 35ccd13273..842d768280 100644
--- a/xen/arch/arm/Kconfig.debug
+++ b/xen/arch/arm/Kconfig.debug
@@ -58,6 +58,16 @@ choice
This option is preferred over the platform specific
options; the platform specific options are deprecated
and will soon be removed.
+ config EARLY_UART_CHOICE_IMX_LPUART
+ select EARLY_UART_IMX_LPUART
+ depends on ARM_64
+ bool "Early printk via i.MX LPUART"
+ help
+ Say Y here if you wish the early printk to direct their
+ output to a i.MX LPUART. You can use this option to
+ provide the parameters for the i.MX LPUART rather than
+ selecting one of the platform specific options below if
+ you know the parameters for the port.
config EARLY_UART_CHOICE_MESON
select EARLY_UART_MESON
depends on ARM_64
@@ -186,6 +196,9 @@ config EARLY_UART_CADENCE
config EARLY_UART_EXYNOS4210
select EARLY_PRINTK
bool
+config EARLY_UART_IMX_LPUART
+ select EARLY_PRINTK
+ bool
config EARLY_UART_MESON
select EARLY_PRINTK
bool
@@ -283,6 +296,7 @@ config EARLY_PRINTK_INC
default "debug-8250.inc" if EARLY_UART_8250
default "debug-cadence.inc" if EARLY_UART_CADENCE
default "debug-exynos4210.inc" if EARLY_UART_EXYNOS4210
+ default "debug-imx-lpuart.inc" if EARLY_UART_IMX_LPUART
default "debug-meson.inc" if EARLY_UART_MESON
default "debug-mvebu.inc" if EARLY_UART_MVEBU
default "debug-pl011.inc" if EARLY_UART_PL011
diff --git a/xen/arch/arm/arm64/debug-imx-lpuart.inc b/xen/arch/arm/arm64/debug-imx-lpuart.inc
new file mode 100644
index 0000000000..b169332932
--- /dev/null
+++ b/xen/arch/arm/arm64/debug-imx-lpuart.inc
@@ -0,0 +1,48 @@
+/*
+ * xen/arch/arm/arm64/debug-imx-lpuart.inc
+ *
+ * i.MX8QM specific debug code
+ *
+ * Peng Fan <peng.fan@nxp.com>
+ * Copyright 2022 NXP
+ *
+ * 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/imx-lpuart.h>
+
+/*
+ * Wait LPUART to be ready to transmit
+ * rb: register which contains the UART base address
+ * rc: scratch register
+ */
+.macro early_uart_ready xb, c
+1:
+ ldr w\c, [\xb, #UARTSTAT] /* <- Flag register */
+ tst w\c, #UARTSTAT_TDRE /* Check FIFO EMPTY bit */
+ beq 1b /* Wait for the UART to be ready */
+.endm
+
+/*
+ * LPUART transmit character
+ * rb: register which contains the UART base address
+ * rt: register which contains the character to transmit
+ */
+.macro early_uart_transmit xb, wt
+ str \wt, [\xb, #UARTDATA] /* -> Data Register */
+.endm
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
@ 2022-04-14 7:50 ` Michal Orzel
2022-04-14 13:02 ` Bertrand Marquis
2022-04-15 22:26 ` Stefano Stabellini
2 siblings, 0 replies; 10+ messages in thread
From: Michal Orzel @ 2022-04-14 7:50 UTC (permalink / raw)
To: Peng Fan (OSS), sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, Peng Fan, Henry Wang
On 14.04.2022 09:44, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> The i.MX LPUART Documentation:
> https://www.nxp.com/webapp/Download?colCode=IMX8QMIEC
> Chatper 13.6 Low Power Universal Asynchronous Receiver/
> Transmitter (LPUART)
>
> Tested-by: Henry Wang <Henry.Wang@arm.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Michal Orzel <michal.orzel@arm.com>
Cheers,
Michal
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support
2022-04-14 7:44 ` [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
@ 2022-04-14 7:52 ` Michal Orzel
2022-04-14 13:03 ` Bertrand Marquis
1 sibling, 0 replies; 10+ messages in thread
From: Michal Orzel @ 2022-04-14 7:52 UTC (permalink / raw)
To: Peng Fan (OSS), sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, Peng Fan
On 14.04.2022 09:44, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Michal Orzel <michal.orzel@arm.com>
Cheers,
Michal
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-14 7:50 ` Michal Orzel
@ 2022-04-14 13:02 ` Bertrand Marquis
2022-04-14 13:03 ` Bertrand Marquis
2022-04-15 22:26 ` Stefano Stabellini
2 siblings, 1 reply; 10+ messages in thread
From: Bertrand Marquis @ 2022-04-14 13:02 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: Stefano Stabellini, julien, Volodymyr_Babchuk, andrew.cooper3,
george.dunlap, jbeulich, wl, xen-devel, van.freenix,
Michal Orzel, Peng Fan, Henry Wang
Hi Peng,
> On 14 Apr 2022, at 08:44, Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> The i.MX LPUART Documentation:
> https://www.nxp.com/webapp/Download?colCode=IMX8QMIEC
> Chatper 13.6 Low Power Universal Asynchronous Receiver/
> Transmitter (LPUART)
>
> Tested-by: Henry Wang <Henry.Wang@arm.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Asked-by: Bertrand Marquis <bertrand.marquis@arm.com>
I did not check the code but enough people went through this so I think it can be merged.
Cheers
Bertrand
> ---
> xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
> xen/drivers/char/Kconfig | 7 +
> xen/drivers/char/Makefile | 1 +
> xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++++
> 4 files changed, 348 insertions(+)
> create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
> create mode 100644 xen/drivers/char/imx-lpuart.c
>
> diff --git a/xen/arch/arm/include/asm/imx-lpuart.h b/xen/arch/arm/include/asm/imx-lpuart.h
> new file mode 100644
> index 0000000000..fe859045dc
> --- /dev/null
> +++ b/xen/arch/arm/include/asm/imx-lpuart.h
> @@ -0,0 +1,64 @@
> +/*
> + * xen/arch/arm/include/asm/imx-lpuart.h
> + *
> + * Common constant definition between early printk and the LPUART driver
> + *
> + * Peng Fan <peng.fan@nxp.com>
> + * Copyright 2022 NXP
> + *
> + * 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_IMX_LPUART_H__
> +#define __ASM_ARM_IMX_LPUART_H__
> +
> +/* 32-bit register definition */
> +#define UARTBAUD (0x10)
> +#define UARTSTAT (0x14)
> +#define UARTCTRL (0x18)
> +#define UARTDATA (0x1C)
> +#define UARTMATCH (0x20)
> +#define UARTMODIR (0x24)
> +#define UARTFIFO (0x28)
> +#define UARTWATER (0x2c)
> +
> +#define UARTSTAT_TDRE BIT(23, UL)
> +#define UARTSTAT_TC BIT(22, UL)
> +#define UARTSTAT_RDRF BIT(21, UL)
> +#define UARTSTAT_OR BIT(19, UL)
> +
> +#define UARTBAUD_OSR_SHIFT (24)
> +#define UARTBAUD_OSR_MASK (0x1f)
> +#define UARTBAUD_SBR_MASK (0x1fff)
> +#define UARTBAUD_BOTHEDGE (0x00020000)
> +#define UARTBAUD_TDMAE (0x00800000)
> +#define UARTBAUD_RDMAE (0x00200000)
> +
> +#define UARTCTRL_TIE BIT(23, UL)
> +#define UARTCTRL_TCIE BIT(22, UL)
> +#define UARTCTRL_RIE BIT(21, UL)
> +#define UARTCTRL_ILIE BIT(20, UL)
> +#define UARTCTRL_TE BIT(19, UL)
> +#define UARTCTRL_RE BIT(18, UL)
> +#define UARTCTRL_M BIT(4, UL)
> +
> +#define UARTWATER_RXCNT_OFF 24
> +
> +#endif /* __ASM_ARM_IMX_LPUART_H__ */
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
> index 2ff5b288e2..e5f7b1d8eb 100644
> --- a/xen/drivers/char/Kconfig
> +++ b/xen/drivers/char/Kconfig
> @@ -13,6 +13,13 @@ config HAS_CADENCE_UART
> This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
> based board, say Y.
>
> +config HAS_IMX_LPUART
> + bool "i.MX LPUART driver"
> + default y
> + depends on ARM_64
> + help
> + This selects the i.MX LPUART. If you have i.MX8QM based board, say Y.
> +
> config HAS_MVEBU
> bool "Marvell MVEBU UART driver"
> default y
> diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
> index 7c646d771c..14e67cf072 100644
> --- a/xen/drivers/char/Makefile
> +++ b/xen/drivers/char/Makefile
> @@ -8,6 +8,7 @@ obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
> obj-$(CONFIG_HAS_OMAP) += omap-uart.o
> obj-$(CONFIG_HAS_SCIF) += scif-uart.o
> obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
> +obj-$(CONFIG_HAS_IMX_LPUART) += imx-lpuart.o
> obj-$(CONFIG_ARM) += arm-uart.o
> obj-y += serial.o
> obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o
> diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
> new file mode 100644
> index 0000000000..df44f91e5d
> --- /dev/null
> +++ b/xen/drivers/char/imx-lpuart.c
> @@ -0,0 +1,276 @@
> +/*
> + * xen/drivers/char/imx-lpuart.c
> + *
> + * Driver for i.MX LPUART.
> + *
> + * Peng Fan <peng.fan@nxp.com>
> + * Copyright 2022 NXP
> + *
> + * 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 <xen/errno.h>
> +#include <xen/init.h>
> +#include <xen/irq.h>
> +#include <xen/mm.h>
> +#include <xen/serial.h>
> +#include <asm/device.h>
> +#include <asm/imx-lpuart.h>
> +#include <asm/io.h>
> +
> +#define imx_lpuart_read(uart, off) readl((uart)->regs + off)
> +#define imx_lpuart_write(uart, off, val) writel((val), (uart)->regs + off)
> +
> +static struct imx_lpuart {
> + uint32_t baud, clock_hz, data_bits, parity, stop_bits, fifo_size;
> + uint32_t irq;
> + char __iomem *regs;
> + struct irqaction irqaction;
> + struct vuart_info vuart;
> +} imx8_com;
> +
> +static void imx_lpuart_interrupt(int irq, void *data,
> + struct cpu_user_regs *regs)
> +{
> + struct serial_port *port = data;
> + struct imx_lpuart *uart = port->uart;
> + uint32_t sts, rxcnt;
> +
> + sts = imx_lpuart_read(uart, UARTSTAT);
> + rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;
> +
> + if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
> + serial_rx_interrupt(port, regs);
> +
> + if ( sts & UARTSTAT_TDRE )
> + serial_tx_interrupt(port, regs);
> +
> + imx_lpuart_write(uart, UARTSTAT, sts);
> +}
> +
> +static void __init imx_lpuart_init_preirq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t ctrl, old_ctrl, bd;
> +
> + old_ctrl = imx_lpuart_read(uart, UARTCTRL);
> + ctrl = (old_ctrl & ~UARTCTRL_M) | UARTCTRL_TE | UARTCTRL_RE;
> + bd = imx_lpuart_read(uart, UARTBAUD);
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC) )
> + cpu_relax();
> +
> + /* Disable transmit and receive */
> + imx_lpuart_write(uart, UARTCTRL, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE));
> +
> + /* Reuse firmware baudrate settings, only disable DMA here */
> + bd &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
> +
> + imx_lpuart_write(uart, UARTMODIR, 0);
> + imx_lpuart_write(uart, UARTBAUD, bd);
> + imx_lpuart_write(uart, UARTCTRL, ctrl);
> +}
> +
> +static void __init imx_lpuart_init_postirq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + uart->irqaction.handler = imx_lpuart_interrupt;
> + uart->irqaction.name = "imx_lpuart";
> + uart->irqaction.dev_id = port;
> +
> + if ( setup_irq(uart->irq, 0, &uart->irqaction) != 0 )
> + {
> + dprintk(XENLOG_ERR, "Failed to allocate imx_lpuart IRQ %d\n",
> + uart->irq);
> + return;
> + }
> +
> + /* Enable interrupts */
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + temp |= (UARTCTRL_RIE | UARTCTRL_TIE);
> + temp |= UARTCTRL_ILIE;
> + imx_lpuart_write(uart, UARTCTRL, temp);
> +}
> +
> +static void imx_lpuart_suspend(struct serial_port *port)
> +{
> + BUG();
> +}
> +
> +static void imx_lpuart_resume(struct serial_port *port)
> +{
> + BUG();
> +}
> +
> +static int imx_lpuart_tx_ready(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC;
> +}
> +
> +static void imx_lpuart_putc(struct serial_port *port, char c)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TDRE) )
> + cpu_relax();
> +
> + imx_lpuart_write(uart, UARTDATA, c);
> +}
> +
> +static int imx_lpuart_getc(struct serial_port *port, char *pc)
> +{
> + struct imx_lpuart *uart = port->uart;
> + int ch;
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_RDRF) )
> + return 0;
> +
> + ch = imx_lpuart_read(uart, UARTDATA);
> + *pc = ch & 0xff;
> +
> + if ( imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_OR )
> + imx_lpuart_write(uart, UARTSTAT, UARTSTAT_OR);
> +
> + return 1;
> +}
> +
> +static int __init imx_lpuart_irq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return ((uart->irq > 0) ? uart->irq : -1);
> +}
> +
> +static const struct vuart_info *imx_lpuart_vuart_info(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return &uart->vuart;
> +}
> +
> +static void imx_lpuart_start_tx(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + temp = imx_lpuart_read(uart, UARTSTAT);
> + /* Wait until empty */
> + while ( !(temp & UARTSTAT_TDRE) )
> + cpu_relax();
> +
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + imx_lpuart_write(uart, UARTCTRL, (temp | UARTCTRL_TIE));
> +}
> +
> +static void imx_lpuart_stop_tx(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
> + imx_lpuart_write(uart, UARTCTRL, temp);
> +}
> +
> +static struct uart_driver __read_mostly imx_lpuart_driver = {
> + .init_preirq = imx_lpuart_init_preirq,
> + .init_postirq = imx_lpuart_init_postirq,
> + .endboot = NULL,
> + .suspend = imx_lpuart_suspend,
> + .resume = imx_lpuart_resume,
> + .tx_ready = imx_lpuart_tx_ready,
> + .putc = imx_lpuart_putc,
> + .getc = imx_lpuart_getc,
> + .irq = imx_lpuart_irq,
> + .start_tx = imx_lpuart_start_tx,
> + .stop_tx = imx_lpuart_stop_tx,
> + .vuart_info = imx_lpuart_vuart_info,
> +};
> +
> +static int __init imx_lpuart_init(struct dt_device_node *dev,
> + const void *data)
> +{
> + const char *config = data;
> + struct imx_lpuart *uart;
> + int res;
> + u64 addr, size;
> +
> + if ( strcmp(config, "") )
> + printk("WARNING: UART configuration is not supported\n");
> +
> + uart = &imx8_com;
> +
> + uart->baud = 115200;
> + uart->data_bits = 8;
> + uart->parity = 0;
> + uart->stop_bits = 1;
> +
> + res = dt_device_get_address(dev, 0, &addr, &size);
> + if ( res )
> + {
> + printk("imx8-lpuart: Unable to retrieve the base"
> + " address of the UART\n");
> + return res;
> + }
> +
> + res = platform_get_irq(dev, 0);
> + if ( res < 0 )
> + {
> + printk("imx8-lpuart: Unable to retrieve the IRQ\n");
> + return -EINVAL;
> + }
> + uart->irq = res;
> +
> + uart->regs = ioremap_nocache(addr, size);
> + if ( !uart->regs )
> + {
> + printk("imx8-lpuart: Unable to map the UART memory\n");
> + return -ENOMEM;
> + }
> +
> + uart->vuart.base_addr = addr;
> + uart->vuart.size = size;
> + uart->vuart.data_off = UARTDATA;
> + /* tmp from uboot */
> + uart->vuart.status_off = UARTSTAT;
> + uart->vuart.status = UARTSTAT_TDRE;
> +
> + /* Register with generic serial driver */
> + serial_register_uart(SERHND_DTUART, &imx_lpuart_driver, uart);
> +
> + dt_device_set_used_by(dev, DOMID_XEN);
> +
> + return 0;
> +}
> +
> +static const struct dt_device_match imx_lpuart_dt_compat[] __initconst =
> +{
> + DT_MATCH_COMPATIBLE("fsl,imx8qm-lpuart"),
> + { /* sentinel */ },
> +};
> +
> +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
> + .dt_match = imx_lpuart_dt_compat,
> + .init = imx_lpuart_init,
> +DT_DEVICE_END
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support
2022-04-14 7:44 ` [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
2022-04-14 7:52 ` Michal Orzel
@ 2022-04-14 13:03 ` Bertrand Marquis
1 sibling, 0 replies; 10+ messages in thread
From: Bertrand Marquis @ 2022-04-14 13:03 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: Stefano Stabellini, julien, Volodymyr_Babchuk, andrew.cooper3,
george.dunlap, jbeulich, wl, xen-devel, van.freenix,
Michal Orzel, Peng Fan
Hi Peng,
> On 14 Apr 2022, at 08:44, Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Bertrand Marquis <bertrand.marquis@arm.com>
Cheers
Bertrand
> ---
> xen/arch/arm/Kconfig.debug | 14 ++++++++
> xen/arch/arm/arm64/debug-imx-lpuart.inc | 48 +++++++++++++++++++++++++
> 2 files changed, 62 insertions(+)
> create mode 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
>
> diff --git a/xen/arch/arm/Kconfig.debug b/xen/arch/arm/Kconfig.debug
> index 35ccd13273..842d768280 100644
> --- a/xen/arch/arm/Kconfig.debug
> +++ b/xen/arch/arm/Kconfig.debug
> @@ -58,6 +58,16 @@ choice
> This option is preferred over the platform specific
> options; the platform specific options are deprecated
> and will soon be removed.
> + config EARLY_UART_CHOICE_IMX_LPUART
> + select EARLY_UART_IMX_LPUART
> + depends on ARM_64
> + bool "Early printk via i.MX LPUART"
> + help
> + Say Y here if you wish the early printk to direct their
> + output to a i.MX LPUART. You can use this option to
> + provide the parameters for the i.MX LPUART rather than
> + selecting one of the platform specific options below if
> + you know the parameters for the port.
> config EARLY_UART_CHOICE_MESON
> select EARLY_UART_MESON
> depends on ARM_64
> @@ -186,6 +196,9 @@ config EARLY_UART_CADENCE
> config EARLY_UART_EXYNOS4210
> select EARLY_PRINTK
> bool
> +config EARLY_UART_IMX_LPUART
> + select EARLY_PRINTK
> + bool
> config EARLY_UART_MESON
> select EARLY_PRINTK
> bool
> @@ -283,6 +296,7 @@ config EARLY_PRINTK_INC
> default "debug-8250.inc" if EARLY_UART_8250
> default "debug-cadence.inc" if EARLY_UART_CADENCE
> default "debug-exynos4210.inc" if EARLY_UART_EXYNOS4210
> + default "debug-imx-lpuart.inc" if EARLY_UART_IMX_LPUART
> default "debug-meson.inc" if EARLY_UART_MESON
> default "debug-mvebu.inc" if EARLY_UART_MVEBU
> default "debug-pl011.inc" if EARLY_UART_PL011
> diff --git a/xen/arch/arm/arm64/debug-imx-lpuart.inc b/xen/arch/arm/arm64/debug-imx-lpuart.inc
> new file mode 100644
> index 0000000000..b169332932
> --- /dev/null
> +++ b/xen/arch/arm/arm64/debug-imx-lpuart.inc
> @@ -0,0 +1,48 @@
> +/*
> + * xen/arch/arm/arm64/debug-imx-lpuart.inc
> + *
> + * i.MX8QM specific debug code
> + *
> + * Peng Fan <peng.fan@nxp.com>
> + * Copyright 2022 NXP
> + *
> + * 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/imx-lpuart.h>
> +
> +/*
> + * Wait LPUART to be ready to transmit
> + * rb: register which contains the UART base address
> + * rc: scratch register
> + */
> +.macro early_uart_ready xb, c
> +1:
> + ldr w\c, [\xb, #UARTSTAT] /* <- Flag register */
> + tst w\c, #UARTSTAT_TDRE /* Check FIFO EMPTY bit */
> + beq 1b /* Wait for the UART to be ready */
> +.endm
> +
> +/*
> + * LPUART transmit character
> + * rb: register which contains the UART base address
> + * rt: register which contains the character to transmit
> + */
> +.macro early_uart_transmit xb, wt
> + str \wt, [\xb, #UARTDATA] /* -> Data Register */
> +.endm
> +
> +/*
> + * Local variables:
> + * mode: ASM
> + * indent-tabs-mode: nil
> + * End:
> + */
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-14 13:02 ` Bertrand Marquis
@ 2022-04-14 13:03 ` Bertrand Marquis
0 siblings, 0 replies; 10+ messages in thread
From: Bertrand Marquis @ 2022-04-14 13:03 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: Stefano Stabellini, julien, Volodymyr_Babchuk, andrew.cooper3,
george.dunlap, jbeulich, wl, xen-devel, van.freenix,
Michal Orzel, Peng Fan, Henry Wang
> On 14 Apr 2022, at 14:02, Bertrand Marquis <bertrand.marquis@arm.com> wrote:
>
> Hi Peng,
>
>> On 14 Apr 2022, at 08:44, Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>>
>> From: Peng Fan <peng.fan@nxp.com>
>>
>> The i.MX LPUART Documentation:
>> https://www.nxp.com/webapp/Download?colCode=IMX8QMIEC
>> Chatper 13.6 Low Power Universal Asynchronous Receiver/
>> Transmitter (LPUART)
>>
>> Tested-by: Henry Wang <Henry.Wang@arm.com>
>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Asked-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Bertrand Marquis <bertrand.marquis@arm.com>
(Auto correct, sorry for that)
Bertrand
>
> I did not check the code but enough people went through this so I think it can be merged.
>
> Cheers
> Bertrand
>
>> ---
>> xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
>> xen/drivers/char/Kconfig | 7 +
>> xen/drivers/char/Makefile | 1 +
>> xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++++
>> 4 files changed, 348 insertions(+)
>> create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
>> create mode 100644 xen/drivers/char/imx-lpuart.c
>>
>> diff --git a/xen/arch/arm/include/asm/imx-lpuart.h b/xen/arch/arm/include/asm/imx-lpuart.h
>> new file mode 100644
>> index 0000000000..fe859045dc
>> --- /dev/null
>> +++ b/xen/arch/arm/include/asm/imx-lpuart.h
>> @@ -0,0 +1,64 @@
>> +/*
>> + * xen/arch/arm/include/asm/imx-lpuart.h
>> + *
>> + * Common constant definition between early printk and the LPUART driver
>> + *
>> + * Peng Fan <peng.fan@nxp.com>
>> + * Copyright 2022 NXP
>> + *
>> + * 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_IMX_LPUART_H__
>> +#define __ASM_ARM_IMX_LPUART_H__
>> +
>> +/* 32-bit register definition */
>> +#define UARTBAUD (0x10)
>> +#define UARTSTAT (0x14)
>> +#define UARTCTRL (0x18)
>> +#define UARTDATA (0x1C)
>> +#define UARTMATCH (0x20)
>> +#define UARTMODIR (0x24)
>> +#define UARTFIFO (0x28)
>> +#define UARTWATER (0x2c)
>> +
>> +#define UARTSTAT_TDRE BIT(23, UL)
>> +#define UARTSTAT_TC BIT(22, UL)
>> +#define UARTSTAT_RDRF BIT(21, UL)
>> +#define UARTSTAT_OR BIT(19, UL)
>> +
>> +#define UARTBAUD_OSR_SHIFT (24)
>> +#define UARTBAUD_OSR_MASK (0x1f)
>> +#define UARTBAUD_SBR_MASK (0x1fff)
>> +#define UARTBAUD_BOTHEDGE (0x00020000)
>> +#define UARTBAUD_TDMAE (0x00800000)
>> +#define UARTBAUD_RDMAE (0x00200000)
>> +
>> +#define UARTCTRL_TIE BIT(23, UL)
>> +#define UARTCTRL_TCIE BIT(22, UL)
>> +#define UARTCTRL_RIE BIT(21, UL)
>> +#define UARTCTRL_ILIE BIT(20, UL)
>> +#define UARTCTRL_TE BIT(19, UL)
>> +#define UARTCTRL_RE BIT(18, UL)
>> +#define UARTCTRL_M BIT(4, UL)
>> +
>> +#define UARTWATER_RXCNT_OFF 24
>> +
>> +#endif /* __ASM_ARM_IMX_LPUART_H__ */
>> +
>> +/*
>> + * Local variables:
>> + * mode: C
>> + * c-file-style: "BSD"
>> + * c-basic-offset: 4
>> + * indent-tabs-mode: nil
>> + * End:
>> + */
>> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
>> index 2ff5b288e2..e5f7b1d8eb 100644
>> --- a/xen/drivers/char/Kconfig
>> +++ b/xen/drivers/char/Kconfig
>> @@ -13,6 +13,13 @@ config HAS_CADENCE_UART
>> This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
>> based board, say Y.
>>
>> +config HAS_IMX_LPUART
>> + bool "i.MX LPUART driver"
>> + default y
>> + depends on ARM_64
>> + help
>> + This selects the i.MX LPUART. If you have i.MX8QM based board, say Y.
>> +
>> config HAS_MVEBU
>> bool "Marvell MVEBU UART driver"
>> default y
>> diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
>> index 7c646d771c..14e67cf072 100644
>> --- a/xen/drivers/char/Makefile
>> +++ b/xen/drivers/char/Makefile
>> @@ -8,6 +8,7 @@ obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
>> obj-$(CONFIG_HAS_OMAP) += omap-uart.o
>> obj-$(CONFIG_HAS_SCIF) += scif-uart.o
>> obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
>> +obj-$(CONFIG_HAS_IMX_LPUART) += imx-lpuart.o
>> obj-$(CONFIG_ARM) += arm-uart.o
>> obj-y += serial.o
>> obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o
>> diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
>> new file mode 100644
>> index 0000000000..df44f91e5d
>> --- /dev/null
>> +++ b/xen/drivers/char/imx-lpuart.c
>> @@ -0,0 +1,276 @@
>> +/*
>> + * xen/drivers/char/imx-lpuart.c
>> + *
>> + * Driver for i.MX LPUART.
>> + *
>> + * Peng Fan <peng.fan@nxp.com>
>> + * Copyright 2022 NXP
>> + *
>> + * 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 <xen/errno.h>
>> +#include <xen/init.h>
>> +#include <xen/irq.h>
>> +#include <xen/mm.h>
>> +#include <xen/serial.h>
>> +#include <asm/device.h>
>> +#include <asm/imx-lpuart.h>
>> +#include <asm/io.h>
>> +
>> +#define imx_lpuart_read(uart, off) readl((uart)->regs + off)
>> +#define imx_lpuart_write(uart, off, val) writel((val), (uart)->regs + off)
>> +
>> +static struct imx_lpuart {
>> + uint32_t baud, clock_hz, data_bits, parity, stop_bits, fifo_size;
>> + uint32_t irq;
>> + char __iomem *regs;
>> + struct irqaction irqaction;
>> + struct vuart_info vuart;
>> +} imx8_com;
>> +
>> +static void imx_lpuart_interrupt(int irq, void *data,
>> + struct cpu_user_regs *regs)
>> +{
>> + struct serial_port *port = data;
>> + struct imx_lpuart *uart = port->uart;
>> + uint32_t sts, rxcnt;
>> +
>> + sts = imx_lpuart_read(uart, UARTSTAT);
>> + rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;
>> +
>> + if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
>> + serial_rx_interrupt(port, regs);
>> +
>> + if ( sts & UARTSTAT_TDRE )
>> + serial_tx_interrupt(port, regs);
>> +
>> + imx_lpuart_write(uart, UARTSTAT, sts);
>> +}
>> +
>> +static void __init imx_lpuart_init_preirq(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> + uint32_t ctrl, old_ctrl, bd;
>> +
>> + old_ctrl = imx_lpuart_read(uart, UARTCTRL);
>> + ctrl = (old_ctrl & ~UARTCTRL_M) | UARTCTRL_TE | UARTCTRL_RE;
>> + bd = imx_lpuart_read(uart, UARTBAUD);
>> +
>> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC) )
>> + cpu_relax();
>> +
>> + /* Disable transmit and receive */
>> + imx_lpuart_write(uart, UARTCTRL, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE));
>> +
>> + /* Reuse firmware baudrate settings, only disable DMA here */
>> + bd &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
>> +
>> + imx_lpuart_write(uart, UARTMODIR, 0);
>> + imx_lpuart_write(uart, UARTBAUD, bd);
>> + imx_lpuart_write(uart, UARTCTRL, ctrl);
>> +}
>> +
>> +static void __init imx_lpuart_init_postirq(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> + uint32_t temp;
>> +
>> + uart->irqaction.handler = imx_lpuart_interrupt;
>> + uart->irqaction.name = "imx_lpuart";
>> + uart->irqaction.dev_id = port;
>> +
>> + if ( setup_irq(uart->irq, 0, &uart->irqaction) != 0 )
>> + {
>> + dprintk(XENLOG_ERR, "Failed to allocate imx_lpuart IRQ %d\n",
>> + uart->irq);
>> + return;
>> + }
>> +
>> + /* Enable interrupts */
>> + temp = imx_lpuart_read(uart, UARTCTRL);
>> + temp |= (UARTCTRL_RIE | UARTCTRL_TIE);
>> + temp |= UARTCTRL_ILIE;
>> + imx_lpuart_write(uart, UARTCTRL, temp);
>> +}
>> +
>> +static void imx_lpuart_suspend(struct serial_port *port)
>> +{
>> + BUG();
>> +}
>> +
>> +static void imx_lpuart_resume(struct serial_port *port)
>> +{
>> + BUG();
>> +}
>> +
>> +static int imx_lpuart_tx_ready(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> +
>> + return imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC;
>> +}
>> +
>> +static void imx_lpuart_putc(struct serial_port *port, char c)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> +
>> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TDRE) )
>> + cpu_relax();
>> +
>> + imx_lpuart_write(uart, UARTDATA, c);
>> +}
>> +
>> +static int imx_lpuart_getc(struct serial_port *port, char *pc)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> + int ch;
>> +
>> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_RDRF) )
>> + return 0;
>> +
>> + ch = imx_lpuart_read(uart, UARTDATA);
>> + *pc = ch & 0xff;
>> +
>> + if ( imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_OR )
>> + imx_lpuart_write(uart, UARTSTAT, UARTSTAT_OR);
>> +
>> + return 1;
>> +}
>> +
>> +static int __init imx_lpuart_irq(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> +
>> + return ((uart->irq > 0) ? uart->irq : -1);
>> +}
>> +
>> +static const struct vuart_info *imx_lpuart_vuart_info(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> +
>> + return &uart->vuart;
>> +}
>> +
>> +static void imx_lpuart_start_tx(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> + uint32_t temp;
>> +
>> + temp = imx_lpuart_read(uart, UARTSTAT);
>> + /* Wait until empty */
>> + while ( !(temp & UARTSTAT_TDRE) )
>> + cpu_relax();
>> +
>> + temp = imx_lpuart_read(uart, UARTCTRL);
>> + imx_lpuart_write(uart, UARTCTRL, (temp | UARTCTRL_TIE));
>> +}
>> +
>> +static void imx_lpuart_stop_tx(struct serial_port *port)
>> +{
>> + struct imx_lpuart *uart = port->uart;
>> + uint32_t temp;
>> +
>> + temp = imx_lpuart_read(uart, UARTCTRL);
>> + temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
>> + imx_lpuart_write(uart, UARTCTRL, temp);
>> +}
>> +
>> +static struct uart_driver __read_mostly imx_lpuart_driver = {
>> + .init_preirq = imx_lpuart_init_preirq,
>> + .init_postirq = imx_lpuart_init_postirq,
>> + .endboot = NULL,
>> + .suspend = imx_lpuart_suspend,
>> + .resume = imx_lpuart_resume,
>> + .tx_ready = imx_lpuart_tx_ready,
>> + .putc = imx_lpuart_putc,
>> + .getc = imx_lpuart_getc,
>> + .irq = imx_lpuart_irq,
>> + .start_tx = imx_lpuart_start_tx,
>> + .stop_tx = imx_lpuart_stop_tx,
>> + .vuart_info = imx_lpuart_vuart_info,
>> +};
>> +
>> +static int __init imx_lpuart_init(struct dt_device_node *dev,
>> + const void *data)
>> +{
>> + const char *config = data;
>> + struct imx_lpuart *uart;
>> + int res;
>> + u64 addr, size;
>> +
>> + if ( strcmp(config, "") )
>> + printk("WARNING: UART configuration is not supported\n");
>> +
>> + uart = &imx8_com;
>> +
>> + uart->baud = 115200;
>> + uart->data_bits = 8;
>> + uart->parity = 0;
>> + uart->stop_bits = 1;
>> +
>> + res = dt_device_get_address(dev, 0, &addr, &size);
>> + if ( res )
>> + {
>> + printk("imx8-lpuart: Unable to retrieve the base"
>> + " address of the UART\n");
>> + return res;
>> + }
>> +
>> + res = platform_get_irq(dev, 0);
>> + if ( res < 0 )
>> + {
>> + printk("imx8-lpuart: Unable to retrieve the IRQ\n");
>> + return -EINVAL;
>> + }
>> + uart->irq = res;
>> +
>> + uart->regs = ioremap_nocache(addr, size);
>> + if ( !uart->regs )
>> + {
>> + printk("imx8-lpuart: Unable to map the UART memory\n");
>> + return -ENOMEM;
>> + }
>> +
>> + uart->vuart.base_addr = addr;
>> + uart->vuart.size = size;
>> + uart->vuart.data_off = UARTDATA;
>> + /* tmp from uboot */
>> + uart->vuart.status_off = UARTSTAT;
>> + uart->vuart.status = UARTSTAT_TDRE;
>> +
>> + /* Register with generic serial driver */
>> + serial_register_uart(SERHND_DTUART, &imx_lpuart_driver, uart);
>> +
>> + dt_device_set_used_by(dev, DOMID_XEN);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct dt_device_match imx_lpuart_dt_compat[] __initconst =
>> +{
>> + DT_MATCH_COMPATIBLE("fsl,imx8qm-lpuart"),
>> + { /* sentinel */ },
>> +};
>> +
>> +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
>> + .dt_match = imx_lpuart_dt_compat,
>> + .init = imx_lpuart_init,
>> +DT_DEVICE_END
>> +
>> +/*
>> + * Local variables:
>> + * mode: C
>> + * c-file-style: "BSD"
>> + * c-basic-offset: 4
>> + * indent-tabs-mode: nil
>> + * End:
>> + */
>> --
>> 2.35.1
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-14 7:50 ` Michal Orzel
2022-04-14 13:02 ` Bertrand Marquis
@ 2022-04-15 22:26 ` Stefano Stabellini
2022-04-18 0:38 ` Peng Fan
2 siblings, 1 reply; 10+ messages in thread
From: Stefano Stabellini @ 2022-04-15 22:26 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis,
andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, michal.orzel, Peng Fan, Henry Wang
On Thu, 14 Apr 2022, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> The i.MX LPUART Documentation:
> https://www.nxp.com/webapp/Download?colCode=IMX8QMIEC
> Chatper 13.6 Low Power Universal Asynchronous Receiver/
> Transmitter (LPUART)
>
> Tested-by: Henry Wang <Henry.Wang@arm.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
> xen/drivers/char/Kconfig | 7 +
> xen/drivers/char/Makefile | 1 +
> xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++++
> 4 files changed, 348 insertions(+)
> create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
> create mode 100644 xen/drivers/char/imx-lpuart.c
>
> diff --git a/xen/arch/arm/include/asm/imx-lpuart.h b/xen/arch/arm/include/asm/imx-lpuart.h
> new file mode 100644
> index 0000000000..fe859045dc
> --- /dev/null
> +++ b/xen/arch/arm/include/asm/imx-lpuart.h
> @@ -0,0 +1,64 @@
> +/*
> + * xen/arch/arm/include/asm/imx-lpuart.h
> + *
> + * Common constant definition between early printk and the LPUART driver
> + *
> + * Peng Fan <peng.fan@nxp.com>
> + * Copyright 2022 NXP
> + *
> + * 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_IMX_LPUART_H__
> +#define __ASM_ARM_IMX_LPUART_H__
> +
> +/* 32-bit register definition */
> +#define UARTBAUD (0x10)
> +#define UARTSTAT (0x14)
> +#define UARTCTRL (0x18)
> +#define UARTDATA (0x1C)
> +#define UARTMATCH (0x20)
> +#define UARTMODIR (0x24)
> +#define UARTFIFO (0x28)
> +#define UARTWATER (0x2c)
> +
> +#define UARTSTAT_TDRE BIT(23, UL)
> +#define UARTSTAT_TC BIT(22, UL)
> +#define UARTSTAT_RDRF BIT(21, UL)
> +#define UARTSTAT_OR BIT(19, UL)
> +
> +#define UARTBAUD_OSR_SHIFT (24)
> +#define UARTBAUD_OSR_MASK (0x1f)
> +#define UARTBAUD_SBR_MASK (0x1fff)
> +#define UARTBAUD_BOTHEDGE (0x00020000)
> +#define UARTBAUD_TDMAE (0x00800000)
> +#define UARTBAUD_RDMAE (0x00200000)
> +
> +#define UARTCTRL_TIE BIT(23, UL)
> +#define UARTCTRL_TCIE BIT(22, UL)
> +#define UARTCTRL_RIE BIT(21, UL)
> +#define UARTCTRL_ILIE BIT(20, UL)
> +#define UARTCTRL_TE BIT(19, UL)
> +#define UARTCTRL_RE BIT(18, UL)
> +#define UARTCTRL_M BIT(4, UL)
> +
> +#define UARTWATER_RXCNT_OFF 24
> +
> +#endif /* __ASM_ARM_IMX_LPUART_H__ */
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
> index 2ff5b288e2..e5f7b1d8eb 100644
> --- a/xen/drivers/char/Kconfig
> +++ b/xen/drivers/char/Kconfig
> @@ -13,6 +13,13 @@ config HAS_CADENCE_UART
> This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
> based board, say Y.
>
> +config HAS_IMX_LPUART
> + bool "i.MX LPUART driver"
> + default y
> + depends on ARM_64
> + help
> + This selects the i.MX LPUART. If you have i.MX8QM based board, say Y.
> +
> config HAS_MVEBU
> bool "Marvell MVEBU UART driver"
> default y
> diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
> index 7c646d771c..14e67cf072 100644
> --- a/xen/drivers/char/Makefile
> +++ b/xen/drivers/char/Makefile
> @@ -8,6 +8,7 @@ obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
> obj-$(CONFIG_HAS_OMAP) += omap-uart.o
> obj-$(CONFIG_HAS_SCIF) += scif-uart.o
> obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
> +obj-$(CONFIG_HAS_IMX_LPUART) += imx-lpuart.o
> obj-$(CONFIG_ARM) += arm-uart.o
> obj-y += serial.o
> obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o
> diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
> new file mode 100644
> index 0000000000..df44f91e5d
> --- /dev/null
> +++ b/xen/drivers/char/imx-lpuart.c
> @@ -0,0 +1,276 @@
> +/*
> + * xen/drivers/char/imx-lpuart.c
> + *
> + * Driver for i.MX LPUART.
> + *
> + * Peng Fan <peng.fan@nxp.com>
> + * Copyright 2022 NXP
> + *
> + * 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 <xen/errno.h>
> +#include <xen/init.h>
> +#include <xen/irq.h>
> +#include <xen/mm.h>
> +#include <xen/serial.h>
> +#include <asm/device.h>
> +#include <asm/imx-lpuart.h>
> +#include <asm/io.h>
> +
> +#define imx_lpuart_read(uart, off) readl((uart)->regs + off)
> +#define imx_lpuart_write(uart, off, val) writel((val), (uart)->regs + off)
> +
> +static struct imx_lpuart {
> + uint32_t baud, clock_hz, data_bits, parity, stop_bits, fifo_size;
> + uint32_t irq;
> + char __iomem *regs;
> + struct irqaction irqaction;
> + struct vuart_info vuart;
> +} imx8_com;
> +
> +static void imx_lpuart_interrupt(int irq, void *data,
> + struct cpu_user_regs *regs)
> +{
> + struct serial_port *port = data;
> + struct imx_lpuart *uart = port->uart;
> + uint32_t sts, rxcnt;
> +
> + sts = imx_lpuart_read(uart, UARTSTAT);
> + rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;
> +
> + if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
> + serial_rx_interrupt(port, regs);
> +
> + if ( sts & UARTSTAT_TDRE )
> + serial_tx_interrupt(port, regs);
> +
> + imx_lpuart_write(uart, UARTSTAT, sts);
> +}
> +
> +static void __init imx_lpuart_init_preirq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t ctrl, old_ctrl, bd;
> +
> + old_ctrl = imx_lpuart_read(uart, UARTCTRL);
> + ctrl = (old_ctrl & ~UARTCTRL_M) | UARTCTRL_TE | UARTCTRL_RE;
> + bd = imx_lpuart_read(uart, UARTBAUD);
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC) )
> + cpu_relax();
> +
> + /* Disable transmit and receive */
> + imx_lpuart_write(uart, UARTCTRL, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE));
> +
> + /* Reuse firmware baudrate settings, only disable DMA here */
> + bd &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
> +
> + imx_lpuart_write(uart, UARTMODIR, 0);
> + imx_lpuart_write(uart, UARTBAUD, bd);
> + imx_lpuart_write(uart, UARTCTRL, ctrl);
> +}
> +
> +static void __init imx_lpuart_init_postirq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + uart->irqaction.handler = imx_lpuart_interrupt;
> + uart->irqaction.name = "imx_lpuart";
> + uart->irqaction.dev_id = port;
> +
> + if ( setup_irq(uart->irq, 0, &uart->irqaction) != 0 )
> + {
> + dprintk(XENLOG_ERR, "Failed to allocate imx_lpuart IRQ %d\n",
> + uart->irq);
> + return;
> + }
> +
> + /* Enable interrupts */
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + temp |= (UARTCTRL_RIE | UARTCTRL_TIE);
> + temp |= UARTCTRL_ILIE;
> + imx_lpuart_write(uart, UARTCTRL, temp);
> +}
> +
> +static void imx_lpuart_suspend(struct serial_port *port)
> +{
> + BUG();
> +}
> +
> +static void imx_lpuart_resume(struct serial_port *port)
> +{
> + BUG();
> +}
> +
> +static int imx_lpuart_tx_ready(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC;
> +}
> +
> +static void imx_lpuart_putc(struct serial_port *port, char c)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TDRE) )
> + cpu_relax();
> +
> + imx_lpuart_write(uart, UARTDATA, c);
> +}
> +
> +static int imx_lpuart_getc(struct serial_port *port, char *pc)
> +{
> + struct imx_lpuart *uart = port->uart;
> + int ch;
> +
> + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_RDRF) )
> + return 0;
> +
> + ch = imx_lpuart_read(uart, UARTDATA);
> + *pc = ch & 0xff;
> +
> + if ( imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_OR )
> + imx_lpuart_write(uart, UARTSTAT, UARTSTAT_OR);
> +
> + return 1;
> +}
> +
> +static int __init imx_lpuart_irq(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return ((uart->irq > 0) ? uart->irq : -1);
> +}
> +
> +static const struct vuart_info *imx_lpuart_vuart_info(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> +
> + return &uart->vuart;
> +}
> +
> +static void imx_lpuart_start_tx(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + temp = imx_lpuart_read(uart, UARTSTAT);
> + /* Wait until empty */
> + while ( !(temp & UARTSTAT_TDRE) )
> + cpu_relax();
It looks like this is looping over a stale variable?
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + imx_lpuart_write(uart, UARTCTRL, (temp | UARTCTRL_TIE));
> +}
> +
> +static void imx_lpuart_stop_tx(struct serial_port *port)
> +{
> + struct imx_lpuart *uart = port->uart;
> + uint32_t temp;
> +
> + temp = imx_lpuart_read(uart, UARTCTRL);
> + temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
> + imx_lpuart_write(uart, UARTCTRL, temp);
> +}
> +
> +static struct uart_driver __read_mostly imx_lpuart_driver = {
> + .init_preirq = imx_lpuart_init_preirq,
> + .init_postirq = imx_lpuart_init_postirq,
> + .endboot = NULL,
> + .suspend = imx_lpuart_suspend,
> + .resume = imx_lpuart_resume,
> + .tx_ready = imx_lpuart_tx_ready,
> + .putc = imx_lpuart_putc,
> + .getc = imx_lpuart_getc,
> + .irq = imx_lpuart_irq,
> + .start_tx = imx_lpuart_start_tx,
> + .stop_tx = imx_lpuart_stop_tx,
> + .vuart_info = imx_lpuart_vuart_info,
> +};
> +
> +static int __init imx_lpuart_init(struct dt_device_node *dev,
> + const void *data)
> +{
> + const char *config = data;
> + struct imx_lpuart *uart;
> + int res;
> + u64 addr, size;
> +
> + if ( strcmp(config, "") )
> + printk("WARNING: UART configuration is not supported\n");
> +
> + uart = &imx8_com;
> +
> + uart->baud = 115200;
> + uart->data_bits = 8;
> + uart->parity = 0;
> + uart->stop_bits = 1;
> +
> + res = dt_device_get_address(dev, 0, &addr, &size);
> + if ( res )
> + {
> + printk("imx8-lpuart: Unable to retrieve the base"
> + " address of the UART\n");
> + return res;
> + }
> +
> + res = platform_get_irq(dev, 0);
> + if ( res < 0 )
> + {
> + printk("imx8-lpuart: Unable to retrieve the IRQ\n");
> + return -EINVAL;
> + }
> + uart->irq = res;
> +
> + uart->regs = ioremap_nocache(addr, size);
> + if ( !uart->regs )
> + {
> + printk("imx8-lpuart: Unable to map the UART memory\n");
> + return -ENOMEM;
> + }
> +
> + uart->vuart.base_addr = addr;
> + uart->vuart.size = size;
> + uart->vuart.data_off = UARTDATA;
> + /* tmp from uboot */
> + uart->vuart.status_off = UARTSTAT;
> + uart->vuart.status = UARTSTAT_TDRE;
> +
> + /* Register with generic serial driver */
> + serial_register_uart(SERHND_DTUART, &imx_lpuart_driver, uart);
> +
> + dt_device_set_used_by(dev, DOMID_XEN);
> +
> + return 0;
> +}
> +
> +static const struct dt_device_match imx_lpuart_dt_compat[] __initconst =
> +{
> + DT_MATCH_COMPATIBLE("fsl,imx8qm-lpuart"),
> + { /* sentinel */ },
> +};
> +
> +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
> + .dt_match = imx_lpuart_dt_compat,
> + .init = imx_lpuart_init,
> +DT_DEVICE_END
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
2022-04-15 22:26 ` Stefano Stabellini
@ 2022-04-18 0:38 ` Peng Fan
0 siblings, 0 replies; 10+ messages in thread
From: Peng Fan @ 2022-04-18 0:38 UTC (permalink / raw)
To: Stefano Stabellini, Peng Fan (OSS)
Cc: julien, Volodymyr_Babchuk, bertrand.marquis, andrew.cooper3,
george.dunlap, jbeulich, wl, xen-devel, van.freenix,
michal.orzel, Henry Wang
> Subject: Re: [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver
>
> On Thu, 14 Apr 2022, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > The i.MX LPUART Documentation:
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.
> >
> nxp.com%2Fwebapp%2FDownload%3FcolCode%3DIMX8QMIEC&data=04
> %7C01%7Cp
> >
> eng.fan%40nxp.com%7Caf595d02a1dd4ed5825b08da1f2f0e78%7C686ea1d3bc
> 2b4c6
> >
> fa92cd99c5c301635%7C0%7C0%7C637856584221931187%7CUnknown%7CTW
> FpbGZsb3d
> >
> 8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D
> %7C
> >
> 3000&sdata=3N2TsMqzhHF5dem1Cyeo2HVdgfTJFnPHSoMW7KrNph8%3D
> &rese
> > rved=0 Chatper 13.6 Low Power Universal Asynchronous Receiver/
> > Transmitter (LPUART)
> >
> > Tested-by: Henry Wang <Henry.Wang@arm.com>
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > xen/arch/arm/include/asm/imx-lpuart.h | 64 ++++++
> > xen/drivers/char/Kconfig | 7 +
> > xen/drivers/char/Makefile | 1 +
> > xen/drivers/char/imx-lpuart.c | 276 ++++++++++++++++++++++++++
> > 4 files changed, 348 insertions(+)
> > create mode 100644 xen/arch/arm/include/asm/imx-lpuart.h
> > create mode 100644 xen/drivers/char/imx-lpuart.c
> >
> > diff --git a/xen/arch/arm/include/asm/imx-lpuart.h
> > b/xen/arch/arm/include/asm/imx-lpuart.h
> > new file mode 100644
> > index 0000000000..fe859045dc
> > --- /dev/null
> > +++ b/xen/arch/arm/include/asm/imx-lpuart.h
> > @@ -0,0 +1,64 @@
> > +/*
> > + * xen/arch/arm/include/asm/imx-lpuart.h
> > + *
> > + * Common constant definition between early printk and the LPUART
> > +driver
> > + *
> > + * Peng Fan <peng.fan@nxp.com>
> > + * Copyright 2022 NXP
> > + *
> > + * 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_IMX_LPUART_H__
> > +#define __ASM_ARM_IMX_LPUART_H__
> > +
> > +/* 32-bit register definition */
> > +#define UARTBAUD (0x10)
> > +#define UARTSTAT (0x14)
> > +#define UARTCTRL (0x18)
> > +#define UARTDATA (0x1C)
> > +#define UARTMATCH (0x20)
> > +#define UARTMODIR (0x24)
> > +#define UARTFIFO (0x28)
> > +#define UARTWATER (0x2c)
> > +
> > +#define UARTSTAT_TDRE BIT(23, UL)
> > +#define UARTSTAT_TC BIT(22, UL)
> > +#define UARTSTAT_RDRF BIT(21, UL)
> > +#define UARTSTAT_OR BIT(19, UL)
> > +
> > +#define UARTBAUD_OSR_SHIFT (24)
> > +#define UARTBAUD_OSR_MASK (0x1f)
> > +#define UARTBAUD_SBR_MASK (0x1fff)
> > +#define UARTBAUD_BOTHEDGE (0x00020000)
> > +#define UARTBAUD_TDMAE (0x00800000)
> > +#define UARTBAUD_RDMAE (0x00200000)
> > +
> > +#define UARTCTRL_TIE BIT(23, UL)
> > +#define UARTCTRL_TCIE BIT(22, UL)
> > +#define UARTCTRL_RIE BIT(21, UL)
> > +#define UARTCTRL_ILIE BIT(20, UL)
> > +#define UARTCTRL_TE BIT(19, UL)
> > +#define UARTCTRL_RE BIT(18, UL)
> > +#define UARTCTRL_M BIT(4, UL)
> > +
> > +#define UARTWATER_RXCNT_OFF 24
> > +
> > +#endif /* __ASM_ARM_IMX_LPUART_H__ */
> > +
> > +/*
> > + * Local variables:
> > + * mode: C
> > + * c-file-style: "BSD"
> > + * c-basic-offset: 4
> > + * indent-tabs-mode: nil
> > + * End:
> > + */
> > diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index
> > 2ff5b288e2..e5f7b1d8eb 100644
> > --- a/xen/drivers/char/Kconfig
> > +++ b/xen/drivers/char/Kconfig
> > @@ -13,6 +13,13 @@ config HAS_CADENCE_UART
> > This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
> > based board, say Y.
> >
> > +config HAS_IMX_LPUART
> > + bool "i.MX LPUART driver"
> > + default y
> > + depends on ARM_64
> > + help
> > + This selects the i.MX LPUART. If you have i.MX8QM based board, say Y.
> > +
> > config HAS_MVEBU
> > bool "Marvell MVEBU UART driver"
> > default y
> > diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
> > index 7c646d771c..14e67cf072 100644
> > --- a/xen/drivers/char/Makefile
> > +++ b/xen/drivers/char/Makefile
> > @@ -8,6 +8,7 @@ obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
> > obj-$(CONFIG_HAS_OMAP) += omap-uart.o
> > obj-$(CONFIG_HAS_SCIF) += scif-uart.o
> > obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
> > +obj-$(CONFIG_HAS_IMX_LPUART) += imx-lpuart.o
> > obj-$(CONFIG_ARM) += arm-uart.o
> > obj-y += serial.o
> > obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o diff --git
> > a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c new
> > file mode 100644 index 0000000000..df44f91e5d
> > --- /dev/null
> > +++ b/xen/drivers/char/imx-lpuart.c
> > @@ -0,0 +1,276 @@
> > +/*
> > + * xen/drivers/char/imx-lpuart.c
> > + *
> > + * Driver for i.MX LPUART.
> > + *
> > + * Peng Fan <peng.fan@nxp.com>
> > + * Copyright 2022 NXP
> > + *
> > + * 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 <xen/errno.h>
> > +#include <xen/init.h>
> > +#include <xen/irq.h>
> > +#include <xen/mm.h>
> > +#include <xen/serial.h>
> > +#include <asm/device.h>
> > +#include <asm/imx-lpuart.h>
> > +#include <asm/io.h>
> > +
> > +#define imx_lpuart_read(uart, off) readl((uart)->regs + off)
> > +#define imx_lpuart_write(uart, off, val) writel((val), (uart)->regs +
> > +off)
> > +
> > +static struct imx_lpuart {
> > + uint32_t baud, clock_hz, data_bits, parity, stop_bits, fifo_size;
> > + uint32_t irq;
> > + char __iomem *regs;
> > + struct irqaction irqaction;
> > + struct vuart_info vuart;
> > +} imx8_com;
> > +
> > +static void imx_lpuart_interrupt(int irq, void *data,
> > + struct cpu_user_regs *regs) {
> > + struct serial_port *port = data;
> > + struct imx_lpuart *uart = port->uart;
> > + uint32_t sts, rxcnt;
> > +
> > + sts = imx_lpuart_read(uart, UARTSTAT);
> > + rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;
> > +
> > + if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
> > + serial_rx_interrupt(port, regs);
> > +
> > + if ( sts & UARTSTAT_TDRE )
> > + serial_tx_interrupt(port, regs);
> > +
> > + imx_lpuart_write(uart, UARTSTAT, sts); }
> > +
> > +static void __init imx_lpuart_init_preirq(struct serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > + uint32_t ctrl, old_ctrl, bd;
> > +
> > + old_ctrl = imx_lpuart_read(uart, UARTCTRL);
> > + ctrl = (old_ctrl & ~UARTCTRL_M) | UARTCTRL_TE | UARTCTRL_RE;
> > + bd = imx_lpuart_read(uart, UARTBAUD);
> > +
> > + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC) )
> > + cpu_relax();
> > +
> > + /* Disable transmit and receive */
> > + imx_lpuart_write(uart, UARTCTRL, old_ctrl & ~(UARTCTRL_TE |
> > + UARTCTRL_RE));
> > +
> > + /* Reuse firmware baudrate settings, only disable DMA here */
> > + bd &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
> > +
> > + imx_lpuart_write(uart, UARTMODIR, 0);
> > + imx_lpuart_write(uart, UARTBAUD, bd);
> > + imx_lpuart_write(uart, UARTCTRL, ctrl); }
> > +
> > +static void __init imx_lpuart_init_postirq(struct serial_port *port)
> > +{
> > + struct imx_lpuart *uart = port->uart;
> > + uint32_t temp;
> > +
> > + uart->irqaction.handler = imx_lpuart_interrupt;
> > + uart->irqaction.name = "imx_lpuart";
> > + uart->irqaction.dev_id = port;
> > +
> > + if ( setup_irq(uart->irq, 0, &uart->irqaction) != 0 )
> > + {
> > + dprintk(XENLOG_ERR, "Failed to allocate imx_lpuart IRQ %d\n",
> > + uart->irq);
> > + return;
> > + }
> > +
> > + /* Enable interrupts */
> > + temp = imx_lpuart_read(uart, UARTCTRL);
> > + temp |= (UARTCTRL_RIE | UARTCTRL_TIE);
> > + temp |= UARTCTRL_ILIE;
> > + imx_lpuart_write(uart, UARTCTRL, temp); }
> > +
> > +static void imx_lpuart_suspend(struct serial_port *port) {
> > + BUG();
> > +}
> > +
> > +static void imx_lpuart_resume(struct serial_port *port) {
> > + BUG();
> > +}
> > +
> > +static int imx_lpuart_tx_ready(struct serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > +
> > + return imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TC; }
> > +
> > +static void imx_lpuart_putc(struct serial_port *port, char c) {
> > + struct imx_lpuart *uart = port->uart;
> > +
> > + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_TDRE) )
> > + cpu_relax();
> > +
> > + imx_lpuart_write(uart, UARTDATA, c); }
> > +
> > +static int imx_lpuart_getc(struct serial_port *port, char *pc) {
> > + struct imx_lpuart *uart = port->uart;
> > + int ch;
> > +
> > + while ( !(imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_RDRF) )
> > + return 0;
> > +
> > + ch = imx_lpuart_read(uart, UARTDATA);
> > + *pc = ch & 0xff;
> > +
> > + if ( imx_lpuart_read(uart, UARTSTAT) & UARTSTAT_OR )
> > + imx_lpuart_write(uart, UARTSTAT, UARTSTAT_OR);
> > +
> > + return 1;
> > +}
> > +
> > +static int __init imx_lpuart_irq(struct serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > +
> > + return ((uart->irq > 0) ? uart->irq : -1); }
> > +
> > +static const struct vuart_info *imx_lpuart_vuart_info(struct
> > +serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > +
> > + return &uart->vuart;
> > +}
> > +
> > +static void imx_lpuart_start_tx(struct serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > + uint32_t temp;
> > +
> > + temp = imx_lpuart_read(uart, UARTSTAT);
> > + /* Wait until empty */
> > + while ( !(temp & UARTSTAT_TDRE) )
> > + cpu_relax();
>
> It looks like this is looping over a stale variable?
Oh, yeah, good catch.
Thanks,
Peng.
>
>
> > + temp = imx_lpuart_read(uart, UARTCTRL);
> > + imx_lpuart_write(uart, UARTCTRL, (temp | UARTCTRL_TIE)); }
> > +
> > +static void imx_lpuart_stop_tx(struct serial_port *port) {
> > + struct imx_lpuart *uart = port->uart;
> > + uint32_t temp;
> > +
> > + temp = imx_lpuart_read(uart, UARTCTRL);
> > + temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
> > + imx_lpuart_write(uart, UARTCTRL, temp); }
> > +
> > +static struct uart_driver __read_mostly imx_lpuart_driver = {
> > + .init_preirq = imx_lpuart_init_preirq,
> > + .init_postirq = imx_lpuart_init_postirq,
> > + .endboot = NULL,
> > + .suspend = imx_lpuart_suspend,
> > + .resume = imx_lpuart_resume,
> > + .tx_ready = imx_lpuart_tx_ready,
> > + .putc = imx_lpuart_putc,
> > + .getc = imx_lpuart_getc,
> > + .irq = imx_lpuart_irq,
> > + .start_tx = imx_lpuart_start_tx,
> > + .stop_tx = imx_lpuart_stop_tx,
> > + .vuart_info = imx_lpuart_vuart_info, };
> > +
> > +static int __init imx_lpuart_init(struct dt_device_node *dev,
> > + const void *data) {
> > + const char *config = data;
> > + struct imx_lpuart *uart;
> > + int res;
> > + u64 addr, size;
> > +
> > + if ( strcmp(config, "") )
> > + printk("WARNING: UART configuration is not supported\n");
> > +
> > + uart = &imx8_com;
> > +
> > + uart->baud = 115200;
> > + uart->data_bits = 8;
> > + uart->parity = 0;
> > + uart->stop_bits = 1;
> > +
> > + res = dt_device_get_address(dev, 0, &addr, &size);
> > + if ( res )
> > + {
> > + printk("imx8-lpuart: Unable to retrieve the base"
> > + " address of the UART\n");
> > + return res;
> > + }
> > +
> > + res = platform_get_irq(dev, 0);
> > + if ( res < 0 )
> > + {
> > + printk("imx8-lpuart: Unable to retrieve the IRQ\n");
> > + return -EINVAL;
> > + }
> > + uart->irq = res;
> > +
> > + uart->regs = ioremap_nocache(addr, size);
> > + if ( !uart->regs )
> > + {
> > + printk("imx8-lpuart: Unable to map the UART memory\n");
> > + return -ENOMEM;
> > + }
> > +
> > + uart->vuart.base_addr = addr;
> > + uart->vuart.size = size;
> > + uart->vuart.data_off = UARTDATA;
> > + /* tmp from uboot */
> > + uart->vuart.status_off = UARTSTAT;
> > + uart->vuart.status = UARTSTAT_TDRE;
> > +
> > + /* Register with generic serial driver */
> > + serial_register_uart(SERHND_DTUART, &imx_lpuart_driver, uart);
> > +
> > + dt_device_set_used_by(dev, DOMID_XEN);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct dt_device_match imx_lpuart_dt_compat[]
> > +__initconst = {
> > + DT_MATCH_COMPATIBLE("fsl,imx8qm-lpuart"),
> > + { /* sentinel */ },
> > +};
> > +
> > +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
> > + .dt_match = imx_lpuart_dt_compat,
> > + .init = imx_lpuart_init,
> > +DT_DEVICE_END
> > +
> > +/*
> > + * Local variables:
> > + * mode: C
> > + * c-file-style: "BSD"
> > + * c-basic-offset: 4
> > + * indent-tabs-mode: nil
> > + * End:
> > + */
> > --
> > 2.35.1
> >
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-04-18 0:38 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-14 7:44 [PATCH V5 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
2022-04-14 7:44 ` [PATCH V5 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-14 7:50 ` Michal Orzel
2022-04-14 13:02 ` Bertrand Marquis
2022-04-14 13:03 ` Bertrand Marquis
2022-04-15 22:26 ` Stefano Stabellini
2022-04-18 0:38 ` Peng Fan
2022-04-14 7:44 ` [PATCH V5 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
2022-04-14 7:52 ` Michal Orzel
2022-04-14 13:03 ` Bertrand Marquis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.