2020-08-30 20:06:24

by Alain Volmat

[permalink] [raw]
Subject: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

This serie update the STi Platform LL_UART code to rely on
DEBUG_UART_PHYS & DEBUG_UART_VIRT and add the STiH418 SoC support.

Alain Volmat (2):
arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
arm: sti LL_UART: add STiH418 SBC UART0 support

arch/arm/Kconfig.debug | 38 +++++++++++++++++++++++++-----------
arch/arm/include/debug/sti.S | 26 ++----------------------
2 files changed, 29 insertions(+), 35 deletions(-)

v2: rebased on top of linux 5.9-rc2



2020-08-30 20:07:24

by Alain Volmat

[permalink] [raw]
Subject: [PATCH v2 2/2] arm: sti LL_UART: add STiH418 SBC UART0 support

Add the entry for the STiH418 SBC UART0 low level uart.

Signed-off-by: Alain Volmat <[email protected]>
---
arch/arm/Kconfig.debug | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index e97d6e5c8898..447d177fcf8d 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1204,6 +1204,16 @@ choice

If unsure, say N.

+ config DEBUG_STIH418_SBC_ASC0
+ bool "Use StiH418 SBC ASC0 UART for low-level debug"
+ depends on ARCH_STI
+ help
+ Say Y here if you want kernel low-level debugging support
+ on STiH418 based platforms which has default UART wired
+ up to SBC ASC0.
+
+ If unsure, say N.
+
config STM32F4_DEBUG_UART
bool "Use STM32F4 UART for low-level debug"
depends on MACH_STM32F429 || MACH_STM32F469
@@ -1587,6 +1597,7 @@ config DEBUG_LL_INCLUDE
default "debug/sirf.S" if DEBUG_SIRFSOC_UART
default "debug/sti.S" if DEBUG_STIH41X_ASC2
default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
+ default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
default "debug/stm32.S" if DEBUG_STM32_UART
default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/ux500.S" if DEBUG_UX500_UART
@@ -1620,6 +1631,7 @@ config DEBUG_UART_PHYS
default 0x03010fe0 if ARCH_RPC
default 0x07000000 if DEBUG_SUN9I_UART0
default 0x09405000 if DEBUG_ZTE_ZX
+ default 0x09530000 if DEBUG_STIH418_SBC_ASC0
default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
DEBUG_VEXPRESS_UART0_CA9
default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@ -1750,7 +1762,8 @@ config DEBUG_UART_PHYS
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
DEBUG_AT91_UART || DEBUG_STM32_UART || \
- DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
+ DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
+ DEBUG_STIH418_SBC_ASC0

config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
@@ -1796,6 +1809,7 @@ config DEBUG_UART_VIRT
default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU
default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU
+ default 0xf9530000 if DEBUG_STIH418_SBC_ASC0
default 0xf9e09000 if DEBUG_AM33XXUART1
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
default 0xfa022000 if DEBUG_TI81XXUART2
@@ -1864,7 +1878,8 @@ config DEBUG_UART_VIRT
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
DEBUG_AT91_UART || DEBUG_STM32_UART || \
- DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
+ DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
+ DEBUG_STIH418_SBC_ASC0

config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"
--
2.17.1

2020-08-30 20:11:03

by Alain Volmat

[permalink] [raw]
Subject: [PATCH v2 1/2] arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART

Update the sti platform LL_UART support to rely on
CONFIG_DEBUG_UART_PHYS and CONFIG_DEBUG_UART_VIRT from Kconfig

Signed-off-by: Alain Volmat <[email protected]>
---
arch/arm/Kconfig.debug | 23 ++++++++++++-----------
arch/arm/include/debug/sti.S | 26 ++------------------------
2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 80000a66a4e3..e97d6e5c8898 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1184,10 +1184,9 @@ choice
Say Y here if you want kernel low-level debugging support
on ST SPEAr13xx based platforms.

- config STIH41X_DEBUG_ASC2
+ config DEBUG_STIH41X_ASC2
bool "Use StiH415/416 ASC2 UART for low-level debug"
depends on ARCH_STI
- select DEBUG_STI_UART
help
Say Y here if you want kernel low-level debugging support
on STiH415/416 based platforms like b2000, which has
@@ -1195,10 +1194,9 @@ choice

