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

Commit b112a2df authored by Jason J. Herne's avatar Jason J. Herne Committed by Christian Borntraeger
Browse files

s390/cpacf: query instructions use unique parameters for compatibility with KMA 



The new KMA instruction requires unique parameters. Update __cpacf_query to
generate a compatible assembler instruction.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Acked-by: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 97da3854

arch/s390/include/asm/cpacf.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask) 


	asm volatile(

		"	spm 0\n" /* pckmo doesn't change the cc */

		/* Parameter registers are ignored, but may not be 0 */

		"0:	.insn	rrf,%[opc] << 16,2,2,2,0\n"

		/* Parameter regs are ignored, but must be nonzero and unique */

		"0:	.insn	rrf,%[opc] << 16,2,4,6,0\n"

		"	brc	1,0b\n"	/* handle partial completion */

		: "=m" (*mask)

		: [fc] "d" (r0), [pba] "a" (r1), [opc] "i" (opcode)