Commit b985c99d authored by He Sheng's avatar He Sheng Committed by guzitao
Browse files

sw64: rename static key and related simd libraries 

Sunway inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB73UR



--------------------------------

No functional change intended.

Signed-off-by: default avatarHe Sheng <hesheng@wxiat.com>
Reviewed-by: default avatarCui Wei <cuiwei@wxiat.com>
Signed-off-by: default avatarGu Zitao <guzitao@wxiat.com>
parent a0f11dff

arch/sw_64/include/asm/hw_init.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ DECLARE_STATIC_KEY_TRUE(run_mode_host_key); 
DECLARE_STATIC_KEY_FALSE(run_mode_guest_key);

DECLARE_STATIC_KEY_FALSE(run_mode_emul_key);



DECLARE_STATIC_KEY_FALSE(core_hw_una_enabled);

DECLARE_STATIC_KEY_FALSE(hw_una_enabled);



#define is_in_host()		static_branch_likely(&run_mode_host_key)

#define is_in_guest()		static_branch_unlikely(&run_mode_guest_key)

arch/sw_64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ DEFINE_STATIC_KEY_TRUE(run_mode_host_key); 
DEFINE_STATIC_KEY_FALSE(run_mode_guest_key);

DEFINE_STATIC_KEY_FALSE(run_mode_emul_key);



DEFINE_STATIC_KEY_FALSE(core_hw_una_enabled);

DEFINE_STATIC_KEY_FALSE(hw_una_enabled);



struct cpu_desc_t cpu_desc;

struct socket_desc_t socket_desc[MAX_NUMSOCKETS];

arch/sw_64/lib/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -20,18 +20,18 @@ lib-y = __divlu.o __remlu.o __divwu.o __remwu.o \ 
	uaccess.o



lib-clear_page-y := clear_page.o

lib-clear_page-$(CONFIG_DEEP_CLEAR_PAGE) := deep-clear_page.o

lib-clear_page-$(CONFIG_DEEP_CLEAR_PAGE) := clear_page_simd.o



lib-clear_user-y := clear_user.o deep-clear_user-no_una_check.o deep-clear_user-force_ali_addr.o

lib-clear_user-y := clear_user.o clear_user_simd.o clear_user_simd_align.o



lib-copy_page-y := copy_page.o

lib-copy_page-$(CONFIG_DEEP_COPY_PAGE) := deep-copy_page.o

lib-copy_page-$(CONFIG_DEEP_COPY_PAGE) := copy_page_simd.o



lib-copy_user-y := copy_user.o deep-copy_user-no_una_check.o deep-copy_user-force_ali_addr.o

lib-copy_user-y := copy_user.o copy_user_simd.o copy_user_simd_align.o



lib-memcpy-y := memcpy.o deep-memcpy-no_una_check.o deep-memcpy-force_ali_addr.o

lib-memcpy-y := memcpy.o memcpy_simd.o memcpy_simd_align.o



lib-memset-y := memset.o deep-memset-no_una_check.o deep-memset-force_ali_addr.o

lib-memset-y := memset.o memset_simd.o memset_simd_align.o



lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o

arch/sw_64/lib/deep-clear_user-no_una_check.S→arch/sw_64/lib/clear_user_simd.S

+5 −5
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
 * $18:	bytes left to copy

 *

 */

	.globl ____clear_user_simd_no_una_check

	.ent ____clear_user_simd_no_una_check

____clear_user_simd_no_una_check:

	.globl ____clear_user_simd

	.ent ____clear_user_simd

____clear_user_simd:

	.prologue 0

	bis	$31, $31, $7

	mov	$17, $18
@@ -38,7 +38,7 @@ ____clear_user_simd_no_una_check: 
#ifdef CONFIG_SUBARCH_C4

	csrr	$6, CSR_WR_FREGS

#endif

#include "deep-set_template-no_una_check.S"

#include "set_simd_template.S"

255:

	bis	$31, $18, $0

	beq	$7, $return
@@ -51,4 +51,4 @@ $return: 
	csrw	$6, CSR_WR_FREGS

#endif

	ret

	.end ____clear_user_simd_no_una_check
 
	.end ____clear_user_simd