If unsure, say N.

- config STIH41X_DEBUG_SBC_ASC1
+ config DEBUG_STIH41X_SBC_ASC1
bool "Use StiH415/416 SBC ASC1 UART for low-level debug"
depends on ARCH_STI
- select DEBUG_STI_UART
help
Say Y here if you want kernel low-level debugging support
on STiH415/416 based platforms like b2020. which has
@@ -1534,10 +1532,6 @@ config DEBUG_TEGRA_UART
bool
depends on ARCH_TEGRA

-config DEBUG_STI_UART
- bool
- depends on ARCH_STI
-
config DEBUG_STM32_UART
bool
depends on ARCH_STM32
@@ -1591,7 +1585,8 @@ config DEBUG_LL_INCLUDE
default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
default "debug/s5pv210.S" if DEBUG_S5PV210_UART
default "debug/sirf.S" if DEBUG_SIRFSOC_UART
- default "debug/sti.S" if DEBUG_STI_UART
+ default "debug/sti.S" if DEBUG_STIH41X_ASC2
+ default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
default "debug/stm32.S" if DEBUG_STM32_UART
default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/ux500.S" if DEBUG_UX500_UART
@@ -1723,7 +1718,9 @@ config DEBUG_UART_PHYS
default 0xfc00c000 if DEBUG_AT91_SAMA5D4_USART3
default 0xfcb00000 if DEBUG_HI3620_UART
default 0xfd883000 if DEBUG_ALPINE_UART0
+ default 0xfe531000 if DEBUG_STIH41X_SBC_ASC1
default 0xfe800000 if ARCH_IOP32X
+ default 0xfed32000 if DEBUG_STIH41X_ASC2
default 0xff690000 if DEBUG_RK32_UART2
default 0xffc02000 if DEBUG_SOCFPGA_UART0
default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1
@@ -1752,7 +1749,8 @@ config DEBUG_UART_PHYS
DEBUG_S3C64XX_UART || \
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
- DEBUG_AT91_UART || DEBUG_STM32_UART
+ DEBUG_AT91_UART || DEBUG_STM32_UART || \
+ DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1

config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
@@ -1817,7 +1815,9 @@ config DEBUG_UART_VIRT
default 0xfc705000 if DEBUG_ZTE_ZX
default 0xfcfe8600 if DEBUG_BCM63XX_UART
default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
+ default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
default 0xfd883000 if DEBUG_ALPINE_UART0
+ default 0xfdd32000 if DEBUG_STIH41X_ASC2
default 0xfe010000 if STM32MP1_DEBUG_UART
default 0xfe017000 if DEBUG_MMP_UART2
default 0xfe018000 if DEBUG_MMP_UART3
@@ -1863,7 +1863,8 @@ config DEBUG_UART_VIRT
DEBUG_S3C64XX_UART || \
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
- DEBUG_AT91_UART || DEBUG_STM32_UART
+ DEBUG_AT91_UART || DEBUG_STM32_UART || \
+ DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1

config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"
diff --git a/arch/arm/include/debug/sti.S b/arch/arm/include/debug/sti.S
index 6b42c91f217d..a903a60b81c6 100644
--- a/arch/arm/include/debug/sti.S
+++ b/arch/arm/include/debug/sti.S
@@ -6,28 +6,6 @@
* Copyright (C) 2013 STMicroelectronics (R&D) Limited.
*/

-#define STIH41X_COMMS_BASE 0xfed00000
-#define STIH41X_ASC2_BASE (STIH41X_COMMS_BASE+0x32000)
-
-#define STIH41X_SBC_LPM_BASE 0xfe400000
-#define STIH41X_SBC_COMMS_BASE (STIH41X_SBC_LPM_BASE + 0x100000)
-#define STIH41X_SBC_ASC1_BASE (STIH41X_SBC_COMMS_BASE + 0x31000)
-
-
-#define VIRT_ADDRESS(x) (x - 0x1000000)
-
-#if IS_ENABLED(CONFIG_STIH41X_DEBUG_ASC2)
-#define DEBUG_LL_UART_BASE STIH41X_ASC2_BASE
-#endif
-
-#if IS_ENABLED(CONFIG_STIH41X_DEBUG_SBC_ASC1)
-#define DEBUG_LL_UART_BASE STIH41X_SBC_ASC1_BASE
-#endif
-
-#ifndef DEBUG_LL_UART_BASE
-#error "DEBUG UART is not Configured"
-#endif
-
#define ASC_TX_BUF_OFF 0x04
#define ASC_CTRL_OFF 0x0c
#define ASC_STA_OFF 0x14
@@ -37,8 +15,8 @@


