Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41cacac6 authored by LEROY Christophe's avatar LEROY Christophe Committed by Scott Wood
Browse files

powerpc/8xx: Optimize verification in FixupDAR 



By XORing the upper part of the instruction code, we get a value that can
directly be verified with the second test and we can remove the first test.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 5bcbe24f

arch/powerpc/kernel/head_8xx.S

+2 −4
Original line number Diff line number Diff line
@@ -548,10 +548,8 @@ FixupDAR:/* Entry point for dcbx workaround. */ 
/* Check if it really is a dcbx instruction. */

/* dcbt and dcbtst does not generate DTLB Misses/Errors,

 * no need to include them here */

	srwi	r10, r11, 26	/* check if major OP code is 31 */

	cmpwi	cr0, r10, 31

	bne-	141f

	rlwinm	r10, r11, 0, 21, 30

	xoris	r10, r11, 0x7c00	/* check if major OP code is 31 */

	rlwinm	r10, r10, 0, 21, 5

	cmpwi	cr0, r10, 2028	/* Is dcbz? */

	beq+	142f

	cmpwi	cr0, r10, 940	/* Is dcbi? */