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

Commit ea168857 authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

MIPS: Fix MSA ld_*/st_* asm macros to use PTR_ADDU 



The MSA ld_*/st_* assembler macros for when the toolchain doesn't
support MSA use addu to offset the base address. However it is a virtual
memory pointer so fix it to use PTR_ADDU which expands to daddu for
64-bit kernels.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.3.y-
Patchwork: https://patchwork.linux-mips.org/patch/13062/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8a3c8b48

arch/mips/include/asm/asmmacro.h

+8 −8
Original line number Original line Diff line number Diff line
@@ -393,7 +393,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	LDB_MSA_INSN | (\wd << 6)

	.word	LDB_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -402,7 +402,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	LDH_MSA_INSN | (\wd << 6)

	.word	LDH_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -411,7 +411,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	LDW_MSA_INSN | (\wd << 6)

	.word	LDW_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -420,7 +420,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	LDD_MSA_INSN | (\wd << 6)

	.word	LDD_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -429,7 +429,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	STB_MSA_INSN | (\wd << 6)

	.word	STB_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -438,7 +438,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	STH_MSA_INSN | (\wd << 6)

	.word	STH_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -447,7 +447,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	STW_MSA_INSN | (\wd << 6)

	.word	STW_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm
@@ -456,7 +456,7 @@ 
	.set	push

	.set	push

	.set	noat

	.set	noat

	SET_HARDFLOAT

	SET_HARDFLOAT

	addu	$1, \base, \off

	PTR_ADDU $1, \base, \off

	.word	STD_MSA_INSN | (\wd << 6)

	.word	STD_MSA_INSN | (\wd << 6)

	.set	pop

	.set	pop

	.endm

	.endm