diff mbox

[V2,6/8] SPEAr13xx: Fix static mapping table

Message ID 22d2e7d6fbd5a291cdecf6a4d1e294d9c9ede617.1390471111.git.mohit.kumar@st.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mohit KUMAR DCG Jan. 23, 2014, 10:32 a.m. UTC
From: Pratyush Anand <pratyush.anand@st.com>

SPEAr13xx was using virtual address space 0xFE000000 to map physical address
space 0xB3000000. pci_remap_io uses 0xFEE00000 as virtual address. So
change 0xFE000000 to 0xF9000000.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Tested-by: Mohit Kumar <mohit.kumar@st.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: spear-devel@list.st.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-spear/include/mach/spear.h |    4 ++--
 arch/arm/mach-spear/spear13xx.c          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Pratyush ANAND Jan. 24, 2014, 3:47 a.m. UTC | #1
On Thu, Jan 23, 2014 at 08:12:15PM +0800, Arnd Bergmann wrote:
> On Thursday 23 January 2014, Mohit Kumar wrote:
> > From: Pratyush Anand <pratyush.anand@st.com>
> > 
> > SPEAr13xx was using virtual address space 0xFE000000 to map physical address
> > space 0xB3000000. pci_remap_io uses 0xFEE00000 as virtual address. So
> > change 0xFE000000 to 0xF9000000.
> > 
> > Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
> > Tested-by: Mohit Kumar <mohit.kumar@st.com>
> > Cc: Viresh Kumar <viresh.linux@gmail.com>
> > Cc: spear-devel@list.st.com
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: Arnd Bergmann <arnd@arndb.de>
> 
> Surely this is needed in backports, so please add stable@vger.kernel.org
> to the Cc list in the changeset text. Otherwise

While sending v3 of series will cc stable list.

> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Thanks :)

