Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features

Browse source 
Pull cpacf changes for KVM from Jason Herne:

Add query support for the KMA instruction.
This commit is contained in:
Martin Schwidefsky 2017-04-27 07:29:40 +02:00
commit d0790fb6e5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/s390/include/asm/cpacf.h
View file

@ -26,6 +26,7 @@
#define CPACF_PCC 0xb92c /* MSA4 */ #define CPACF_PCC 0xb92c /* MSA4 */
#define CPACF_KMCTR 0xb92d /* MSA4 */ #define CPACF_KMCTR 0xb92d /* MSA4 */
#define CPACF_PRNO 0xb93c /* MSA5 */ #define CPACF_PRNO 0xb93c /* MSA5 */
#define CPACF_KMA 0xb929 /* MSA8 */
/* /*
* En/decryption modifier bits * En/decryption modifier bits
@ -151,8 +152,8 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
asm volatile( asm volatile(
" spm 0\n" /* pckmo doesn't change the cc */ " spm 0\n" /* pckmo doesn't change the cc */
/* Parameter registers are ignored, but may not be 0 */ /* Parameter regs are ignored, but must be nonzero and unique */
"0: .insn rrf,%[opc] << 16,2,2,2,0\n" "0: .insn rrf,%[opc] << 16,2,4,6,0\n"
" brc 1,0b\n" /* handle partial completion */ " brc 1,0b\n" /* handle partial completion */
: "=m" (*mask) : "=m" (*mask)
: [fc] "d" (r0), [pba] "a" (r1), [opc] "i" (opcode) : [fc] "d" (r0), [pba] "a" (r1), [opc] "i" (opcode)