diff options
| author | Martin Schwidefsky | 2017-04-27 07:29:40 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2017-04-27 07:34:07 +0200 |
| commit | d0790fb6e5bc5a6bb923de9c2be7fc210d6b689b (patch) | |
| tree | 06e5eda704d2aee3c15c47d8a8f095ba8beac0bc | |
| parent | 284c43e6af415515865d2900d18d1382979c777c (diff) | |
| parent | 152c1c8d60ebedce8cc912c12f9be9ceca6c6671 (diff) | |
Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features
Pull cpacf changes for KVM from Jason Herne:
Add query support for the KMA instruction.
| -rw-r--r-- | arch/s390/include/asm/cpacf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h index 7707a35176c4..e06f2556b316 100644 --- a/arch/s390/include/asm/cpacf.h +++ b/arch/s390/include/asm/cpacf.h @@ -26,6 +26,7 @@ #define CPACF_PCC 0xb92c /* MSA4 */ #define CPACF_KMCTR 0xb92d /* MSA4 */ #define CPACF_PRNO 0xb93c /* MSA5 */ +#define CPACF_KMA 0xb929 /* MSA8 */ /* * En/decryption modifier bits @@ -151,8 +152,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) |