disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/arch/arm/mach-mvebu/coherency_ll.S
..
..
@@ -35,13 +35,8 @@
35
35
 
36
36
 	/*
37
37
 	 * MMU is disabled, use the physical address of the coherency
38
-	 * base address. However, if the coherency fabric isn't mapped
39
-	 * (i.e its virtual address is zero), it means coherency is
40
-	 * not enabled, so we return 0.
38
+	 * base address, (or 0x0 if the coherency fabric is not mapped)
41
39
 	 */
42
-	ldr	r1, =coherency_base
43
-	cmp	r1, #0
44
-	beq	2f
45
40
 	adr	r1, 3f
46
41
 	ldr	r3, [r1]
47
42
 	ldr	r1, [r1, r3]
..
..
@@ -66,7 +61,7 @@
66
61
  * fabric registers
67
62
  */
68
63
 ENTRY(ll_get_coherency_cpumask)
69
-	mrc	15, 0, r3, cr0, cr0, 5
64
+	mrc	p15, 0, r3, cr0, cr0, 5
70
65
 	and	r3, r3, #15
71
66
 	mov	r2, #(1 << 24)
72
67
 	lsl	r3, r2, r3