MIPS: SGI-IP27: move IP27 specific macro to IP27 specific header file (58fd034d) · Commits · 戴 / test

Extracting node id from HUB register is specific to IP27 alias SN0. Move the macro definition to a SN0 header file. Signed-off-by:

Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by:

Paul Burton <paulburton@kernel.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org

arch/mips/include/asm/mach-ip27/kernel-entry-init.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -13,16 +13,6 @@
		#include <asm/sn/agent.h>
		#include <asm/sn/klkernvars.h>

		/*
		* Returns the local nasid into res.
		*/
		.macro GET_NASID_ASM res
		dli \res, LOCAL_HUB_ADDR(NI_STATUS_REV_ID)
		ld \res, (\res)
		and \res, NSRI_NODEID_MASK
		dsrl \res, NSRI_NODEID_SHFT
		.endm

		/*
		* TLB bits
		*/

arch/mips/include/asm/sn/sn0/hub.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -37,4 +37,16 @@
		#define UATTR_MSPEC 2
		#define UATTR_UNCAC 3

		#ifdef __ASSEMBLY__
		/*
		* Returns the local nasid into res.
		*/
		.macro GET_NASID_ASM res
		dli \res, LOCAL_HUB_ADDR(NI_STATUS_REV_ID)
		ld \res, (\res)
		and \res, NSRI_NODEID_MASK
		dsrl \res, NSRI_NODEID_SHFT
		.endm
		#endif

		#endif /* _ASM_SN_SN0_HUB_H */

Admin message