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

Commit 23d18e8d authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/cleanup: rename SPP to LPP 



The set-program-parameter (SPP) instruction has been renamed to
load-program-parameter (LPP) (see SA23-2260).  Reflect this change
and rename all macro/instruction references.

Also remove the duplicate SPP/LPP entry in the kernel disassembler
instruction list.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent abf09bed

arch/s390/include/asm/cpu_mf.h

+2 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 
/* CPU measurement facility support */

static inline int cpum_cf_avail(void)

{

	return MACHINE_HAS_SPP && test_facility(67);

	return MACHINE_HAS_LPP && test_facility(67);

}



static inline int cpum_sf_avail(void)

{

	return MACHINE_HAS_SPP && test_facility(68);

	return MACHINE_HAS_LPP && test_facility(68);

}

arch/s390/include/asm/setup.h

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern unsigned int s390_user_mode; 
#define MACHINE_FLAG_EDAT1	(1UL << 10)

#define MACHINE_FLAG_EDAT2	(1UL << 11)

#define MACHINE_FLAG_LPAR	(1UL << 12)

#define MACHINE_FLAG_SPP	(1UL << 13)

#define MACHINE_FLAG_LPP	(1UL << 13)

#define MACHINE_FLAG_TOPOLOGY	(1UL << 14)

#define MACHINE_FLAG_TE		(1UL << 15)

#define MACHINE_FLAG_RRBM	(1UL << 16)
@@ -98,7 +98,7 @@ extern unsigned int s390_user_mode; 
#define MACHINE_HAS_MVCOS	(0)

#define MACHINE_HAS_EDAT1	(0)

#define MACHINE_HAS_EDAT2	(0)

#define MACHINE_HAS_SPP		(0)

#define MACHINE_HAS_LPP		(0)

#define MACHINE_HAS_TOPOLOGY	(0)

#define MACHINE_HAS_TE		(0)

#define MACHINE_HAS_RRBM	(0)
@@ -111,7 +111,7 @@ extern unsigned int s390_user_mode; 
#define MACHINE_HAS_MVCOS	(S390_lowcore.machine_flags & MACHINE_FLAG_MVCOS)

#define MACHINE_HAS_EDAT1	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT1)

#define MACHINE_HAS_EDAT2	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT2)

#define MACHINE_HAS_SPP		(S390_lowcore.machine_flags & MACHINE_FLAG_SPP)

#define MACHINE_HAS_LPP		(S390_lowcore.machine_flags & MACHINE_FLAG_LPP)

#define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)

#define MACHINE_HAS_TE		(S390_lowcore.machine_flags & MACHINE_FLAG_TE)

#define MACHINE_HAS_RRBM	(S390_lowcore.machine_flags & MACHINE_FLAG_RRBM)

arch/s390/kernel/dis.c

+0 −1
Original line number Diff line number Diff line
@@ -840,7 +840,6 @@ static struct insn opcode_b2[] = { 
	{ "stcke", 0x78, INSTR_S_RD },

	{ "sacf", 0x79, INSTR_S_RD },

	{ "stsi", 0x7d, INSTR_S_RD },

	{ "spp", 0x80, INSTR_S_RD },

	{ "srnm", 0x99, INSTR_S_RD },

	{ "stfpc", 0x9c, INSTR_S_RD },

	{ "lfpc", 0x9d, INSTR_S_RD },

arch/s390/kernel/early.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static __init void detect_machine_facilities(void) 
	if (test_facility(27))

		S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS;

	if (test_facility(40))

		S390_lowcore.machine_flags |= MACHINE_FLAG_SPP;

		S390_lowcore.machine_flags |= MACHINE_FLAG_LPP;

	if (test_facility(50) && test_facility(73))

		S390_lowcore.machine_flags |= MACHINE_FLAG_TE;

	if (test_facility(66))

arch/s390/kernel/entry64.S

+5 −5
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING) 
#endif

	.endm



	.macro SPP newpp

	.macro LPP newpp

#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_SPP

	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_LPP

	jz	.+8

	.insn	s,0xb2800000,\newpp

#endif
@@ -96,7 +96,7 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING) 
	jhe	.+22

	.endif

	lg	%r9,BASED(.Lsie_loop)

	SPP	BASED(.Lhost_id)	# set host id

	LPP	BASED(.Lhost_id)	# set host id

#endif

	.endm
@@ -967,10 +967,10 @@ sie_loop: 
	lctlg	%c1,%c1,__GMAP_ASCE(%r14)	# load primary asce

sie_gmap:

	lg	%r14,__SF_EMPTY(%r15)		# get control block pointer

	SPP	__SF_EMPTY(%r15)		# set guest id

	LPP	__SF_EMPTY(%r15)		# set guest id

	sie	0(%r14)

sie_done:

	SPP	__SF_EMPTY+16(%r15)		# set host id

	LPP	__SF_EMPTY+16(%r15)		# set host id

	lg	%r14,__LC_THREAD_INFO		# pointer thread_info struct

sie_exit:

	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce