Эх сурвалжийг харах

[ARM] Feroceon: don't disable BPU on boot

On Feroceon platforms that have a branch prediction unit, bit 11 of the
cp15 control register controls the BPU.  This patch keeps the old value
of this bit instead of always clearing it.

Signed-off-by: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Saeed Bishara 17 жил өмнө
parent
commit
188237e28d

+ 5 - 4
arch/arm/mm/proc-feroceon.S

@@ -493,14 +493,15 @@ __feroceon_setup:
 	.size	__feroceon_setup, . - __feroceon_setup
 	.size	__feroceon_setup, . - __feroceon_setup
 
 
 	/*
 	/*
-	 *  R
-	 * .RVI ZFRS BLDP WCAM
-	 * .011 0001 ..11 0101
+	 *      B
+	 *  R   P
+	 * .RVI UFRS BLDP WCAM
+	 * .011 .001 ..11 0101
 	 *
 	 *
 	 */
 	 */
 	.type	feroceon_crval, #object
 	.type	feroceon_crval, #object
 feroceon_crval:
 feroceon_crval:
-	crval	clear=0x00007f3f, mmuset=0x00003135, ucset=0x00001134
+	crval	clear=0x0000773f, mmuset=0x00003135, ucset=0x00001134
 
 
 	__INITDATA
 	__INITDATA