Skip to contentSkip to conversation

Fix 740t support and remove more unused ARMv3 code

PATCH Superseded Will Deacon 5 participants 17 messages Jan 30, 2013 – Feb 10, 2013

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Fix 740t support and remove more unused ARMv3 code

Hello,

When looking at the remaining ARMv3 code that we still have kicking around, I noticed that the only user of the cache-flushing routines is the 740t, an ARMv4 chip. Having read the datasheet, we can actually use our ARMv4 cache-flushing code and remove cache-v3.S.

After making that change, I thought I'd better do some testing, which is where the fun began...

Even after getting hold of a 740t Integrator/AP core-tile, I ran into many problems with the CPU support, which I don't believe has *ever* worked. Anyway, having fixed those, the board runs like a charm.

Next stop is the 940t, which looks to be broken in similar ways.

Will

Will Deacon (6):
ARM: tlbflush: remove ARMv3 support
ARM: cache: remove ARMv3 support code
ARM: mm: fix numerous hideous errors in proc-arm740.S
ARM: mm: remove broken condition check for v4 flushing
ARM: modules: don't export cpu_set_pte_ext when !MMU
ARM: integrator: ensure ap_syscon_base is initialised when
!CONFIG_MMU

 arch/arm/include/asm/glue-cache.h        |   8 --
 arch/arm/include/asm/tlbflush.h          |  11 +--
 arch/arm/mach-integrator/integrator_ap.c |   2 +-
 arch/arm/mm/Kconfig                      |   5 +-
 arch/arm/mm/Makefile                     |   1 -
 arch/arm/mm/cache-v3.S                   | 137 -------------------------------
 arch/arm/mm/cache-v4.S                   |   2 +-
 arch/arm/mm/proc-arm740.S                |  30 ++++---
 arch/arm/mm/proc-syms.c                  |   2 +
 9 files changed, 24 insertions(+), 174 deletions(-)
 delete mode 100644 arch/arm/mm/cache-v3.S
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/6 ARM: tlbflush: remove ARMv3 support

We no longer support any ARMv3 platforms, so remove the old tlbflushing code.

---
 arch/arm/include/asm/tlbflush.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
arch/arm/include/asm/tlbflush.h +2 -9
index 6e924d3..23edd03 100644
@@ -14,7 +14,6 @@
 
 #include <asm/glue.h>
 
-#define TLB_V3_PAGE	(1 << 0)
 #define TLB_V4_U_PAGE	(1 << 1)
 #define TLB_V4_D_PAGE	(1 << 2)
 #define TLB_V4_I_PAGE	(1 << 3)
@@ -22,7 +21,6 @@
 #define TLB_V6_D_PAGE	(1 << 5)
 #define TLB_V6_I_PAGE	(1 << 6)
 
-#define TLB_V3_FULL	(1 << 8)
 #define TLB_V4_U_FULL	(1 << 9)
 #define TLB_V4_D_FULL	(1 << 10)
 #define TLB_V4_I_FULL	(1 << 11)
@@ -49,7 +47,6 @@
  *	=============
  *
  *	We have the following to choose from:
- *	  v3    - ARMv3
  *	  v4    - ARMv4 without write buffer
  *	  v4wb  - ARMv4 with write buffer without I TLB flush entry instruction
  *	  v4wbi - ARMv4 with write buffer with I TLB flush entry instruction
@@ -324,7 +321,6 @@ static inline void local_flush_tlb_all(void)
 	if (tlb_flag(TLB_WB))
 		dsb();
 
-	tlb_op(TLB_V3_FULL, "c6, c0, 0", zero);
 	tlb_op(TLB_V4_U_FULL | TLB_V6_U_FULL, "c8, c7, 0", zero);
 	tlb_op(TLB_V4_D_FULL | TLB_V6_D_FULL, "c8, c6, 0", zero);
 	tlb_op(TLB_V4_I_FULL | TLB_V6_I_FULL, "c8, c5, 0", zero);
@@ -345,9 +341,8 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
 	if (tlb_flag(TLB_WB))
 		dsb();
 
