Commit a8b3b0c9 authored Sep 02, 2016 by Paul Burton Committed by Ralf Baechle Jan 03, 2017

MIPS: Netlogic: Fix assembler warning from smpboot.S



The netlogic platform can be built for either MIPS32 or MIPS64, and when
built for MIPS32 (as by nlm_xlr_defconfig) the use of the dla
pseudo-instruction leads to warnings such as the following from recent
versions of the GNU assembler:

  arch/mips/netlogic/common/smpboot.S: Assembler messages:
  arch/mips/netlogic/common/smpboot.S:62: Warning: dla used to load 32-bit register; recommend using la instead
  arch/mips/netlogic/common/smpboot.S:63: Warning: dla used to load 32-bit register; recommend using la instead

Avoid these warnings by using the PTR_LA macro to make use of the
appropriate la or dla pseudo-instruction for the build.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 66d29985 ("MIPS: Netlogic: Merge some of XLR/XLP wakup code")
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14185/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent f44374f1

arch/mips/netlogic/common/smpboot.S

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -59,8 +59,8 @@ NESTED(xlp_boot_core0_siblings, PT_SIZE, sp)
	sync		sync
	/* find the location to which nlm_boot_siblings was relocated */		/* find the location to which nlm_boot_siblings was relocated */
	li t0, CKSEG1ADDR(RESET_VEC_PHYS)		li t0, CKSEG1ADDR(RESET_VEC_PHYS)
	dla t1, nlm_reset_entry		PTR_LA t1, nlm_reset_entry
	dla t2, nlm_boot_siblings		PTR_LA t2, nlm_boot_siblings
	dsubu t2, t1		dsubu t2, t1
	daddu t2, t0		daddu t2, t0
	/* call it */		/* call it */