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

Commit 9b3b331d authored by Grant Grundler's avatar Grant Grundler Committed by Kyle McMartin
Browse files

[PARISC] Properly specify index field to I/D cache flush ops 



replace use of "0" with "%r0" since PA 1.1 I/D flush ops only take a
general register and not an immediate value for the index field.
This just forces the code to always be PA 1.1 "clean".

From: Joel Soete <soete.joel@tiscali.be>
Signed-off-by: default avatarGrant Grundler <grundler@parisc-linux.org>

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 37318a3c

arch/parisc/kernel/pacache.S

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ flush_instruction_cache_local: 


fimanyloop:					/* Loop if LOOP >= 2 */

	ADDIB>		-1, %r31, fimanyloop	/* Adjusted inner loop decr */

	fice            0(%sr1, %arg0)

	fice            %r0(%sr1, %arg0)

	fice,m		%arg1(%sr1, %arg0)	/* Last fice and addr adjust */

	movb,tr		%arg3, %r31, fimanyloop	/* Re-init inner loop count */

	ADDIB<=,n	-1, %arg2, fisync	/* Outer loop decr */
@@ -269,7 +269,7 @@ flush_data_cache_local: 


fdmanyloop:					/* Loop if LOOP >= 2 */

	ADDIB>		-1, %r31, fdmanyloop	/* Adjusted inner loop decr */

	fdce		0(%sr1, %arg0)

	fdce		%r0(%sr1, %arg0)

	fdce,m		%arg1(%sr1, %arg0)	/* Last fdce and addr adjust */

	movb,tr		%arg3, %r31, fdmanyloop	/* Re-init inner loop count */

	ADDIB<=,n	-1, %arg2, fdsync	/* Outer loop decr */

arch/parisc/kernel/signal.c

+7 −4
Original line number Diff line number Diff line
@@ -625,11 +625,14 @@ do_signal(sigset_t *oldset, struct pt_regs *regs, int in_syscall) 
			put_user(0xe0008200, &usp[3]);

			put_user(0x34140000, &usp[4]);



			/* Stack is 64-byte aligned, and we only 

			 * need to flush 1 cache line */

			asm("fdc 0(%%sr3, %0)\n"

			/* Stack is 64-byte aligned, and we only need

			 * to flush 1 cache line.

			 * Flushing one cacheline is cheap.

			 * "sync" on bigger (> 4 way) boxes is not.

			 */

			asm("fdc %%r0(%%sr3, %0)\n"

			    "sync\n"

			    "fic 0(%%sr3, %0)\n"

			    "fic %%r0(%%sr3, %0)\n"

			    "sync\n"

			    : : "r"(regs->gr[30]));