-	if (possible_tlb_flags & (TLB_V3_FULL|TLB_V4_U_FULL|TLB_V4_D_FULL|TLB_V4_I_FULL)) {
+	if (possible_tlb_flags & (TLB_V4_U_FULL|TLB_V4_D_FULL|TLB_V4_I_FULL)) {
 		if (cpumask_test_cpu(get_cpu(), mm_cpumask(mm))) {
-			tlb_op(TLB_V3_FULL, "c6, c0, 0", zero);
 			tlb_op(TLB_V4_U_FULL, "c8, c7, 0", zero);
 			tlb_op(TLB_V4_D_FULL, "c8, c6, 0", zero);
 			tlb_op(TLB_V4_I_FULL, "c8, c5, 0", zero);
@@ -379,9 +374,8 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
 	if (tlb_flag(TLB_WB))
 		dsb();
 
-	if (possible_tlb_flags & (TLB_V3_PAGE|TLB_V4_U_PAGE|TLB_V4_D_PAGE|TLB_V4_I_PAGE|TLB_V4_I_FULL) &&
+	if (possible_tlb_flags & (TLB_V4_U_PAGE|TLB_V4_D_PAGE|TLB_V4_I_PAGE|TLB_V4_I_FULL) &&
 	    cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {
-		tlb_op(TLB_V3_PAGE, "c6, c0, 0", uaddr);
 		tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", uaddr);
 		tlb_op(TLB_V4_D_PAGE, "c8, c6, 1", uaddr);
 		tlb_op(TLB_V4_I_PAGE, "c8, c5, 1", uaddr);
@@ -412,7 +406,6 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
 	if (tlb_flag(TLB_WB))
 		dsb();
 
-	tlb_op(TLB_V3_PAGE, "c6, c0, 0", kaddr);
 	tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", kaddr);
 	tlb_op(TLB_V4_D_PAGE, "c8, c6, 1", kaddr);
 	tlb_op(TLB_V4_I_PAGE, "c8, c5, 1", kaddr);
Signature · 1 line
1.8.0
#2 lore raw

PATCH 2/6 ARM: cache: remove ARMv3 support code

In reply to Will Deacon

This is only used by 740t, which is a v4 core and (by my reading of the datasheet for the CPU) ignores CRm for the cp15 cache flush operation, making the v4 cache implementation in cache-v4.S sufficient for this CPU.

Tested with 740T core-tile on Integrator/AP baseboard.

Cc Hyok S. Choi <[email protected]>
Cc Greg Ungerer <[email protected]>
---
 arch/arm/include/asm/glue-cache.h |   8 ---
 arch/arm/mm/Kconfig               |   5 +-
 arch/arm/mm/Makefile              |   1 -
 arch/arm/mm/cache-v3.S            | 137 --------------------------------------
 arch/arm/mm/proc-arm740.S         |   2 +-
 5 files changed, 2 insertions(+), 151 deletions(-)
 delete mode 100644 arch/arm/mm/cache-v3.S
arch/arm/include/asm/glue-cache.h +0 -8
index cca9f15..ea289e1 100644
@@ -19,14 +19,6 @@
 #undef _CACHE
 #undef MULTI_CACHE
 
-#if defined(CONFIG_CPU_CACHE_V3)
-# ifdef _CACHE
-#  define MULTI_CACHE 1
-# else
-#  define _CACHE v3
-# endif
-#endif
-
 #if defined(CONFIG_CPU_CACHE_V4)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
arch/arm/mm/Kconfig +1 -4
index 3fd629d..c430f46 100644
@@ -43,7 +43,7 @@ config CPU_ARM740T
 	depends on !MMU
 	select CPU_32v4T
 	select CPU_ABRT_LV4T
-	select CPU_CACHE_V3	# although the core is v4t
+	select CPU_CACHE_V4
 	select CPU_CP15_MPU
 	select CPU_PABRT_LEGACY
 	help
@@ -469,9 +469,6 @@ config CPU_PABRT_V7
 	bool
 
 # The cache model
-config CPU_CACHE_V3
-	bool
-
 config CPU_CACHE_V4
 	bool
 
arch/arm/mm/Makefile +0 -1
index 8a9c4cb..c0fd3c1 100644
@@ -33,7 +33,6 @@ obj-$(CONFIG_CPU_PABRT_LEGACY)	+= pabort-legacy.o
 obj-$(CONFIG_CPU_PABRT_V6)	+= pabort-v6.o
 obj-$(CONFIG_CPU_PABRT_V7)	+= pabort-v7.o
 
-obj-$(CONFIG_CPU_CACHE_V3)	+= cache-v3.o
 obj-$(CONFIG_CPU_CACHE_V4)	+= cache-v4.o
 obj-$(CONFIG_CPU_CACHE_V4WT)	+= cache-v4wt.o
 obj-$(CONFIG_CPU_CACHE_V4WB)	+= cache-v4wb.o
arch/arm/mm/cache-v3.S deleted +0 -137

137 lines not on this page · raw message

arch/arm/mm/proc-arm740.S +1 -1
index dc5de5d..2088234 100644
@@ -145,5 +145,5 @@ __arm740_proc_info:
 	.long	arm740_processor_functions
 	.long	0
 	.long	0
-	.long	v3_cache_fns			@ cache model
+	.long	v4_cache_fns			@ cache model
 	.size	__arm740_proc_info, . - __arm740_proc_info
Signature · 1 line
1.8.0
#3 lore raw

PATCH 2/6 ARM: cache: remove ARMv3 support code

I know there is no v3 architecture in current platforms in mainline tree, but can we _remove_ v3 support codes? IOW, Is there no platform port users for ARM7 nommu families(such as ARM700 or ARM710)?

-----Original Message-----
From: Will Deacon [mailto:will.deacon at arm.com]
Sent: Wednesday, January 30, 2013 11:28 PM
To: linux-arm-kernel at lists.infradead.org
Cc: Will Deacon; Hyok S. Choi; Greg Ungerer
Subject: [PATCH 2/6] ARM: cache: remove ARMv3 support code

This is only used by 740t, which is a v4 core and (by my reading of the datasheet for the CPU) ignores CRm for the cp15 cache flush operation, making the v4 cache implementation in cache-v4.S sufficient for this CPU.

Tested with 740T core-tile on Integrator/AP baseboard.

Cc Hyok S. Choi <[email protected]>
Cc Greg Ungerer <[email protected]>
---
 arch/arm/include/asm/glue-cache.h |   8 ---
 arch/arm/mm/Kconfig               |   5 +-
 arch/arm/mm/Makefile              |   1 -
 arch/arm/mm/cache-v3.S            | 137
--------------------------------------
 arch/arm/mm/proc-arm740.S         |   2 +-
 5 files changed, 2 insertions(+), 151 deletions(-)  delete mode 100644

arch/arm/mm/cache-v3.S

(quoted diff) +0 -0

b/arch/arm/include/asm/glue-cache.h
index cca9f15..ea289e1 100644

arch/arm/include/asm/glue-cache.h +0 -8
@@ -19,14 +19,6 @@
 #undef _CACHE
 #undef MULTI_CACHE
 
-#if defined(CONFIG_CPU_CACHE_V3)
-# ifdef _CACHE
-#  define MULTI_CACHE 1
-# else
-#  define _CACHE v3
-# endif
-#endif
-
 #if defined(CONFIG_CPU_CACHE_V4)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
arch/arm/mm/Kconfig index renamed from arch/arm/mm/Kconfig +0 -0

3fd629d..c430f46 100644

arch/arm/mm/Kconfig +1 -4
@@ -43,7 +43,7 @@ config CPU_ARM740T
 	depends on !MMU
 	select CPU_32v4T
 	select CPU_ABRT_LV4T
-	select CPU_CACHE_V3	# although the core is v4t
+	select CPU_CACHE_V4
 	select CPU_CP15_MPU
 	select CPU_PABRT_LEGACY
 	help
@@ -469,9 +469,6 @@ config CPU_PABRT_V7
 	bool
 
 # The cache model
-config CPU_CACHE_V3
-	bool
-
 config CPU_CACHE_V4
 	bool
 
arch/arm/mm/Makefile index renamed from arch/arm/mm/Makefile +0 -0

8a9c4cb..c0fd3c1 100644

arch/arm/mm/Makefile +0 -1
@@ -33,7 +33,6 @@ obj-$(CONFIG_CPU_PABRT_LEGACY)	+= pabort-legacy.o
 obj-$(CONFIG_CPU_PABRT_V6)	+= pabort-v6.o
 obj-$(CONFIG_CPU_PABRT_V7)	+= pabort-v7.o
 
-obj-$(CONFIG_CPU_CACHE_V3)	+= cache-v3.o
 obj-$(CONFIG_CPU_CACHE_V4)	+= cache-v4.o
 obj-$(CONFIG_CPU_CACHE_V4WT)	+= cache-v4wt.o
 obj-$(CONFIG_CPU_CACHE_V4WB)	+= cache-v4wb.o
arch/arm/mm/cache-v3.S deleted file renamed from arch/arm/mm/cache-v3.S +0 -0

mode 100644 index 8a3fade..0000000

arch/arm/mm/cache-v3.S deleted +0 -136

136 lines not on this page · raw message

proc-macros.S)
- define_cache_functions v3

arch/arm/mm/proc-arm740.S index renamed from arch/arm/mm/proc-arm740.S +0 -0

dc5de5d..2088234 100644

arch/arm/mm/proc-arm740.S +1 -1
@@ -145,5 +145,5 @@ __arm740_proc_info:
 	.long	arm740_processor_functions
 	.long	0
 	.long	0
-	.long	v3_cache_fns			@ cache model
+	.long	v4_cache_fns			@ cache model
 	.size	__arm740_proc_info, . - __arm740_proc_info

--
1.8.0

#4 lore raw

PATCH 2/6 ARM: cache: remove ARMv3 support code

Hello,

Quoted 3 lines · Hyok S. Choi

I know there is no v3 architecture in current platforms in mainline tree, but can we _remove_ v3 support codes? IOW, Is there no platform port users for ARM7 nommu families(such as ARM700 or ARM710)?

Nope, 610 and 710 support was removed last year with 357c9c1f07d4 ("ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs"). The only remaining user of cache-v3.S is 740T (grep for CPU_CACHE_V3).

Will

#5 lore raw

PATCH 3/6 ARM: mm: fix numerous hideous errors in proc-arm740.S

In reply to Will Deacon

The setup code in proc-arm740.S is completely broken and, as far as I can tell, always has been. I was >this< close to ripping it out, when a 740t core-tile materialised in the office, so I've had a crack at fixing things up:

- Fix the ram/flash area calculations so that we actually set the condition flags before testing them...
- Fix the proc_info structure so that __cpu_io_mmu_flags are defined as 0, placing the __cpu_flush pointer at the correct offset
- Re-number the registers used during __arm740_setup so that we don't clobber the machine ID et al
- Advertise Thumb support via the hwcaps, since 740T is the only 740 implementation.

---
 arch/arm/mm/proc-arm740.S | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
arch/arm/mm/proc-arm740.S +16 -12
index 2088234..fde2d2a 100644
@@ -77,24 +77,27 @@ __arm740_setup:
 	mcr	p15, 0, r0, c6,	c0		@ set area 0, default
 
 	ldr	r0, =(CONFIG_DRAM_BASE & 0xFFFFF000) @ base[31:12] of RAM
-	ldr	r1, =(CONFIG_DRAM_SIZE >> 12)	@ size of RAM (must be >= 4KB)
-	mov	r2, #10				@ 11 is the minimum (4KB)
-1:	add	r2, r2, #1			@ area size *= 2
-	mov	r1, r1, lsr #1
+	ldr	r3, =(CONFIG_DRAM_SIZE >> 12)	@ size of RAM (must be >= 4KB)
+	mov	r4, #10				@ 11 is the minimum (4KB)
+1:	add	r4, r4, #1			@ area size *= 2
+	movs	r3, r3, lsr #1
 	bne	1b				@ count not zero r-shift
-	orr	r0, r0, r2, lsl #1		@ the area register value
+	orr	r0, r0, r4, lsl #1		@ the area register value
 	orr	r0, r0, #1			@ set enable bit
 	mcr	p15, 0, r0, c6,	c1		@ set area 1, RAM
 
 	ldr	r0, =(CONFIG_FLASH_MEM_BASE & 0xFFFFF000) @ base[31:12] of FLASH
-	ldr	r1, =(CONFIG_FLASH_SIZE >> 12)	@ size of FLASH (must be >= 4KB)
-	mov	r2, #10				@ 11 is the minimum (4KB)
-1:	add	r2, r2, #1			@ area size *= 2
-	mov	r1, r1, lsr #1
+	ldr	r3, =(CONFIG_FLASH_SIZE >> 12)	@ size of FLASH (must be >= 4KB)
+	cmp	r3, #0
+	moveq	r0, #0
+	beq	2f
+	mov	r4, #10				@ 11 is the minimum (4KB)
+1:	add	r4, r4, #1			@ area size *= 2
+	movs	r3, r3, lsr #1
 	bne	1b				@ count not zero r-shift
-	orr	r0, r0, r2, lsl #1		@ the area register value
+	orr	r0, r0, r4, lsl #1		@ the area register value
 	orr	r0, r0, #1			@ set enable bit
-	mcr	p15, 0, r0, c6,	c2		@ set area 2, ROM/FLASH
+2:	mcr	p15, 0, r0, c6,	c2		@ set area 2, ROM/FLASH
 
 	mov	r0, #0x06
 	mcr	p15, 0, r0, c2, c0		@ Region 1&2 cacheable
@@ -137,10 +140,11 @@ __arm740_proc_info:
 	.long	0x41807400
 	.long	0xfffffff0
 	.long	0
+	.long	0
 	b	__arm740_setup
 	.long	cpu_arch_name
 	.long	cpu_elf_name
-	.long	HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT
+	.long	HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_26BIT
 	.long	cpu_arm740_name
 	.long	arm740_processor_functions
 	.long	0
Signature · 1 line
1.8.0
#6 lore raw

PATCH 3/6 ARM: mm: fix numerous hideous errors in proc-arm740.S

Hmm, in previous years, for arm7xx platforms, boot up was not done by typical bootloaders.
I've read the code and seems good to me to add "Acked-by".

Hyok

-----Original Message-----
From: Will Deacon [mailto:will.deacon at arm.com]
Sent: Wednesday, January 30, 2013 11:28 PM
To: linux-arm-kernel at lists.infradead.org
Cc: Will Deacon; Hyok S. Choi
Subject: [PATCH 3/6] ARM: mm: fix numerous hideous errors in proc-arm740.S

The setup code in proc-arm740.S is completely broken and, as far as I can tell, always has been. I was >this< close to ripping it out, when a 740t core-tile materialised in the office, so I've had a crack at fixing things up:

- Fix the ram/flash area calculations so that we actually set the condition flags before testing them...
- Fix the proc_info structure so that __cpu_io_mmu_flags are defined as 0, placing the __cpu_flush pointer at the correct offset
- Re-number the registers used during __arm740_setup so that we don't clobber the machine ID et al
- Advertise Thumb support via the hwcaps, since 740T is the only 740 implementation.

---
 arch/arm/mm/proc-arm740.S | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
arch/arm/mm/proc-arm740.S index renamed from arch/arm/mm/proc-arm740.S +0 -0

2088234..fde2d2a 100644

arch/arm/mm/proc-arm740.S +0 -1
@@ -77,24 +77,27 @@ __arm740_setup:
 	mcr	p15, 0, r0, c6,	c0		@ set area 0, default
 
 	ldr	r0, =(CONFIG_DRAM_BASE & 0xFFFFF000) @ base[31:12] of RAM
-	ldr	r1, =(CONFIG_DRAM_SIZE >> 12)	@ size of RAM (must be >=

4KB)
- mov r2, #10 @ 11 is the minimum (4KB)
-1: add r2, r2, #1 @ area size *= 2
- mov r1, r1, lsr #1
+ ldr r3, =(CONFIG_DRAM_SIZE >> 12) @ size of RAM (must be >=
4KB)
+ mov r4, #10 @ 11 is the minimum (4KB)
+1: add r4, r4, #1 @ area size *= 2
+ movs r3, r3, lsr #1
bne 1b @ count not zero r-shift
- orr r0, r0, r2, lsl #1 @ the area register value
+ orr r0, r0, r4, lsl #1 @ the area register value
orr r0, r0, #1 @ set enable bit
mcr p15, 0, r0, c6, c1 @ set area 1, RAM

ldr r0, =(CONFIG_FLASH_MEM_BASE & 0xFFFFF000) @ base[31:12] of
FLASH
- ldr r1, =(CONFIG_FLASH_SIZE >> 12) @ size of FLASH (must be >=
4KB)
- mov r2, #10 @ 11 is the minimum (4KB)
-1: add r2, r2, #1 @ area size *= 2
- mov r1, r1, lsr #1
+ ldr r3, =(CONFIG_FLASH_SIZE >> 12) @ size of FLASH (must be >=
4KB)
+ cmp r3, #0
+ moveq r0, #0
+ beq 2f
+ mov r4, #10 @ 11 is the minimum (4KB)
+1: add r4, r4, #1 @ area size *= 2
+ movs r3, r3, lsr #1
bne 1b @ count not zero r-shift
- orr r0, r0, r2, lsl #1 @ the area register value
+ orr r0, r0, r4, lsl #1 @ the area register value
orr r0, r0, #1 @ set enable bit
- mcr p15, 0, r0, c6, c2 @ set area 2, ROM/FLASH
+2: mcr p15, 0, r0, c6, c2 @ set area 2, ROM/FLASH

mov r0, #0x06
mcr p15, 0, r0, c2, c0 @ Region 1&2 cacheable
@@ -137,10 +140,11 @@ __arm740_proc_info:
.long 0x41807400
.long 0xfffffff0
.long 0
+ .long 0
b __arm740_setup
.long cpu_arch_name
.long cpu_elf_name

-	.long	HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT
+	.long	HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_26BIT

.long cpu_arm740_name
.long arm740_processor_functions
.long 0
--
1.8.0

#7 lore raw

PATCH 4/6 ARM: mm: remove broken condition check for v4 flushing

In reply to Will Deacon

There's no point having a conditional cache flush if we don't know the state of the condition beforehand.

This patch makes the cacheflush in v4_flush_user_cache_range unconditional.

---
 arch/arm/mm/cache-v4.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mm/cache-v4.S +1 -1
index 43e5d77..a7ba68f 100644
@@ -58,7 +58,7 @@ ENTRY(v4_flush_kern_cache_all)
 ENTRY(v4_flush_user_cache_range)
 #ifdef CONFIG_CPU_CP15
 	mov	ip, #0
-	mcreq	p15, 0, ip, c7, c7, 0		@ flush ID cache
+	mcr	p15, 0, ip, c7, c7, 0		@ flush ID cache
 	mov	pc, lr
 #else
 	/* FALLTHROUGH */
Signature · 1 line
1.8.0
#8 lore raw

PATCH 5/6 ARM: modules: don't export cpu_set_pte_ext when !MMU

In reply to Will Deacon

cpu_set_pte_ext is only guaranteed to be defined when CONFIG_MMU, so don't export it to modules otherwise.

---
 arch/arm/mm/proc-syms.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mm/proc-syms.c +2 -0
index 3e6210b..054b491 100644
@@ -17,7 +17,9 @@
 
 #ifndef MULTI_CPU
 EXPORT_SYMBOL(cpu_dcache_clean_area);
+#ifdef CONFIG_MMU
 EXPORT_SYMBOL(cpu_set_pte_ext);
+#endif
 #else
 EXPORT_SYMBOL(processor);
 #endif
Signature · 1 line
1.8.0
#9 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

In reply to Will Deacon

When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.

Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.

---
 arch/arm/mach-integrator/integrator_ap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-integrator/integrator_ap.c +1 -1
index 11e2a41..26762bf 100644
@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = {
 static void __init ap_map_io_atag(void)
 {
 	iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag));
-	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	ap_map_io();
 }
 
@@ -685,6 +684,7 @@ static void __init ap_init(void)
 
 	platform_device_register(&cfi_flash_device);
 
+	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
 	for (i = 0; i < 4; i++) {
 		struct lm_device *lmdev;
Signature · 1 line
1.8.0
#10 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 2 lines · Will Deacon

When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.

Oh hm. Haha apparently there is one guy with more bizarre hobbies than myself, you're making me feel un-geeky... ;-)

Quoted 2 lines

Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.

I was trying to figure out if there is some case where we need it earlier but apparently not so.

Maybe you should send this oneliner directly to the ARM SoC people?

Yours,
Linus Walleij

#11 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Hi Linus,

Quoted 7 lines · Linus Walleij
Quoted 2 lines · Will Deacon

When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.

Oh hm. Haha apparently there is one guy with more bizarre hobbies than myself, you're making me feel un-geeky... ;-)

Ha! Unfortunately, I only have one core-tile otherwise you could have one to help you feel less left-out :)

Quoted 7 lines
Quoted 2 lines

Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.

I was trying to figure out if there is some case where we need it earlier but apparently not so.

Cheers!

Quoted 2 lines

Maybe you should send this oneliner directly to the ARM SoC people?

[adding Olof and Arnd] Is it worth sending a pull request containing a single patch, or can this patch just be picked directly?

Cheers,

Will

#12 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 22 lines · Will Deacon

Hi Linus,

Quoted 7 lines · Linus Walleij
Quoted 2 lines · Will Deacon

When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.

Oh hm. Haha apparently there is one guy with more bizarre hobbies than myself, you're making me feel un-geeky... ;-)

Ha! Unfortunately, I only have one core-tile otherwise you could have one to help you feel less left-out :)

Quoted 7 lines
Quoted 2 lines

Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.

I was trying to figure out if there is some case where we need it earlier but apparently not so.

Quoted 7 lines

Cheers!

Quoted 2 lines

Maybe you should send this oneliner directly to the ARM SoC people?

[adding Olof and Arnd] Is it worth sending a pull request containing a single patch, or can this patch just be picked directly?

Definitely ok to just send the patch like this. However -- where was the breakage introduced, i.e. what should we apply the fix to?

-Olof

#13 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 6 lines · Olof Johansson
Quoted 2 lines · Will Deacon

[adding Olof and Arnd] Is it worth sending a pull request containing a single patch, or can this patch just be picked directly?

Definitely ok to just send the patch like this. However -- where was the breakage introduced, i.e. what should we apply the fix to?

I think it's been broken for a little while as it only affects !MMU configurations, which aren't especially popular. My guess is that 83feba511e5d ("ARM: integrator: remove static AP syscon mapping") is what caused the breakage.

The fix should apply against mainline.

Cheers,

Will

#14 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 8 lines · Will Deacon
Quoted 6 lines · Olof Johansson
Quoted 2 lines · Will Deacon

[adding Olof and Arnd] Is it worth sending a pull request containing a single patch, or can this patch just be picked directly?

Definitely ok to just send the patch like this. However -- where was the breakage introduced, i.e. what should we apply the fix to?

Quoted 6 lines

I think it's been broken for a little while as it only affects !MMU configurations, which aren't especially popular. My guess is that 83feba511e5d ("ARM: integrator: remove static AP syscon mapping") is what caused the breakage.

The fix should apply against mainline.

Sounds like a candidate for stable as well then. I'm not sure if anyone cares about !MMU stable kernels, but it's totally possible with the LTSI kernels.

Arnd

#15 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 11 lines · Arnd Bergmann
Quoted 6 lines · Will Deacon

I think it's been broken for a little while as it only affects !MMU configurations, which aren't especially popular. My guess is that 83feba511e5d ("ARM: integrator: remove static AP syscon mapping") is what caused the breakage.

The fix should apply against mainline.

Sounds like a candidate for stable as well then. I'm not sure if anyone cares about !MMU stable kernels, but it's totally possible with the LTSI kernels.

Agreed. I've lost where we've got to, so here's the patch against -rc5 with the CC stable and Linus' ack.

Will

--->8

Quoted 1 line

From b6eafe04b20997b968df4903a4ca6039a3f224be Mon Sep 17 00:00:00 2001

From: Will Deacon <[email protected]>
Date: Wed, 30 Jan 2013 14:02:46 +0000
Subject: [PATCH] ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.

Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.

---
 arch/arm/mach-integrator/integrator_ap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-integrator/integrator_ap.c +1 -1
index 11e2a41..26762bf 100644
@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = {
 static void __init ap_map_io_atag(void)
 {
 	iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag));
-	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	ap_map_io();
 }
 
@@ -685,6 +684,7 @@ static void __init ap_init(void)
 
 	platform_device_register(&cfi_flash_device);
 
+	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
 	for (i = 0; i < 4; i++) {
 		struct lm_device *lmdev;
Signature · 1 line
1.8.0
#16 lore raw

PATCH 6/6 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

Quoted 7 lines · Will Deacon
Quoted 6 lines · Arnd Bergmann
Quoted 5 lines · Will Deacon

I think it's been broken for a little while as it only affects !MMU configurations, which aren't especially popular. My guess is that 83feba511e5d ("ARM: integrator: remove static AP syscon mapping") is what caused the breakage.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

The fix should apply against mainline.

Sounds like a candidate for stable as well then. I'm not sure if anyone cares about !MMU stable kernels, but it's totally possible with the LTSI kernels.

Agreed. I've lost where we've got to, so here's the patch against -rc5 with the CC stable and Linus' ack.

Applied to fixes-non-critical for 3.9.

-Olof