.macro addruart, rp, rv, tmp
- ldr \rp, =DEBUG_LL_UART_BASE @ physical base
- ldr \rv, =VIRT_ADDRESS(DEBUG_LL_UART_BASE) @ virt base
+ ldr \rp, =CONFIG_DEBUG_UART_PHYS @ physical base
+ ldr \rv, =CONFIG_DEBUG_UART_VIRT @ virt base
.endm

.macro senduart,rd,rx
--
2.17.1

2020-09-12 10:15:23

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

On Sun, Aug 30, 2020 at 9:58 PM Alain Volmat <[email protected]> wrote:

> This serie update the STi Platform LL_UART code to rely on
> DEBUG_UART_PHYS & DEBUG_UART_VIRT and add the STiH418 SoC support.
>
> Alain Volmat (2):
> arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
> arm: sti LL_UART: add STiH418 SBC UART0 support

Both patches looks good to me:
Reviewed-by: Linus Walleij <[email protected]>

I made some patches to the debug UARTs that are pending in Russell's
patch tracker:
https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9004/1
https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9005/1
https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9006/1

It doesn't look like these will conflict with your patches but please take
a look just to make sure.

Yours,
Linus Walleij

2020-09-18 20:37:20

by Alain Volmat

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

Hi Linus

On Sat, Sep 12, 2020 at 12:13:59PM +0200, Linus Walleij wrote:
> On Sun, Aug 30, 2020 at 9:58 PM Alain Volmat <[email protected]> wrote:
>
> > This serie update the STi Platform LL_UART code to rely on
> > DEBUG_UART_PHYS & DEBUG_UART_VIRT and add the STiH418 SoC support.
> >
> > Alain Volmat (2):
> > arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
> > arm: sti LL_UART: add STiH418 SBC UART0 support
>
> Both patches looks good to me:
> Reviewed-by: Linus Walleij <[email protected]>
>
> I made some patches to the debug UARTs that are pending in Russell's
> patch tracker:
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9004/1
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9005/1
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9006/1
>
> It doesn't look like these will conflict with your patches but please take
> a look just to make sure.

I confirm that they do not conflict with my two patches.

Alain

>
> Yours,
> Linus Walleij

2020-10-06 05:06:01

by Alain Volmat

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

Hi Russell,

Could you have a look a those two patches for the STi platform ?

Regards,
Alain

On Sat, Sep 12, 2020 at 12:13:59PM +0200, Linus Walleij wrote:
> On Sun, Aug 30, 2020 at 9:58 PM Alain Volmat <[email protected]> wrote:
>
> > This serie update the STi Platform LL_UART code to rely on
> > DEBUG_UART_PHYS & DEBUG_UART_VIRT and add the STiH418 SoC support.
> >
> > Alain Volmat (2):
> > arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
> > arm: sti LL_UART: add STiH418 SBC UART0 support
>
> Both patches looks good to me:
> Reviewed-by: Linus Walleij <[email protected]>
>
> I made some patches to the debug UARTs that are pending in Russell's
> patch tracker:
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9004/1
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9005/1
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9006/1
>
> It doesn't look like these will conflict with your patches but please take
> a look just to make sure.
>
> Yours,
> Linus Walleij

2020-10-06 07:10:18

by Patrice CHOTARD

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] arm: sti LL_UART: add STiH418 SBC UART0 support

Hi Alain

