by David Brown

[permalink] [raw]

Subject: Re: [PATCH v2 6/9] ARM: msm: Move mach/board.h contents to common.h

On Wed, Jul 24, 2013 at 01:54:31PM -0700, Stephen Boyd wrote:
>The contents of mach/board.h are only used by files within
>mach-msm so there is no need to export this file outside of the
>mach-msm directory. Move the contents of the file to common.h to
>allow us to compile MSM in the multi-platform kernel.
>
>Cc: Florian Tobias Schandinat <[email protected]>
>Signed-off-by: Stephen Boyd <[email protected]>
>---
> drivers/video/msm/msm_fb.c | 1 -

It'd be nice to get a framebuffer Ack from this part.

original patch:
https://patchwork.kernel.org/patch/2833029/

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

2013-07-30 05:46:31

On 07/30, Russell King - ARM Linux wrote:
> On Wed, Jul 24, 2013 at 01:54:28PM -0700, Stephen Boyd wrote:
> > One more step to allowing MSM to participate in the
> > multi-platform defconfig.
> >
> > Signed-off-by: Stephen Boyd <[email protected]>
> > ---
> > arch/arm/Kconfig.debug | 9 +++-
> > .../mach/debug-macro.S => include/debug/msm.S} | 32 ++++++++++-
> > arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 5 --
> > arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 5 --
> > arch/arm/mach-msm/include/mach/msm_iomap.h | 12 -----
> > arch/arm/mach-msm/include/mach/uncompress.h | 63 ----------------------
> > arch/arm/mach-msm/io.c | 40 +++++++-------
> > 7 files changed, 58 insertions(+), 108 deletions(-)
> > rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%)
> > delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h
> >
> > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> > index e401a76..4a62a8d 100644
> > --- a/arch/arm/Kconfig.debug
> > +++ b/arch/arm/Kconfig.debug
> > @@ -777,6 +777,11 @@ config DEBUG_LL_INCLUDE
> > DEBUG_IMX6SL_UART
> > default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
> > DEBUG_KEYSTONE_UART1
> > + default "debug/msm.S" if DEBUG_MSM_UART1 || \
> > + DEBUG_MSM_UART2 || \
> > + DEBUG_MSM_UART3 || \
> > + DEBUG_MSM8660_UART || \
> > + DEBUG_MSM8960_UART
> > default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
> > DEBUG_MVEBU_UART_ALTERNATE
> > default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
> > @@ -804,13 +809,13 @@ config DEBUG_LL_INCLUDE
> >
> > config DEBUG_UNCOMPRESS
> > bool
> > - default y if ARCH_MULTIPLATFORM && DEBUG_LL && \
> > + default y if (ARCH_MULTIPLATFORM || ARCH_MSM) && DEBUG_LL && \
> > !DEBUG_OMAP2PLUS_UART && \
> > !DEBUG_TEGRA_UART
> >
> > config UNCOMPRESS_INCLUDE
> > string
> > - default "debug/uncompress.h" if ARCH_MULTIPLATFORM
> > + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM
> > default "mach/uncompress.h"
>
> I hope the above two aren't going to grow.

>From what I can tell we should convert everyone over to this so
that they don't have to put almost exactly the same code in the
uncompress.h as they put in their debug-macro.S

>
> > {
> > .virtual = (unsigned long) MSM_SHARED_RAM_BASE,
> > .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
> > .length = MSM_SHARED_RAM_SIZE,
> > .type = MT_DEVICE,
> > },
>
> A comment here mentioning that the below must be the last entry would
> probably be a good idea as you overwrite the virtual/pfn members of this
> last entry.

I thought the comment there was sufficient. I'll add "must be
last" to be more explicit.

>
> > +#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
> > + defined(CONFIG_DEBUG_MSM_UART3)
> > + {
> > + /* virtual and pfn filled in by debug_ll_addr() */
> > + .length = SZ_4K,
> > + .type = MT_DEVICE_NONSHARED,
> > + }
> > +#endif

David can you fold this in?

---8<-----
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 5f1b0aa..adc8971 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -60,7 +60,7 @@ static struct map_desc msm_io_desc[] __initdata = {
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
{
- /* virtual and pfn filled in by debug_ll_addr() */
+ /* Must be last: virtual and pfn filled in by debug_ll_addr() */
.length = SZ_4K,
.type = MT_DEVICE_NONSHARED,
}

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation