* [PATCH V2 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support
@ 2022-04-02 5:42 Peng Fan (OSS)
2022-04-02 5:42 ` [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-02 5:42 ` [PATCH V2 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
0 siblings, 2 replies; 7+ messages in thread
From: Peng Fan (OSS) @ 2022-04-02 5:42 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
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 | 52 +++++
xen/drivers/char/Kconfig | 8 +
xen/drivers/char/Makefile | 1 +
xen/drivers/char/imx-lpuart.c | 275 ++++++++++++++++++++++++
xen/include/xen/imx-lpuart.h | 64 ++++++
6 files changed, 414 insertions(+)
create mode 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
create mode 100644 xen/drivers/char/imx-lpuart.c
create mode 100644 xen/include/xen/imx-lpuart.h
--
2.35.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
2022-04-02 5:42 [PATCH V2 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
@ 2022-04-02 5:42 ` Peng Fan (OSS)
2022-04-02 6:39 ` Henry Wang
2022-04-06 7:24 ` Michal Orzel
2022-04-02 5:42 ` [PATCH V2 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
1 sibling, 2 replies; 7+ messages in thread
From: Peng Fan (OSS) @ 2022-04-02 5:42 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, Peng Fan
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)
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
xen/drivers/char/Kconfig | 8 +
xen/drivers/char/Makefile | 1 +
xen/drivers/char/imx-lpuart.c | 275 ++++++++++++++++++++++++++++++++++
xen/include/xen/imx-lpuart.h | 64 ++++++++
4 files changed, 348 insertions(+)
create mode 100644 xen/drivers/char/imx-lpuart.c
create mode 100644 xen/include/xen/imx-lpuart.h
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 2ff5b288e2..0efdb2128f 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -13,6 +13,14 @@ 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 a 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..49330fd2f8
--- /dev/null
+++ b/xen/drivers/char/imx-lpuart.c
@@ -0,0 +1,275 @@
+/*
+ * 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/imx-lpuart.h>
+#include <xen/init.h>
+#include <xen/irq.h>
+#include <xen/mm.h>
+#include <xen/serial.h>
+#include <asm/device.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;
+
+ ctrl = 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"),
+ {},
+};
+
+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:
+ */
diff --git a/xen/include/xen/imx-lpuart.h b/xen/include/xen/imx-lpuart.h
new file mode 100644
index 0000000000..945ab1c4fa
--- /dev/null
+++ b/xen/include/xen/imx-lpuart.h
@@ -0,0 +1,64 @@
+/*
+ * xen/include/asm-arm/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 (1 << 23)
+#define UARTSTAT_TC (1 << 22)
+#define UARTSTAT_RDRF (1 << 21)
+#define UARTSTAT_OR (1 << 19)
+
+#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 (1 << 23)
+#define UARTCTRL_TCIE (1 << 22)
+#define UARTCTRL_RIE (1 << 21)
+#define UARTCTRL_ILIE (1 << 20)
+#define UARTCTRL_TE (1 << 19)
+#define UARTCTRL_RE (1 << 18)
+#define UARTCTRL_M (1 << 4)
+
+#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:
+ */
--
2.35.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V2 2/2] xen/arm: Add i.MX lpuart early printk support
2022-04-02 5:42 [PATCH V2 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
2022-04-02 5:42 ` [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
@ 2022-04-02 5:42 ` Peng Fan (OSS)
1 sibling, 0 replies; 7+ messages in thread
From: Peng Fan (OSS) @ 2022-04-02 5:42 UTC (permalink / raw)
To: sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel,
van.freenix, 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 | 52 +++++++++++++++++++++++++
2 files changed, 66 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..f7ac78a781
--- /dev/null
+++ b/xen/arch/arm/arm64/debug-imx-lpuart.inc
@@ -0,0 +1,52 @@
+/*
+ * xen/arch/arm/arm64/debug-imx8qm.inc
+ *
+ * i.MX8QM specific debug code
+ *
+ * Peng Fan <peng.fan@nxp.com>
+ * Copyright (C) 2016 Freescale Inc.
+ *
+ * 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/imx-lpuart.h>
+
+.macro early_uart_init wb wc wd
+/* Already initialized in bootloader */
+.endm
+
+/*
+ * 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] 7+ messages in thread
* RE: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
2022-04-02 5:42 ` [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
@ 2022-04-02 6:39 ` Henry Wang
2022-04-06 7:24 ` Michal Orzel
1 sibling, 0 replies; 7+ messages in thread
From: Henry Wang @ 2022-04-02 6:39 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
Hi Peng,
> -----Original Message-----
> From: Xen-devel <xen-devel-bounces@lists.xenproject.org> On Behalf Of
> Peng Fan (OSS)
> Sent: Saturday, April 2, 2022 1:42 PM
> To: sstabellini@kernel.org; julien@xen.org; Volodymyr_Babchuk@epam.com;
> Bertrand Marquis <Bertrand.Marquis@arm.com>
> Cc: andrew.cooper3@citrix.com; george.dunlap@citrix.com;
> jbeulich@suse.com; wl@xen.org; xen-devel@lists.xenproject.org;
> van.freenix@gmail.com; Peng Fan <peng.fan@nxp.com>
> Subject: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
>
> 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)
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
For the whole series of patch, I tested that the series will not break
current arm64 boot of Xen with and without the CONFIG_HAS_IMX_LPUART.
Unfortunately I cannot test the functionality as I do not have the board :))
So, for this series:
Tested-by: Henry Wang <Henry.Wang@arm.com>
> ---
> xen/drivers/char/Kconfig | 8 +
> xen/drivers/char/Makefile | 1 +
> xen/drivers/char/imx-lpuart.c | 275
> ++++++++++++++++++++++++++++++++++
> xen/include/xen/imx-lpuart.h | 64 ++++++++
> 4 files changed, 348 insertions(+)
> create mode 100644 xen/drivers/char/imx-lpuart.c
> create mode 100644 xen/include/xen/imx-lpuart.h
>
> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
> index 2ff5b288e2..0efdb2128f 100644
> --- a/xen/drivers/char/Kconfig
> +++ b/xen/drivers/char/Kconfig
> @@ -13,6 +13,14 @@ 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 a 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..49330fd2f8
> --- /dev/null
> +++ b/xen/drivers/char/imx-lpuart.c
> @@ -0,0 +1,275 @@
> +/*
> + * 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/imx-lpuart.h>
> +#include <xen/init.h>
> +#include <xen/irq.h>
> +#include <xen/mm.h>
> +#include <xen/serial.h>
> +#include <asm/device.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;
> +
> + ctrl = 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"),
> + {},
> +};
> +
> +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:
> + */
> diff --git a/xen/include/xen/imx-lpuart.h b/xen/include/xen/imx-lpuart.h
> new file mode 100644
> index 0000000000..945ab1c4fa
> --- /dev/null
> +++ b/xen/include/xen/imx-lpuart.h
> @@ -0,0 +1,64 @@
> +/*
> + * xen/include/asm-arm/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 (1 << 23)
> +#define UARTSTAT_TC (1 << 22)
> +#define UARTSTAT_RDRF (1 << 21)
> +#define UARTSTAT_OR (1 << 19)
> +
> +#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 (1 << 23)
> +#define UARTCTRL_TCIE (1 << 22)
> +#define UARTCTRL_RIE (1 << 21)
> +#define UARTCTRL_ILIE (1 << 20)
> +#define UARTCTRL_TE (1 << 19)
> +#define UARTCTRL_RE (1 << 18)
> +#define UARTCTRL_M (1 << 4)
> +
> +#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:
> + */
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
2022-04-02 5:42 ` [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-02 6:39 ` Henry Wang
@ 2022-04-06 7:24 ` Michal Orzel
2022-04-06 7:39 ` Peng Fan
1 sibling, 1 reply; 7+ messages in thread
From: Michal Orzel @ 2022-04-06 7:24 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
Hi Peng,
On 02.04.2022 07:42, 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)
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> xen/drivers/char/Kconfig | 8 +
> xen/drivers/char/Makefile | 1 +
> xen/drivers/char/imx-lpuart.c | 275 ++++++++++++++++++++++++++++++++++
> xen/include/xen/imx-lpuart.h | 64 ++++++++
> 4 files changed, 348 insertions(+)
> create mode 100644 xen/drivers/char/imx-lpuart.c
> create mode 100644 xen/include/xen/imx-lpuart.h
>
> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
> index 2ff5b288e2..0efdb2128f 100644
> --- a/xen/drivers/char/Kconfig
> +++ b/xen/drivers/char/Kconfig
> @@ -13,6 +13,14 @@ 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 a i.MX8QM based board,
> + say Y.
Why did you move "say Y" to the next line?
> +
> 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..49330fd2f8
> --- /dev/null
> +++ b/xen/drivers/char/imx-lpuart.c
> @@ -0,0 +1,275 @@
> +/*
> + * 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/imx-lpuart.h>
> +#include <xen/init.h>
> +#include <xen/irq.h>
> +#include <xen/mm.h>
> +#include <xen/serial.h>
> +#include <asm/device.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;
> +
> + ctrl = old_ctrl = imx_lpuart_read(uart, UARTCTRL);
Please remove ctrl assignment here as you are overriding it in the next line.
> + 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"),
> + {},
To be coherent with the rest of Xen code, please use { /* sentinel */ }
> +};
> +
> +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
> + .dt_match = imx_lpuart_dt_compat,
> + .init = imx_lpuart_init,
> +DT_DEVICE_END
Please add a newline here.
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> diff --git a/xen/include/xen/imx-lpuart.h b/xen/include/xen/imx-lpuart.h
> new file mode 100644
> index 0000000000..945ab1c4fa
> --- /dev/null
> +++ b/xen/include/xen/imx-lpuart.h
> @@ -0,0 +1,64 @@
> +/*
> + * xen/include/asm-arm/imx-lpuart.h
Wrong path as you put this header in xen/include/xen.
> + *
> + * 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
Wrong macro as you are not in arm/include/asm.
> +#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 (1 << 23)
> +#define UARTSTAT_TC (1 << 22)
> +#define UARTSTAT_RDRF (1 << 21)
> +#define UARTSTAT_OR (1 << 19)
> +
> +#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 (1 << 23)
> +#define UARTCTRL_TCIE (1 << 22)
> +#define UARTCTRL_RIE (1 << 21)
> +#define UARTCTRL_ILIE (1 << 20)
> +#define UARTCTRL_TE (1 << 19)
> +#define UARTCTRL_RE (1 << 18)
> +#define UARTCTRL_M (1 << 4)
> +
> +#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:
> + */
I think you should put this header in xen/arch/arm/include/asm/ as it is arm related header.
Cheers,
Michal
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
2022-04-06 7:24 ` Michal Orzel
@ 2022-04-06 7:39 ` Peng Fan
2022-04-06 7:53 ` Michal Orzel
0 siblings, 1 reply; 7+ messages in thread
From: Peng Fan @ 2022-04-06 7:39 UTC (permalink / raw)
To: Michal Orzel, Peng Fan (OSS),
sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel, van.freenix
> Subject: Re: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
>
> Hi Peng,
>
> On 02.04.2022 07:42, 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=0
> 4%7C01%7Cp
> >
> eng.fan%40nxp.com%7Cc7d221ce800342bbd7c108da179e72ca%7C686ea1d
> 3bc2b4c6
> >
> fa92cd99c5c301635%7C0%7C1%7C637848266543058498%7CUnknown%7C
> TWFpbGZsb3d
> >
> 8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%
> 3D%7C
> >
> 3000&sdata=3CV%2FoJViSFzqRby0h577SiusHRQnC8KiXscntQW%2BZOs
> %3D&
> > reserved=0 Chatper 13.6 Low Power Universal Asynchronous Receiver/
> > Transmitter (LPUART)
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > xen/drivers/char/Kconfig | 8 +
> > xen/drivers/char/Makefile | 1 +
> > xen/drivers/char/imx-lpuart.c | 275
> > ++++++++++++++++++++++++++++++++++
> > xen/include/xen/imx-lpuart.h | 64 ++++++++
> > 4 files changed, 348 insertions(+)
> > create mode 100644 xen/drivers/char/imx-lpuart.c create mode
> 100644
> > xen/include/xen/imx-lpuart.h
> >
> > diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index
> > 2ff5b288e2..0efdb2128f 100644
> > --- a/xen/drivers/char/Kconfig
> > +++ b/xen/drivers/char/Kconfig
> > @@ -13,6 +13,14 @@ 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 a i.MX8QM based board,
> > + say Y.
> Why did you move "say Y" to the next line?
I configured vimrc with " set cc=75,100 ", the "." will be at 80, so I
move "say Y." to next line.
>
> > +
> > 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..49330fd2f8
> > --- /dev/null
> > +++ b/xen/drivers/char/imx-lpuart.c
> > @@ -0,0 +1,275 @@
> > +/*
> > + * 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/imx-lpuart.h>
> > +#include <xen/init.h>
> > +#include <xen/irq.h>
> > +#include <xen/mm.h>
> > +#include <xen/serial.h>
> > +#include <asm/device.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;
> > +
> > + ctrl = old_ctrl = imx_lpuart_read(uart, UARTCTRL);
> Please remove ctrl assignment here as you are overriding it in the next line.
>
> > + 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"),
> > + {},
> To be coherent with the rest of Xen code, please use { /* sentinel */ }
Fix in V3.
>
> > +};
> > +
> > +DT_DEVICE_START(imx_lpuart, "i.MX LPUART", DEVICE_SERIAL)
> > + .dt_match = imx_lpuart_dt_compat,
> > + .init = imx_lpuart_init,
> > +DT_DEVICE_END
> Please add a newline here.
Fix in V3.
>
> > +/*
> > + * Local variables:
> > + * mode: C
> > + * c-file-style: "BSD"
> > + * c-basic-offset: 4
> > + * indent-tabs-mode: nil
> > + * End:
> > + */
> > diff --git a/xen/include/xen/imx-lpuart.h
> > b/xen/include/xen/imx-lpuart.h new file mode 100644 index
> > 0000000000..945ab1c4fa
> > --- /dev/null
> > +++ b/xen/include/xen/imx-lpuart.h
> > @@ -0,0 +1,64 @@
> > +/*
> > + * xen/include/asm-arm/imx-lpuart.h
> Wrong path as you put this header in xen/include/xen.
As you suggested below, I need put this header under
xen/arch/arm/include/asm/
>
> > + *
> > + * 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
> Wrong macro as you are not in arm/include/asm.
>
> > +#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 (1 << 23)
> > +#define UARTSTAT_TC (1 << 22)
> > +#define UARTSTAT_RDRF (1 << 21)
> > +#define UARTSTAT_OR (1 << 19)
> > +
> > +#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 (1 << 23)
> > +#define UARTCTRL_TCIE (1 << 22)
> > +#define UARTCTRL_RIE (1 << 21)
> > +#define UARTCTRL_ILIE (1 << 20)
> > +#define UARTCTRL_TE (1 << 19)
> > +#define UARTCTRL_RE (1 << 18)
> > +#define UARTCTRL_M (1 << 4)
> > +
> > +#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:
> > + */
>
> I think you should put this header in xen/arch/arm/include/asm/ as it is arm
> related header.
Yes.
Thanks,
Peng.
>
> Cheers,
> Michal
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
2022-04-06 7:39 ` Peng Fan
@ 2022-04-06 7:53 ` Michal Orzel
0 siblings, 0 replies; 7+ messages in thread
From: Michal Orzel @ 2022-04-06 7:53 UTC (permalink / raw)
To: Peng Fan, Peng Fan (OSS),
sstabellini, julien, Volodymyr_Babchuk, bertrand.marquis
Cc: andrew.cooper3, george.dunlap, jbeulich, wl, xen-devel, van.freenix
On 06.04.2022 09:39, Peng Fan wrote:
>> Subject: Re: [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver
>>
>> Hi Peng,
>>
>> On 02.04.2022 07:42, 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=0
>> 4%7C01%7Cp
>>>
>> eng.fan%40nxp.com%7Cc7d221ce800342bbd7c108da179e72ca%7C686ea1d
>> 3bc2b4c6
>>>
>> fa92cd99c5c301635%7C0%7C1%7C637848266543058498%7CUnknown%7C
>> TWFpbGZsb3d
>>>
>> 8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%
>> 3D%7C
>>>
>> 3000&sdata=3CV%2FoJViSFzqRby0h577SiusHRQnC8KiXscntQW%2BZOs
>> %3D&
>>> reserved=0 Chatper 13.6 Low Power Universal Asynchronous Receiver/
>>> Transmitter (LPUART)
>>>
>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>> ---
>>> xen/drivers/char/Kconfig | 8 +
>>> xen/drivers/char/Makefile | 1 +
>>> xen/drivers/char/imx-lpuart.c | 275
>>> ++++++++++++++++++++++++++++++++++
>>> xen/include/xen/imx-lpuart.h | 64 ++++++++
>>> 4 files changed, 348 insertions(+)
>>> create mode 100644 xen/drivers/char/imx-lpuart.c create mode
>> 100644
>>> xen/include/xen/imx-lpuart.h
>>>
>>> diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index
>>> 2ff5b288e2..0efdb2128f 100644
>>> --- a/xen/drivers/char/Kconfig
>>> +++ b/xen/drivers/char/Kconfig
>>> @@ -13,6 +13,14 @@ 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 a i.MX8QM based board,
>>> + say Y.
>> Why did you move "say Y" to the next line?
>
> I configured vimrc with " set cc=75,100 ", the "." will be at 80, so I
> move "say Y." to next line.
>
It won't be at 80 but at 77 which is less than 80 (required by CODING_STYLE)
unless you found a requirement to split lines in Kconfig files at 75.
Cheers,
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-06 7:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-02 5:42 [PATCH V2 0/2] xen/arm: add i.MX lpuart and i.MX8QM initial support Peng Fan (OSS)
2022-04-02 5:42 ` [PATCH V2 1/2] xen/arm: Add i.MX lpuart driver Peng Fan (OSS)
2022-04-02 6:39 ` Henry Wang
2022-04-06 7:24 ` Michal Orzel
2022-04-06 7:39 ` Peng Fan
2022-04-06 7:53 ` Michal Orzel
2022-04-02 5:42 ` [PATCH V2 2/2] xen/arm: Add i.MX lpuart early printk support Peng Fan (OSS)
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.