On 8/30/20 9:57 PM, Alain Volmat wrote:
> Add the entry for the STiH418 SBC UART0 low level uart.
>
> Signed-off-by: Alain Volmat <[email protected]>
> ---
> arch/arm/Kconfig.debug | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index e97d6e5c8898..447d177fcf8d 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -1204,6 +1204,16 @@ choice
>
> If unsure, say N.
>
> + config DEBUG_STIH418_SBC_ASC0
> + bool "Use StiH418 SBC ASC0 UART for low-level debug"
> + depends on ARCH_STI
> + help
> + Say Y here if you want kernel low-level debugging support
> + on STiH418 based platforms which has default UART wired
> + up to SBC ASC0.
> +
> + If unsure, say N.
> +
> config STM32F4_DEBUG_UART
> bool "Use STM32F4 UART for low-level debug"
> depends on MACH_STM32F429 || MACH_STM32F469
> @@ -1587,6 +1597,7 @@ config DEBUG_LL_INCLUDE
> default "debug/sirf.S" if DEBUG_SIRFSOC_UART
> default "debug/sti.S" if DEBUG_STIH41X_ASC2
> default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
> + default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
> default "debug/stm32.S" if DEBUG_STM32_UART
> default "debug/tegra.S" if DEBUG_TEGRA_UART
> default "debug/ux500.S" if DEBUG_UX500_UART
> @@ -1620,6 +1631,7 @@ config DEBUG_UART_PHYS
> default 0x03010fe0 if ARCH_RPC
> default 0x07000000 if DEBUG_SUN9I_UART0
> default 0x09405000 if DEBUG_ZTE_ZX
> + default 0x09530000 if DEBUG_STIH418_SBC_ASC0
> default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
> DEBUG_VEXPRESS_UART0_CA9
> default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
> @@ -1750,7 +1762,8 @@ config DEBUG_UART_PHYS
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> DEBUG_AT91_UART || DEBUG_STM32_UART || \
> - DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
> + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> + DEBUG_STIH418_SBC_ASC0
>
> config DEBUG_UART_VIRT
> hex "Virtual base address of debug UART"
> @@ -1796,6 +1809,7 @@ config DEBUG_UART_VIRT
> default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
> default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU
> default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU
> + default 0xf9530000 if DEBUG_STIH418_SBC_ASC0
> default 0xf9e09000 if DEBUG_AM33XXUART1
> default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
> default 0xfa022000 if DEBUG_TI81XXUART2
> @@ -1864,7 +1878,8 @@ config DEBUG_UART_VIRT
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> DEBUG_AT91_UART || DEBUG_STM32_UART || \
> - DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
> + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> + DEBUG_STIH418_SBC_ASC0
>
> config DEBUG_UART_8250_SHIFT
> int "Register offset shift for the 8250 debug UART"

Reviewed-by: Patrice Chotard <[email protected]>

Thanks

Patrice

2020-10-06 07:12:49

by Patrice CHOTARD

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART

Hi Alain

