Skip to contentSkip to conversation

ARM: S3C24XX: Fix the S3C24XX_VA_GPIO mapping

PATCH New Kukjin Kim 2 participants 3 messages Oct 20, 2010 – Oct 22, 2010

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH 1/1 ARM: S3C24XX: Fix the S3C24XX_VA_GPIO mapping

This patch changes the S3C24XX_VA_GPIO for to fix following BUG.

BUG: not creating mapping for 0x56000000 at 0x01000000 in user region

It is due to commit 8fecfe9d(ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space) which changes S3C_ADDR_BASE from 0xF4000000 to 0xFA000000.

---
 arch/arm/plat-s3c24xx/include/plat/map.h |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
arch/arm/plat-s3c24xx/include/plat/map.h +3 -11
index bd534d3..771491e 100644
@@ -61,17 +61,9 @@
 
 /* GPIO ports */
 
-/* the calculation for the VA of this must ensure that
- * it is the same distance apart from the UART in the
- * phsyical address space, as the initial mapping for the IO
- * is done as a 1:1 mapping. This puts it (currently) at
- * 0xFA800000, which is not in the way of any current mapping
- * by the base system.
-*/
-
-#define S3C2410_PA_GPIO	   (0x56000000)
-#define S3C24XX_VA_GPIO	   ((S3C24XX_PA_GPIO - S3C24XX_PA_UART) + S3C24XX_VA_UART)
-#define S3C24XX_SZ_GPIO	   SZ_1M
+#define S3C2410_PA_GPIO		(0x56000000)
+#define S3C24XX_VA_GPIO		S3C2410_ADDR(0x00F00000)
+#define S3C24XX_SZ_GPIO		SZ_1M
 
 
 /* ISA style IO, for each machine to sort out mappings for, if it
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/1 ARM: S3C24XX: Fix the S3C24XX_VA_GPIO mapping

Quoted 19 lines · Kukjin Kim

This patch changes the S3C24XX_VA_GPIO for to fix following BUG.

BUG: not creating mapping for 0x56000000 at 0x01000000 in user region

It is due to commit 8fecfe9d(ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space) which changes S3C_ADDR_BASE from 0xF4000000 to 0xFA000000.

---
 arch/arm/plat-s3c24xx/include/plat/map.h |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
arch/arm/plat-s3c24xx/include/plat/map.h +0 -0
index bd534d3..771491e 100644

arch/arm/plat-s3c24xx/include/plat/map.h line 70

Quoted 10 lines
arch/arm/plat-s3c24xx/include/plat/map.h +0 -7
@@ -61,17 +61,9 @@
 
 /* GPIO ports */
 
-/* the calculation for the VA of this must ensure that
- * it is the same distance apart from the UART in the
- * phsyical address space, as the initial mapping for the IO
- * is done as a 1:1 mapping. This puts it (currently) at
- * 0xFA800000, which is not in the way of any current mapping
- * by the base system.
-*/

This comment is really important, and it is possible this will break some of the s3c24xx platforms duing the boot process as there can be problems during the changes of mmu when booting.

Quoted 9 lines
arch/arm/plat-s3c24xx/include/plat/map.h +3 -3
-#define S3C2410_PA_GPIO	   (0x56000000)
-#define S3C24XX_VA_GPIO	   ((S3C24XX_PA_GPIO - S3C24XX_PA_UART) + S3C24XX_VA_UART)
-#define S3C24XX_SZ_GPIO	   SZ_1M
+#define S3C2410_PA_GPIO		(0x56000000)
+#define S3C24XX_VA_GPIO		S3C2410_ADDR(0x00F00000)
+#define S3C24XX_SZ_GPIO		SZ_1M
 
 
 /* ISA style IO, for each machine to sort out mappings for, if it
author
#2 lore raw

PATCH 1/1 ARM: S3C24XX: Fix the S3C24XX_VA_GPIO mapping

Quoted 25 lines · Ben Dooks

arch/arm/plat-

Quoted 15 lines · Kukjin Kim

This patch changes the S3C24XX_VA_GPIO for to fix following BUG.

BUG: not creating mapping for 0x56000000 at 0x01000000 in user region

It is due to commit 8fecfe9d(ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space) which changes S3C_ADDR_BASE from 0xF4000000 to 0xFA000000.

---
 arch/arm/plat-s3c24xx/include/plat/map.h |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
arch/arm/plat- renamed from arch/arm/plat-s3c24xx/include/plat/map.h +0 -0

s3c24xx/include/plat/map.h

Quoted 7 lines

index bd534d3..771491e 100644

arch/arm/plat-s3c24xx/include/plat/map.h +0 -0
@@ -61,17 +61,9 @@
 
 /* GPIO ports */
 
Quoted 12 lines

arch/arm/plat-s3c24xx/include/plat/map.h line 70

Quoted 7 lines
arch/arm/plat-s3c24xx/include/plat/map.h +0 -7
-/* the calculation for the VA of this must ensure that
- * it is the same distance apart from the UART in the
- * phsyical address space, as the initial mapping for the IO
- * is done as a 1:1 mapping. This puts it (currently) at
- * 0xFA800000, which is not in the way of any current mapping
- * by the base system.
-*/

This comment is really important, and it is possible this will break some of the s3c24xx platforms duing the boot process as there can be problems during the changes of mmu when booting.

Hi Ben,

I understand, thanks for your pointing out. Firstly, will drop this..and update other regarding patch.

I think, we need to sort VA mapping out later ;-)

Quoted 10 lines

arch/arm/plat-s3c24xx/include/plat/map.h line 72

Quoted 2 lines
arch/arm/plat-s3c24xx/include/plat/map.h +0 -2
-#define S3C2410_PA_GPIO	   (0x56000000)
-#define S3C24XX_VA_GPIO	   ((S3C24XX_PA_GPIO - S3C24XX_PA_UART) +

S3C24XX_VA_UART)

arch/arm/plat-s3c24xx/include/plat/map.h line 69

Quoted 7 lines
arch/arm/plat-s3c24xx/include/plat/map.h +3 -1
-#define S3C24XX_SZ_GPIO	   SZ_1M
+#define S3C2410_PA_GPIO		(0x56000000)
+#define S3C24XX_VA_GPIO		S3C2410_ADDR(0x00F00000)
+#define S3C24XX_SZ_GPIO		SZ_1M
 
 
 /* ISA style IO, for each machine to sort out mappings for, if it

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.