Regards
Pratyush
Viresh Kumar Jan. 24, 2014, 5:07 a.m. UTC | #2
On Thu, Jan 23, 2014 at 4:02 PM, Mohit Kumar <mohit.kumar@st.com> wrote:
> From: Pratyush Anand <pratyush.anand@st.com>
>
> SPEAr13xx was using virtual address space 0xFE000000 to map physical address
> space 0xB3000000. pci_remap_io uses 0xFEE00000 as virtual address. So
> change 0xFE000000 to 0xF9000000.
>
> Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
> Tested-by: Mohit Kumar <mohit.kumar@st.com>
> Cc: Viresh Kumar <viresh.linux@gmail.com>
> Cc: spear-devel@list.st.com
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/arm/mach-spear/include/mach/spear.h |    4 ++--
>  arch/arm/mach-spear/spear13xx.c          |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
> index 5cdc53d..f2d6a01 100644
> --- a/arch/arm/mach-spear/include/mach/spear.h
> +++ b/arch/arm/mach-spear/include/mach/spear.h
> @@ -52,10 +52,10 @@
>  #ifdef CONFIG_ARCH_SPEAR13XX
>
>  #define PERIP_GRP2_BASE                                UL(0xB3000000)
> -#define VA_PERIP_GRP2_BASE                     IOMEM(0xFE000000)
> +#define VA_PERIP_GRP2_BASE                     IOMEM(0xF9000000)
>  #define MCIF_SDHCI_BASE                                UL(0xB3000000)
>  #define SYSRAM0_BASE                           UL(0xB3800000)
> -#define VA_SYSRAM0_BASE                                IOMEM(0xFE800000)
> +#define VA_SYSRAM0_BASE                                IOMEM(0xF9800000)
>  #define SYS_LOCATION                           (VA_SYSRAM0_BASE + 0x600)
>
>  #define PERIP_GRP1_BASE                                UL(0xE0000000)
> diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
> index 7aa6e8c..20ce885 100644
> --- a/arch/arm/mach-spear/spear13xx.c
> +++ b/arch/arm/mach-spear/spear13xx.c
> @@ -52,10 +52,10 @@ void __init spear13xx_l2x0_init(void)
>  /*
>   * Following will create 16MB static virtual/physical mappings
>   * PHYSICAL            VIRTUAL
> - * 0xB3000000          0xFE000000
>   * 0xE0000000          0xFD000000
>   * 0xEC000000          0xFC000000
>   * 0xED000000          0xFB000000
> + * 0xB3000000          0xF9000000


Why have you moved this to bottom of list? It was probably kept
in increasing order and so please keep the same.

Other than that:

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Pratyush ANAND Jan. 24, 2014, 5:27 a.m. UTC | #3
On Fri, Jan 24, 2014 at 01:07:38PM +0800, Viresh Kumar wrote:
> On Thu, Jan 23, 2014 at 4:02 PM, Mohit Kumar <mohit.kumar@st.com> wrote:
> > From: Pratyush Anand <pratyush.anand@st.com>
> >
> > SPEAr13xx was using virtual address space 0xFE000000 to map physical address
> > space 0xB3000000. pci_remap_io uses 0xFEE00000 as virtual address. So
> > change 0xFE000000 to 0xF9000000.
> >
> > Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
> > Tested-by: Mohit Kumar <mohit.kumar@st.com>
> > Cc: Viresh Kumar <viresh.linux@gmail.com>
> > Cc: spear-devel@list.st.com
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > ---
> >  arch/arm/mach-spear/include/mach/spear.h |    4 ++--
> >  arch/arm/mach-spear/spear13xx.c          |    2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
> > index 5cdc53d..f2d6a01 100644
> > --- a/arch/arm/mach-spear/include/mach/spear.h
> > +++ b/arch/arm/mach-spear/include/mach/spear.h
> > @@ -52,10 +52,10 @@
> >  #ifdef CONFIG_ARCH_SPEAR13XX
> >
> >  #define PERIP_GRP2_BASE                                UL(0xB3000000)
> > -#define VA_PERIP_GRP2_BASE                     IOMEM(0xFE000000)
> > +#define VA_PERIP_GRP2_BASE                     IOMEM(0xF9000000)
> >  #define MCIF_SDHCI_BASE                                UL(0xB3000000)
> >  #define SYSRAM0_BASE                           UL(0xB3800000)
> > -#define VA_SYSRAM0_BASE                                IOMEM(0xFE800000)
> > +#define VA_SYSRAM0_BASE                                IOMEM(0xF9800000)
> >  #define SYS_LOCATION                           (VA_SYSRAM0_BASE + 0x600)
> >
> >  #define PERIP_GRP1_BASE                                UL(0xE0000000)
> > diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
> > index 7aa6e8c..20ce885 100644
> > --- a/arch/arm/mach-spear/spear13xx.c
> > +++ b/arch/arm/mach-spear/spear13xx.c
> > @@ -52,10 +52,10 @@ void __init spear13xx_l2x0_init(void)
> >  /*
> >   * Following will create 16MB static virtual/physical mappings
> >   * PHYSICAL            VIRTUAL
> > - * 0xB3000000          0xFE000000
> >   * 0xE0000000          0xFD000000
> >   * 0xEC000000          0xFC000000
> >   * 0xED000000          0xFB000000
> > + * 0xB3000000          0xF9000000
> 
> 
> Why have you moved this to bottom of list? It was probably kept
> in increasing order and so please keep the same.

Oh,yes..ll be corrected in v3 of series.

> 
> Other than that:
> 
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

Thanks.

Regards
Pratyush
diff mbox

Patch

diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
index 5cdc53d..f2d6a01 100644
--- a/arch/arm/mach-spear/include/mach/spear.h
+++ b/arch/arm/mach-spear/include/mach/spear.h
@@ -52,10 +52,10 @@ 
 #ifdef CONFIG_ARCH_SPEAR13XX
 
 #define PERIP_GRP2_BASE				UL(0xB3000000)
-#define VA_PERIP_GRP2_BASE			IOMEM(0xFE000000)
+#define VA_PERIP_GRP2_BASE			IOMEM(0xF9000000)
 #define MCIF_SDHCI_BASE				UL(0xB3000000)
 #define SYSRAM0_BASE				UL(0xB3800000)
-#define VA_SYSRAM0_BASE				IOMEM(0xFE800000)
+#define VA_SYSRAM0_BASE				IOMEM(0xF9800000)
 #define SYS_LOCATION				(VA_SYSRAM0_BASE + 0x600)
 
 #define PERIP_GRP1_BASE				UL(0xE0000000)
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index 7aa6e8c..20ce885 100644
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -52,10 +52,10 @@  void __init spear13xx_l2x0_init(void)
 /*
  * Following will create 16MB static virtual/physical mappings
  * PHYSICAL		VIRTUAL
- * 0xB3000000		0xFE000000
  * 0xE0000000		0xFD000000
  * 0xEC000000		0xFC000000
  * 0xED000000		0xFB000000
+ * 0xB3000000		0xF9000000
  */
 struct map_desc spear13xx_io_desc[] __initdata = {
 	{