On 8/30/20 9:57 PM, Alain Volmat wrote:
> Update the sti platform LL_UART support to rely on
> CONFIG_DEBUG_UART_PHYS and CONFIG_DEBUG_UART_VIRT from Kconfig
>
> Signed-off-by: Alain Volmat <[email protected]>
> ---
> arch/arm/Kconfig.debug | 23 ++++++++++++-----------
> arch/arm/include/debug/sti.S | 26 ++------------------------
> 2 files changed, 14 insertions(+), 35 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 80000a66a4e3..e97d6e5c8898 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -1184,10 +1184,9 @@ choice
> Say Y here if you want kernel low-level debugging support
> on ST SPEAr13xx based platforms.
>
> - config STIH41X_DEBUG_ASC2
> + config DEBUG_STIH41X_ASC2
> bool "Use StiH415/416 ASC2 UART for low-level debug"
> depends on ARCH_STI
> - select DEBUG_STI_UART
> help
> Say Y here if you want kernel low-level debugging support
> on STiH415/416 based platforms like b2000, which has
> @@ -1195,10 +1194,9 @@ choice
>
> If unsure, say N.
>
> - config STIH41X_DEBUG_SBC_ASC1
> + config DEBUG_STIH41X_SBC_ASC1
> bool "Use StiH415/416 SBC ASC1 UART for low-level debug"
> depends on ARCH_STI
> - select DEBUG_STI_UART
> help
> Say Y here if you want kernel low-level debugging support
> on STiH415/416 based platforms like b2020. which has
> @@ -1534,10 +1532,6 @@ config DEBUG_TEGRA_UART
> bool
> depends on ARCH_TEGRA
>
> -config DEBUG_STI_UART
> - bool
> - depends on ARCH_STI
> -
> config DEBUG_STM32_UART
> bool
> depends on ARCH_STM32
> @@ -1591,7 +1585,8 @@ config DEBUG_LL_INCLUDE
> default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
> default "debug/s5pv210.S" if DEBUG_S5PV210_UART
> default "debug/sirf.S" if DEBUG_SIRFSOC_UART
> - default "debug/sti.S" if DEBUG_STI_UART
> + default "debug/sti.S" if DEBUG_STIH41X_ASC2
> + default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
> default "debug/stm32.S" if DEBUG_STM32_UART
> default "debug/tegra.S" if DEBUG_TEGRA_UART
> default "debug/ux500.S" if DEBUG_UX500_UART
> @@ -1723,7 +1718,9 @@ config DEBUG_UART_PHYS
> default 0xfc00c000 if DEBUG_AT91_SAMA5D4_USART3
> default 0xfcb00000 if DEBUG_HI3620_UART
> default 0xfd883000 if DEBUG_ALPINE_UART0
> + default 0xfe531000 if DEBUG_STIH41X_SBC_ASC1
> default 0xfe800000 if ARCH_IOP32X
> + default 0xfed32000 if DEBUG_STIH41X_ASC2
> default 0xff690000 if DEBUG_RK32_UART2
> default 0xffc02000 if DEBUG_SOCFPGA_UART0
> default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1
> @@ -1752,7 +1749,8 @@ config DEBUG_UART_PHYS
> DEBUG_S3C64XX_UART || \
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> - DEBUG_AT91_UART || DEBUG_STM32_UART
> + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
>
> config DEBUG_UART_VIRT
> hex "Virtual base address of debug UART"
> @@ -1817,7 +1815,9 @@ config DEBUG_UART_VIRT
> default 0xfc705000 if DEBUG_ZTE_ZX
> default 0xfcfe8600 if DEBUG_BCM63XX_UART
> default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
> + default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
> default 0xfd883000 if DEBUG_ALPINE_UART0
> + default 0xfdd32000 if DEBUG_STIH41X_ASC2
> default 0xfe010000 if STM32MP1_DEBUG_UART
> default 0xfe017000 if DEBUG_MMP_UART2
> default 0xfe018000 if DEBUG_MMP_UART3
> @@ -1863,7 +1863,8 @@ config DEBUG_UART_VIRT
> DEBUG_S3C64XX_UART || \
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> - DEBUG_AT91_UART || DEBUG_STM32_UART
> + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1
>
> config DEBUG_UART_8250_SHIFT
> int "Register offset shift for the 8250 debug UART"
> diff --git a/arch/arm/include/debug/sti.S b/arch/arm/include/debug/sti.S
> index 6b42c91f217d..a903a60b81c6 100644
> --- a/arch/arm/include/debug/sti.S
> +++ b/arch/arm/include/debug/sti.S
> @@ -6,28 +6,6 @@
> * Copyright (C) 2013 STMicroelectronics (R&D) Limited.
> */
>
> -#define STIH41X_COMMS_BASE 0xfed00000
> -#define STIH41X_ASC2_BASE (STIH41X_COMMS_BASE+0x32000)
> -
> -#define STIH41X_SBC_LPM_BASE 0xfe400000
> -#define STIH41X_SBC_COMMS_BASE (STIH41X_SBC_LPM_BASE + 0x100000)
> -#define STIH41X_SBC_ASC1_BASE (STIH41X_SBC_COMMS_BASE + 0x31000)
> -
> -
> -#define VIRT_ADDRESS(x) (x - 0x1000000)
> -
> -#if IS_ENABLED(CONFIG_STIH41X_DEBUG_ASC2)
> -#define DEBUG_LL_UART_BASE STIH41X_ASC2_BASE
> -#endif
> -
> -#if IS_ENABLED(CONFIG_STIH41X_DEBUG_SBC_ASC1)
> -#define DEBUG_LL_UART_BASE STIH41X_SBC_ASC1_BASE
> -#endif
> -
> -#ifndef DEBUG_LL_UART_BASE
> -#error "DEBUG UART is not Configured"
> -#endif
> -
> #define ASC_TX_BUF_OFF 0x04
> #define ASC_CTRL_OFF 0x0c
> #define ASC_STA_OFF 0x14
> @@ -37,8 +15,8 @@
>
>
> .macro addruart, rp, rv, tmp
> - ldr \rp, =DEBUG_LL_UART_BASE @ physical base
> - ldr \rv, =VIRT_ADDRESS(DEBUG_LL_UART_BASE) @ virt base
> + ldr \rp, =CONFIG_DEBUG_UART_PHYS @ physical base
> + ldr \rv, =CONFIG_DEBUG_UART_VIRT @ virt base
> .endm
>
> .macro senduart,rd,rx

