RE: [PATCH V3 2/2] xen/arm: Add i.MX lpuart early printk support

2022-04-08 Thread Peng Fan 
Hi Michal,

> -Original Message-
> From: Michal Orzel [mailto:michal.or...@arm.com]
> Sent: 2022年4月8日 18:23
> To: Peng Fan (OSS) ; sstabell...@kernel.org;
> jul...@xen.org; volodymyr_babc...@epam.com;
> bertrand.marq...@arm.com
> Cc: andrew.coop...@citrix.com; george.dun...@citrix.com;
> jbeul...@suse.com; w...@xen.org; xen-devel@lists.xenproject.org;
> van.free...@gmail.com; Peng Fan 
> Subject: Re: [PATCH V3 2/2] xen/arm: Add i.MX lpuart early printk support
> 
> Hi Peng,
> 
> On 07.04.2022 04:44, Peng Fan (OSS) wrote:
> > From: Peng Fan 
> >
> > Signed-off-by: Peng Fan 
> > ---
> >  xen/arch/arm/Kconfig.debug  | 14 +++
> >  xen/arch/arm/arm64/debug-imx-lpuart.inc | 52
> +
> >  xen/arch/arm/include/asm/imx-lpuart.h   | 22 +--
> >  3 files changed, 77 insertions(+), 11 deletions(-)  create mode
> > 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
> >
> > diff --git a/xen/arch/arm/include/asm/imx-lpuart.h
> > b/xen/arch/arm/include/asm/imx-lpuart.h
> > index 111640edb4..26e2cf0249 100644
> > --- a/xen/arch/arm/include/asm/imx-lpuart.h
> > +++ b/xen/arch/arm/include/asm/imx-lpuart.h
> > @@ -30,10 +30,10 @@
> >  #define UARTFIFO  (0x28)
> >  #define UARTWATER (0x2c)
> >
> > -#define UARTSTAT_TDRE BIT(23)
> > -#define UARTSTAT_TC   BIT(22)
> > -#define UARTSTAT_RDRF BIT(21)
> > -#define UARTSTAT_OR   BIT(19)
> > +#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)
> > @@ -42,13 +42,13 @@
> >  #define UARTBAUD_TDMAE(0x0080)
> >  #define UARTBAUD_RDMAE(0x0020)
> >
> > -#define UARTCTRL_TIE  BIT(23)
> > -#define UARTCTRL_TCIE BIT(22)
> > -#define UARTCTRL_RIE  BIT(21)
> > -#define UARTCTRL_ILIE BIT(20)
> > -#define UARTCTRL_TE   BIT(19)
> > -#define UARTCTRL_RE   BIT(18)
> > -#define UARTCTRL_MBIT(4)
> > +#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_MBIT(4, UL)
> >
> >  #define UARTWATER_RXCNT_OFF 24
> >
> 
> I find it a bit strange that you fix the header file in the patch 2/2 while 
> patch
> 1/2 introduces it. Could you do these fixes in the patch where you create this
> file?

Oops. I missed to merge that BIT fix into patch 1. Just send out V4.

Thanks,
Peng.

> 
> Cheers,
> Michal

Re: [PATCH V3 2/2] xen/arm: Add i.MX lpuart early printk support

2022-04-08 Thread Michal Orzel 
Hi Peng,

On 07.04.2022 04:44, Peng Fan (OSS) wrote:
> From: Peng Fan 
> 
> Signed-off-by: Peng Fan 
> ---
>  xen/arch/arm/Kconfig.debug  | 14 +++
>  xen/arch/arm/arm64/debug-imx-lpuart.inc | 52 +
>  xen/arch/arm/include/asm/imx-lpuart.h   | 22 +--
>  3 files changed, 77 insertions(+), 11 deletions(-)
>  create mode 100644 xen/arch/arm/arm64/debug-imx-lpuart.inc
> 
> diff --git a/xen/arch/arm/include/asm/imx-lpuart.h 
> b/xen/arch/arm/include/asm/imx-lpuart.h
> index 111640edb4..26e2cf0249 100644
> --- a/xen/arch/arm/include/asm/imx-lpuart.h
> +++ b/xen/arch/arm/include/asm/imx-lpuart.h
> @@ -30,10 +30,10 @@
>  #define UARTFIFO  (0x28)
>  #define UARTWATER (0x2c)
>  
> -#define UARTSTAT_TDRE BIT(23)
> -#define UARTSTAT_TC   BIT(22)
> -#define UARTSTAT_RDRF BIT(21)
> -#define UARTSTAT_OR   BIT(19)
> +#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)
> @@ -42,13 +42,13 @@
>  #define UARTBAUD_TDMAE(0x0080)
>  #define UARTBAUD_RDMAE(0x0020)
>  
> -#define UARTCTRL_TIE  BIT(23)
> -#define UARTCTRL_TCIE BIT(22)
> -#define UARTCTRL_RIE  BIT(21)
> -#define UARTCTRL_ILIE BIT(20)
> -#define UARTCTRL_TE   BIT(19)
> -#define UARTCTRL_RE   BIT(18)
> -#define UARTCTRL_MBIT(4)
> +#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_MBIT(4, UL)
>  
>  #define UARTWATER_RXCNT_OFF 24
>  

I find it a bit strange that you fix the header file in the patch 2/2 while
patch 1/2 introduces it. Could you do these fixes in the patch where you
create this file?

Cheers,
Michal

[PATCH V3 2/2] xen/arm: Add i.MX lpuart early printk support

2022-04-06 Thread Peng Fan (OSS) 
From: Peng Fan 

Signed-off-by: Peng Fan 
---
 xen/arch/arm/Kconfig.debug  | 14 +++
 xen/arch/arm/arm64/debug-imx-lpuart.inc | 52 +
 xen/arch/arm/include/asm/imx-lpuart.h   | 22 +--
 3 files changed, 77 insertions(+), 11 deletions(-)
 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 00..f68252da86
--- /dev/null
+++ b/xen/arch/arm/arm64/debug-imx-lpuart.inc
@@ -0,0 +1,52 @@
+/*
+ * xen/arch/arm/arm64/debug-imx-lpuart.inc
+ *
+ * i.MX8QM specific debug code
+ *
+ * Peng Fan 
+ * 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 
+
+.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:
+ */
diff --git a/xen/arch/arm/include/asm/imx-lpuart.h 
b/xen/arch/arm/include/asm/imx-lpuart.h
index 111640edb4..26e2cf0249 100644
--- a/xen/arch/arm/include/asm/imx-lpuart.h
+++ b/xen/arch/arm/include/asm/imx-lpuart.h
@@ -30,10 +30,10 @@
 #define UARTFIFO  (0x28)
 #define UARTWATER (0x2c)
 
-#define UARTSTAT_TDRE BIT(23)
-#define UARTSTAT_TC   BIT(22)
-#define UARTSTAT_RDRF BIT(21)
-#define UARTSTAT_OR   BIT(19)
+#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)
@@ -42,13 +42,13 @@
 #define UARTBAUD_TDMAE(0x0080)
 #define UARTBAUD_RDMAE(0x0020)
 
-#define UARTCTRL_TIE  BIT(23)
-#define UARTCTRL_TCIE BIT(22)
-#define UARTCTRL_RIE  BIT(21)
-#define UARTCTRL_ILIE BIT(20)
-#define UARTCTRL_TE   BIT(19)
-#define UARTCTRL_RE   BIT(18)
-#define UARTCTRL_MBIT(4)
+#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