* [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets @ 2014-04-09 13:08 Ivan T. Ivanov 2014-04-09 14:00 ` Christopher Covington 0 siblings, 1 reply; 8+ messages in thread From: Ivan T. Ivanov @ 2014-04-09 13:08 UTC (permalink / raw) To: Russell King, David Brown, Daniel Walker Cc: Ivan T. Ivanov, Stephen Boyd, Rohit Vaswani, linux-kernel, linux-arm-msm From: "Ivan T. Ivanov" <iivanov@mm-sol.com> High Speed UART is available also in new multiplatform QCOM targets. This fixes: scripts/kconfig/conf --silentoldconfig Kconfig warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> --- arch/arm/Kconfig.debug | 5 +---- arch/arm/include/debug/msm.S | 7 +++++-- arch/arm/mach-msm/Kconfig | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0bf..a49caf6 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -376,7 +376,6 @@ choice config DEBUG_MSM8660_UART bool "Kernel low-level debugging messages via MSM 8660 UART" depends on ARCH_MSM8X60 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct @@ -385,7 +384,6 @@ choice config DEBUG_MSM8960_UART bool "Kernel low-level debugging messages via MSM 8960 UART" depends on ARCH_MSM8960 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct @@ -394,7 +392,6 @@ choice config DEBUG_MSM8974_UART bool "Kernel low-level debugging messages via MSM 8974 UART" depends on ARCH_MSM8974 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct @@ -1153,7 +1150,7 @@ config DEBUG_UNCOMPRESS When this option is set, the selected DEBUG_LL output method will be re-used for normal decompressor output on multiplatform kernels. - + config UNCOMPRESS_INCLUDE string diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S index 9d653d4..09ff7b7 100644 --- a/arch/arm/include/debug/msm.S +++ b/arch/arm/include/debug/msm.S @@ -39,11 +39,14 @@ #ifdef CONFIG_DEBUG_MSM8660_UART #define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x19C40000 +#define MSM_HAS_DEBUG_UART_HS #endif #ifdef CONFIG_DEBUG_MSM8960_UART +#define MSM_HAS_DEBUG_UART_HS #define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x16440000 +#define MSM_HAS_DEBUG_UART_HS #endif #ifdef CONFIG_DEBUG_MSM8974_UART @@ -59,7 +62,7 @@ .endm .macro senduart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef MSM_HAS_DEBUG_UART_HS @ Write the 1 character to UARTDM_TF str \rd, [\rx, #0x70] #else @@ -68,7 +71,7 @@ .endm .macro waituart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef MSM_HAS_DEBUG_UART_HS @ check for TX_EMT in UARTDM_SR ldr \rd, [\rx, #0x08] tst \rd, #0x08 diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index a7f959e..9b26976 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -42,9 +42,6 @@ config ARCH_QSD8X50 endchoice -config MSM_HAS_DEBUG_UART_HS - bool - config MSM_SOC_REV_A bool -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets 2014-04-09 13:08 [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets Ivan T. Ivanov @ 2014-04-09 14:00 ` Christopher Covington 2014-04-09 14:15 ` Ivan T. Ivanov 2014-04-09 14:26 ` [PATCH v2] " Ivan T. Ivanov 0 siblings, 2 replies; 8+ messages in thread From: Christopher Covington @ 2014-04-09 14:00 UTC (permalink / raw) To: Ivan T. Ivanov Cc: Russell King, David Brown, Daniel Walker, Stephen Boyd, Rohit Vaswani, linux-kernel, linux-arm-msm Hi Ivan, On 04/09/2014 09:08 AM, Ivan T. Ivanov wrote: > From: "Ivan T. Ivanov" <iivanov@mm-sol.com> > > High Speed UART is available also in new multiplatform QCOM targets. > diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S > index 9d653d4..09ff7b7 100644 > --- a/arch/arm/include/debug/msm.S > +++ b/arch/arm/include/debug/msm.S > @@ -39,11 +39,14 @@ > #ifdef CONFIG_DEBUG_MSM8660_UART > #define MSM_DEBUG_UART_BASE 0xF0040000 > #define MSM_DEBUG_UART_PHYS 0x19C40000 > +#define MSM_HAS_DEBUG_UART_HS > #endif > > #ifdef CONFIG_DEBUG_MSM8960_UART > +#define MSM_HAS_DEBUG_UART_HS This appears to be duplicated. > #define MSM_DEBUG_UART_BASE 0xF0040000 > #define MSM_DEBUG_UART_PHYS 0x16440000 > +#define MSM_HAS_DEBUG_UART_HS > #endif > > #ifdef CONFIG_DEBUG_MSM8974_UART Regards, Christopher -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets 2014-04-09 14:00 ` Christopher Covington @ 2014-04-09 14:15 ` Ivan T. Ivanov 2014-04-09 14:26 ` [PATCH v2] " Ivan T. Ivanov 1 sibling, 0 replies; 8+ messages in thread From: Ivan T. Ivanov @ 2014-04-09 14:15 UTC (permalink / raw) To: Christopher Covington Cc: Russell King, David Brown, Daniel Walker, Stephen Boyd, Rohit Vaswani, linux-kernel, linux-arm-msm On Wed, 2014-04-09 at 10:00 -0400, Christopher Covington wrote: > Hi Ivan, > > On 04/09/2014 09:08 AM, Ivan T. Ivanov wrote: > > From: "Ivan T. Ivanov" <iivanov@mm-sol.com> > > > > High Speed UART is available also in new multiplatform QCOM targets. > > > diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S > > index 9d653d4..09ff7b7 100644 > > --- a/arch/arm/include/debug/msm.S > > +++ b/arch/arm/include/debug/msm.S > > @@ -39,11 +39,14 @@ > > #ifdef CONFIG_DEBUG_MSM8660_UART > > #define MSM_DEBUG_UART_BASE 0xF0040000 > > #define MSM_DEBUG_UART_PHYS 0x19C40000 > > +#define MSM_HAS_DEBUG_UART_HS > > #endif > > > > #ifdef CONFIG_DEBUG_MSM8960_UART > > +#define MSM_HAS_DEBUG_UART_HS > > This appears to be duplicated. Ops, right. Will send fixed version. Thanks, Ivan > > > #define MSM_DEBUG_UART_BASE 0xF0040000 > > #define MSM_DEBUG_UART_PHYS 0x16440000 > > +#define MSM_HAS_DEBUG_UART_HS > > #endif > > > > #ifdef CONFIG_DEBUG_MSM8974_UART > > Regards, > Christopher > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets 2014-04-09 14:00 ` Christopher Covington 2014-04-09 14:15 ` Ivan T. Ivanov @ 2014-04-09 14:26 ` Ivan T. Ivanov 2014-04-09 17:44 ` Stephen Boyd 1 sibling, 1 reply; 8+ messages in thread From: Ivan T. Ivanov @ 2014-04-09 14:26 UTC (permalink / raw) To: Russell King, David Brown, Daniel Walker Cc: Ivan T. Ivanov, Stephen Boyd, Rohit Vaswani, Christopher Covington, linux-kernel, linux-arm-msm From: "Ivan T. Ivanov" <iivanov@mm-sol.com> High Speed UART is available also in new multiplatform QCOM targets. This fixes: scripts/kconfig/conf --silentoldconfig Kconfig warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> --- arch/arm/Kconfig.debug | 3 --- arch/arm/include/debug/msm.S | 7 +++++-- arch/arm/mach-msm/Kconfig | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0bf..320a335 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -376,7 +376,6 @@ choice config DEBUG_MSM8660_UART bool "Kernel low-level debugging messages via MSM 8660 UART" depends on ARCH_MSM8X60 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct @@ -385,7 +384,6 @@ choice config DEBUG_MSM8960_UART bool "Kernel low-level debugging messages via MSM 8960 UART" depends on ARCH_MSM8960 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct @@ -394,7 +392,6 @@ choice config DEBUG_MSM8974_UART bool "Kernel low-level debugging messages via MSM 8974 UART" depends on ARCH_MSM8974 - select MSM_HAS_DEBUG_UART_HS select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S index 9d653d4..0ba84e6 100644 --- a/arch/arm/include/debug/msm.S +++ b/arch/arm/include/debug/msm.S @@ -39,16 +39,19 @@ #ifdef CONFIG_DEBUG_MSM8660_UART #define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x19C40000 +#define MSM_HAS_DEBUG_UART_HS #endif #ifdef CONFIG_DEBUG_MSM8960_UART #define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x16440000 +#define MSM_HAS_DEBUG_UART_HS #endif #ifdef CONFIG_DEBUG_MSM8974_UART #define MSM_DEBUG_UART_BASE 0xFA71E000 #define MSM_DEBUG_UART_PHYS 0xF991E000 +#define MSM_HAS_DEBUG_UART_HS #endif .macro addruart, rp, rv, tmp @@ -59,7 +62,7 @@ .endm .macro senduart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef MSM_HAS_DEBUG_UART_HS @ Write the 1 character to UARTDM_TF str \rd, [\rx, #0x70] #else @@ -68,7 +71,7 @@ .endm .macro waituart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef MSM_HAS_DEBUG_UART_HS @ check for TX_EMT in UARTDM_SR ldr \rd, [\rx, #0x08] tst \rd, #0x08 diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index a7f959e..9b26976 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -42,9 +42,6 @@ config ARCH_QSD8X50 endchoice -config MSM_HAS_DEBUG_UART_HS - bool - config MSM_SOC_REV_A bool -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets 2014-04-09 14:26 ` [PATCH v2] " Ivan T. Ivanov @ 2014-04-09 17:44 ` Stephen Boyd 2014-04-14 13:47 ` [PATCH] ARM: debug: qcom: make UART address selection configuration option Ivan T. Ivanov 0 siblings, 1 reply; 8+ messages in thread From: Stephen Boyd @ 2014-04-09 17:44 UTC (permalink / raw) To: Ivan T. Ivanov Cc: Russell King, David Brown, Daniel Walker, Rohit Vaswani, Christopher Covington, linux-kernel, linux-arm-msm On 04/09/14 07:26, Ivan T. Ivanov wrote: > From: "Ivan T. Ivanov" <iivanov@mm-sol.com> > > High Speed UART is available also in new multiplatform QCOM targets. > > This fixes: > > scripts/kconfig/conf --silentoldconfig Kconfig > warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) > warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM) > > Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> It might be better to move the config out of mach-msm into arch/arm/Kconfig.debug. I think the eventual goal is to remove all these #defines for the physical/virtual address and have users enter the addresses in Kconfig similar to how Russell has done for the pl01X. If that happens then we end up with a DEBUG_MSM_UART (for 7201,8x50, 7x30) and DEBUG_QCOM_UARTDM for all others and the help text would indicate which addresses to use. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: debug: qcom: make UART address selection configuration option 2014-04-09 17:44 ` Stephen Boyd @ 2014-04-14 13:47 ` Ivan T. Ivanov 2014-04-14 17:48 ` Stephen Boyd 2014-05-06 19:41 ` Stephen Boyd 0 siblings, 2 replies; 8+ messages in thread From: Ivan T. Ivanov @ 2014-04-14 13:47 UTC (permalink / raw) To: Russell King, David Brown, Daniel Walker Cc: Ivan T. Ivanov, Stephen Boyd, Rohit Vaswani, linux-arm-kernel, linux-kernel, linux-arm-msm From: "Ivan T. Ivanov" <iivanov@mm-sol.com> Separate Qualcomm low-level debugging UART to two options. DEBUG_MSM_UART is used in earlier non-multi platform arches, like MSM7X00A, QSD8X50 and MSM7X30. DEBUG_QCOM_UARTDM is used in multi-plafrom arches and have embedded data mover. Make DEBUG_UART_PHYS and DEBUG_UART_BASE user adjustable by Kconfig menu. Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> --- arch/arm/Kconfig.debug | 81 ++++++++++++++++++-------------------------- arch/arm/include/debug/msm.S | 46 +++---------------------- arch/arm/mach-msm/Kconfig | 3 -- 3 files changed, 38 insertions(+), 92 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0bf..cdbfd8b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -349,56 +349,39 @@ choice Say Y here if you want kernel low-level debugging support on MMP UART3. - config DEBUG_MSM_UART1 - bool "Kernel low-level debugging messages via MSM UART1" - depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 - select DEBUG_MSM_UART + config DEBUG_MSM_UART + bool "Kernel low-level debugging messages via MSM UART" + depends on ARCH_MSM help Say Y here if you want the debug print routines to direct - their output to the first serial port on MSM devices. + their output to the serial port on MSM devices. - config DEBUG_MSM_UART2 - bool "Kernel low-level debugging messages via MSM UART2" - depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 - select DEBUG_MSM_UART - help - Say Y here if you want the debug print routines to direct - their output to the second serial port on MSM devices. + ARCH DEBUG_UART_PHYS DEBUG_UART_BASE # + MSM7X00A, QSD8X50 0xa9a00000 0xe1000000 UART1 + MSM7X00A, QSD8X50 0xa9b00000 0xe1000000 UART2 + MSM7X00A, QSD8X50 0xa9c00000 0xe1000000 UART3 - config DEBUG_MSM_UART3 - bool "Kernel low-level debugging messages via MSM UART3" - depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 - select DEBUG_MSM_UART - help - Say Y here if you want the debug print routines to direct - their output to the third serial port on MSM devices. + MSM7X30 0xaca00000 0xe1000000 UART1 + MSM7X30 0xacb00000 0xe1000000 UART2 + MSM7X30 0xacc00000 0xe1000000 UART3 - config DEBUG_MSM8660_UART - bool "Kernel low-level debugging messages via MSM 8660 UART" - depends on ARCH_MSM8X60 - select MSM_HAS_DEBUG_UART_HS - select DEBUG_MSM_UART - help - Say Y here if you want the debug print routines to direct - their output to the serial port on MSM 8660 devices. + Please adjust DEBUG_UART_PHYS and DEBUG_UART_BASE configuration + options based on your needs. - config DEBUG_MSM8960_UART - bool "Kernel low-level debugging messages via MSM 8960 UART" - depends on ARCH_MSM8960 - select MSM_HAS_DEBUG_UART_HS - select DEBUG_MSM_UART + config DEBUG_QCOM_UARTDM + bool "Kernel low-level debugging messages via QCOM UARTDM" + depends on ARCH_QCOM help Say Y here if you want the debug print routines to direct - their output to the serial port on MSM 8960 devices. + their output to the serial port on Qualcomm devices. - config DEBUG_MSM8974_UART - bool "Kernel low-level debugging messages via MSM 8974 UART" - depends on ARCH_MSM8974 - select MSM_HAS_DEBUG_UART_HS - select DEBUG_MSM_UART - help - Say Y here if you want the debug print routines to direct - their output to the serial port on MSM 8974 devices. + ARCH DEBUG_UART_PHYS DEBUG_UART_BASE + MSM8X60 0x19c40000 0xf0040000 + MSM8960 0x16440000 0xf0040000 + MSM8974 0xf991e000 0xfa71e000 + + Please adjust DEBUG_UART_PHYS and DEBUG_UART_BASE configuration + options based on your needs. config DEBUG_MVEBU_UART bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" @@ -950,10 +933,6 @@ config DEBUG_STI_UART bool depends on ARCH_STI -config DEBUG_MSM_UART - bool - depends on ARCH_MSM || ARCH_QCOM - config DEBUG_LL_INCLUDE string default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250 @@ -971,7 +950,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX53_UART ||\ DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART - default "debug/msm.S" if DEBUG_MSM_UART + default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 default "debug/sti.S" if DEBUG_STI_UART @@ -1035,6 +1014,7 @@ config DEBUG_UART_PHYS default 0x80074000 if DEBUG_IMX28_UART default 0x808c0000 if ARCH_EP93XX default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART + default 0xa9a00000 if DEBUG_MSM_UART default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX default 0xc0013000 if DEBUG_U300_UART default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN @@ -1050,6 +1030,7 @@ config DEBUG_UART_PHYS ARCH_ORION5X default 0xf7fc9000 if DEBUG_BERLIN_UART default 0xf8b00000 if DEBUG_HI3716_UART + default 0xf991e000 if DEBUG_QCOM_UARTDM default 0xfcb00000 if DEBUG_HI3620_UART default 0xfe800000 if ARCH_IOP32X default 0xffc02000 if DEBUG_SOCFPGA_UART @@ -1058,11 +1039,13 @@ config DEBUG_UART_PHYS default 0xfffff700 if ARCH_IOP33X depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ DEBUG_LL_UART_EFM32 || \ - DEBUG_UART_8250 || DEBUG_UART_PL01X + DEBUG_UART_8250 || DEBUG_UART_PL01X || \ + DEBUG_MSM_UART || DEBUG_QCOM_UARTDM config DEBUG_UART_VIRT hex "Virtual base address of debug UART" default 0xe0010fe0 if ARCH_RPC + default 0xe1000000 if DEBUG_MSM_UART default 0xf0000be0 if ARCH_EBSA110 default 0xf0009000 if DEBUG_CNS3XXX default 0xf01fb000 if DEBUG_NOMADIK_UART @@ -1078,6 +1061,7 @@ config DEBUG_UART_VIRT default 0xf7fc9000 if DEBUG_BERLIN_UART default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9 default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1 + default 0xfa71e000 if DEBUG_QCOM_UARTDM default 0xfb009000 if DEBUG_REALVIEW_STD_PORT default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX @@ -1116,7 +1100,8 @@ config DEBUG_UART_VIRT default 0xff003000 if DEBUG_U300_UART default DEBUG_UART_PHYS if !MMU depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ - DEBUG_UART_8250 || DEBUG_UART_PL01X + DEBUG_UART_8250 || DEBUG_UART_PL01X || \ + DEBUG_MSM_UART || DEBUG_QCOM_UARTDM config DEBUG_UART_8250_SHIFT int "Register offset shift for the 8250 debug UART" diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S index 9d653d4..9ef5761 100644 --- a/arch/arm/include/debug/msm.S +++ b/arch/arm/include/debug/msm.S @@ -15,51 +15,15 @@ * */ -#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_QSD8X50) -#define MSM_UART1_PHYS 0xA9A00000 -#define MSM_UART2_PHYS 0xA9B00000 -#define MSM_UART3_PHYS 0xA9C00000 -#elif defined(CONFIG_ARCH_MSM7X30) -#define MSM_UART1_PHYS 0xACA00000 -#define MSM_UART2_PHYS 0xACB00000 -#define MSM_UART3_PHYS 0xACC00000 -#endif - -#if defined(CONFIG_DEBUG_MSM_UART1) -#define MSM_DEBUG_UART_BASE 0xE1000000 -#define MSM_DEBUG_UART_PHYS MSM_UART1_PHYS -#elif defined(CONFIG_DEBUG_MSM_UART2) -#define MSM_DEBUG_UART_BASE 0xE1000000 -#define MSM_DEBUG_UART_PHYS MSM_UART2_PHYS -#elif defined(CONFIG_DEBUG_MSM_UART3) -#define MSM_DEBUG_UART_BASE 0xE1000000 -#define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS -#endif - -#ifdef CONFIG_DEBUG_MSM8660_UART -#define MSM_DEBUG_UART_BASE 0xF0040000 -#define MSM_DEBUG_UART_PHYS 0x19C40000 -#endif - -#ifdef CONFIG_DEBUG_MSM8960_UART -#define MSM_DEBUG_UART_BASE 0xF0040000 -#define MSM_DEBUG_UART_PHYS 0x16440000 -#endif - -#ifdef CONFIG_DEBUG_MSM8974_UART -#define MSM_DEBUG_UART_BASE 0xFA71E000 -#define MSM_DEBUG_UART_PHYS 0xF991E000 -#endif - .macro addruart, rp, rv, tmp -#ifdef MSM_DEBUG_UART_PHYS - ldr \rp, =MSM_DEBUG_UART_PHYS - ldr \rv, =MSM_DEBUG_UART_BASE +#ifdef CONFIG_DEBUG_UART_PHYS + ldr \rp, =CONFIG_DEBUG_UART_PHYS + ldr \rv, =CONFIG_DEBUG_UART_VIRT #endif .endm .macro senduart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef CONFIG_DEBUG_QCOM_UARTDM @ Write the 1 character to UARTDM_TF str \rd, [\rx, #0x70] #else @@ -68,7 +32,7 @@ .endm .macro waituart, rd, rx -#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS +#ifdef CONFIG_DEBUG_QCOM_UARTDM @ check for TX_EMT in UARTDM_SR ldr \rd, [\rx, #0x08] tst \rd, #0x08 diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index a7f959e..9b26976 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -42,9 +42,6 @@ config ARCH_QSD8X50 endchoice -config MSM_HAS_DEBUG_UART_HS - bool - config MSM_SOC_REV_A bool -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: debug: qcom: make UART address selection configuration option 2014-04-14 13:47 ` [PATCH] ARM: debug: qcom: make UART address selection configuration option Ivan T. Ivanov @ 2014-04-14 17:48 ` Stephen Boyd 2014-05-06 19:41 ` Stephen Boyd 1 sibling, 0 replies; 8+ messages in thread From: Stephen Boyd @ 2014-04-14 17:48 UTC (permalink / raw) To: Ivan T. Ivanov, Russell King, David Brown, Daniel Walker Cc: Rohit Vaswani, linux-arm-kernel, linux-kernel, linux-arm-msm On 04/14/14 06:47, Ivan T. Ivanov wrote: > From: "Ivan T. Ivanov" <iivanov@mm-sol.com> > > Separate Qualcomm low-level debugging UART to two options. > > DEBUG_MSM_UART is used in earlier non-multi platform arches, > like MSM7X00A, QSD8X50 and MSM7X30. > > DEBUG_QCOM_UARTDM is used in multi-plafrom arches and have > embedded data mover. > > Make DEBUG_UART_PHYS and DEBUG_UART_BASE user adjustable by > Kconfig menu. > > Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Looks good. Thanks. I'll give it a test later today. We may still need to send the small fix for 3.15 if this is too large for rc2. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: debug: qcom: make UART address selection configuration option 2014-04-14 13:47 ` [PATCH] ARM: debug: qcom: make UART address selection configuration option Ivan T. Ivanov 2014-04-14 17:48 ` Stephen Boyd @ 2014-05-06 19:41 ` Stephen Boyd 1 sibling, 0 replies; 8+ messages in thread From: Stephen Boyd @ 2014-05-06 19:41 UTC (permalink / raw) To: Ivan T. Ivanov Cc: Russell King, David Brown, Daniel Walker, Rohit Vaswani, linux-arm-kernel, linux-kernel, linux-arm-msm On 04/14, Ivan T. Ivanov wrote: > From: "Ivan T. Ivanov" <iivanov@mm-sol.com> > > Separate Qualcomm low-level debugging UART to two options. > > DEBUG_MSM_UART is used in earlier non-multi platform arches, > like MSM7X00A, QSD8X50 and MSM7X30. > > DEBUG_QCOM_UARTDM is used in multi-plafrom arches and have > embedded data mover. > > Make DEBUG_UART_PHYS and DEBUG_UART_BASE user adjustable by > Kconfig menu. > > Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> > --- Finally got around to testing this out. Tested-by: Stephen Boyd <sboyd@codeaurora.org> -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-05-06 19:41 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-09 13:08 [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets Ivan T. Ivanov 2014-04-09 14:00 ` Christopher Covington 2014-04-09 14:15 ` Ivan T. Ivanov 2014-04-09 14:26 ` [PATCH v2] " Ivan T. Ivanov 2014-04-09 17:44 ` Stephen Boyd 2014-04-14 13:47 ` [PATCH] ARM: debug: qcom: make UART address selection configuration option Ivan T. Ivanov 2014-04-14 17:48 ` Stephen Boyd 2014-05-06 19:41 ` Stephen Boyd
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).