Reviewed-by: Patrice Chotard <[email protected]>

Thanks

Patrice

2020-10-06 08:31:20

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

On Tue, Oct 6, 2020 at 7:04 AM Alain Volmat <[email protected]> wrote:

> Hi Russell,
>
> Could you have a look a those two patches for the STi platform ?

I don't think there is much to say about those patches they are
straight-forward.

I would just put them into Russell's patch tracker. I think the
SoC tree also takes patches of this type for a specific SoC
at times.

Yours,
Linus Walleij

2020-11-19 08:12:32

by Patrice CHOTARD

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

Hi Russell

Is there any reason for this series not being merged ?

Thanks

Patrice


On 8/30/20 9:57 PM, Alain Volmat wrote:
> This serie update the STi Platform LL_UART code to rely on
> DEBUG_UART_PHYS & DEBUG_UART_VIRT and add the STiH418 SoC support.
>
> Alain Volmat (2):
> arm: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
> arm: sti LL_UART: add STiH418 SBC UART0 support
>
> arch/arm/Kconfig.debug | 38 +++++++++++++++++++++++++-----------
> arch/arm/include/debug/sti.S | 26 ++----------------------
> 2 files changed, 29 insertions(+), 35 deletions(-)
>
> v2: rebased on top of linux 5.9-rc2
>
>

2020-11-19 08:28:51

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

On Thu, Nov 19, 2020 at 9:08 AM Patrice CHOTARD <[email protected]> wrote:

> Is there any reason for this series not being merged ?

Did you put them into Russell's patch tracker as I asked?
I haven't seen them there.
https://www.armlinux.org.uk/developer/patches/

Yours,
Linus Walleij

2020-11-19 09:59:33

by Patrice CHOTARD

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

Hi Linus

On 11/19/20 9:26 AM, Linus Walleij wrote:
> On Thu, Nov 19, 2020 at 9:08 AM Patrice CHOTARD <[email protected]> wrote:
>
>> Is there any reason for this series not being merged ?
> Did you put them into Russell's patch tracker as I asked?
> I haven't seen them there.
> https://www.armlinux.org.uk/developer/patches/

No i haven't put them into patch tracker, my bad.

I will register to it and add this series.

Thanks for the tip Linus.

Patrice


>
> Yours,
> Linus Walleij

2020-11-19 10:27:04

by Patrice CHOTARD

[permalink] [raw]
Subject: Re: [PATCH v2 0/2] arm: sti: LL_UART updates & STiH418 addition

After discussion with Alain, he will take care to submit them to Russell's patch tracker.

Thanks

On 11/19/20 10:57 AM, Patrice CHOTARD wrote:
> Hi Linus
>
> On 11/19/20 9:26 AM, Linus Walleij wrote:
>> On Thu, Nov 19, 2020 at 9:08 AM Patrice CHOTARD <[email protected]> wrote:
>>
>>> Is there any reason for this series not being merged ?
>> Did you put them into Russell's patch tracker as I asked?
>> I haven't seen them there.
>> https://www.armlinux.org.uk/developer/patches/
> No i haven't put them into patch tracker, my bad.
>
> I will register to it and add this series.
>
> Thanks for the tip Linus.
>
> Patrice
>
>
>> Yours,
>> Linus Walleij