[GIT PULL 0/2] s390/cpacf: base patches for msa8 cpu model

[GIT PULL 0/2] s390/cpacf: base patches for msa8 cpu model

[Christian Borntraeger]

Martin,

please pull the following branch to get two base patches that are
needed for the s390/kvm cpu model into your features branch.

I will also pull this branch as a base for an additional KVM patch.
The pull request for the KVM maintainers will follow after this one.

The following changes since commit 97da3854c526d3a6ee05c849c96e48d21527606c:

  Linux 4.11-rc3 (2017-03-19 19:09:39 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  s390forkvm

for you to fetch changes up to 152c1c8d60ebedce8cc912c12f9be9ceca6c6671:

  s390/cpacf: Introduce kma instruction (2017-04-26 14:15:43 +0200)

----------------------------------------------------------------
Jason J. Herne (2):
      s390/cpacf: query instructions use unique parameters for compatibility with KMA
      s390/cpacf: Introduce kma instruction

 arch/s390/include/asm/cpacf.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[GIT PULL 1/2] s390/cpacf: query instructions use unique parameters for compatibility with KMA

[Christian Borntraeger]

From: "Jason J. Herne" <jjherne@linux.vnet.ibm.com>

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

Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Acked-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/include/asm/cpacf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h
index e2dfbf2..175a5d7 100644
--- a/arch/s390/include/asm/cpacf.h
+++ b/arch/s390/include/asm/cpacf.h
@@ -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)
-- 
2.7.4

[GIT PULL 2/2] s390/cpacf: Introduce kma instruction

[Christian Borntraeger]

From: "Jason J. Herne" <jjherne@linux.vnet.ibm.com>

Provide a kma instruction definition for use by callers of __cpacf_query.

Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/include/asm/cpacf.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h
index 175a5d7..31cac7d 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_PPNO		0xb93c		/* MSA5 */
+#define CPACF_KMA		0xb929		/* MSA8 */
 
 /*
  * En/decryption modifier bits
-- 
2.7.4

Re: [GIT PULL 0/2] s390/cpacf: base patches for msa8 cpu model

[Martin Schwidefsky]

On Wed, 26 Apr 2017 14:38:09 +0200
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> Martin,
> 
> please pull the following branch to get two base patches that are
> needed for the s390/kvm cpu model into your features branch.
> 
> I will also pull this branch as a base for an additional KVM patch.
> The pull request for the KVM maintainers will follow after this one.
> 
> The following changes since commit 97da3854c526d3a6ee05c849c96e48d21527606c:
> 
>   Linux 4.11-rc3 (2017-03-19 19:09:39 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  s390forkvm
> 
> for you to fetch changes up to 152c1c8d60ebedce8cc912c12f9be9ceca6c6671:
> 
>   s390/cpacf: Introduce kma instruction (2017-04-26 14:15:43 +0200)
> 
> ----------------------------------------------------------------
> Jason J. Herne (2):
>       s390/cpacf: query instructions use unique parameters for compatibility with KMA
>       s390/cpacf: Introduce kma instruction
> 
>  arch/s390/include/asm/cpacf.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Now merged with linux-s390:features. Thanks.

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.