[PATCH] s390/zcrypt: Integrate ap_asm.h into include/asm/ap.h.
From: Harald Freudenberger
Date: Tue Jun 12 2018 - 09:42:36 EST
Move all the inline functions from the ap bus header
file ap_asm.h into the in-kernel api header file
arch/s390/include/asm/ap.h so that KVM can make use
of all the low level AP functions.
Signed-off-by: Harald Freudenberger <freude@xxxxxxxxxx>
---
 arch/s390/include/asm/ap.h    | 284 +++++++++++++++++++++++++++++----
 drivers/s390/crypto/ap_asm.h  | 261 ------------------------------
 drivers/s390/crypto/ap_bus.c  | 23 +--
 drivers/s390/crypto/ap_bus.h  |  1 +
 drivers/s390/crypto/ap_card.c |  1 -
 drivers/s390/crypto/ap_queue.c |  1 -
 6 files changed, 260 insertions(+), 311 deletions(-)
 delete mode 100644 drivers/s390/crypto/ap_asm.h
diff --git a/arch/s390/include/asm/ap.h b/arch/s390/include/asm/ap.h
index c1bedb4c8de0..887494aa164f 100644
--- a/arch/s390/include/asm/ap.h
+++ b/arch/s390/include/asm/ap.h
@@ -46,6 +46,50 @@ struct ap_queue_status {
    unsigned int _pad2      : 16;
 };
Â
+/**
+ * ap_intructions_available() - Test if AP instructions are available.
+ *
+ * Returns 1 if the AP instructions are installed, otherwise 0.
+ */
+static inline int ap_instructions_available(void)
+{
+Â Â Â register unsigned long reg0 asm ("0") = AP_MKQID(0, 0);
+Â Â Â register unsigned long reg1 asm ("1") = 0;
+Â Â Â register unsigned long reg2 asm ("2") = 0;
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â "Â Â .long 0xb2af0000\n"Â Â Â Â Â Â /* PQAP(TAPQ) */
+      "0: la   %0,1\n"
+Â Â Â Â Â Â "1:\n"
+Â Â Â Â Â Â EX_TABLE(0b, 1b)
+Â Â Â Â Â Â : "+d" (reg1), "+d" (reg2)
+Â Â Â Â Â Â : "d" (reg0)
+Â Â Â Â Â Â : "cc");
+Â Â Â return reg1;
+}
+
+/**
+ * ap_tapq(): Test adjunct processor queue.
+ * @qid: The AP queue number
+ * @info: Pointer to queue descriptor
+ *
+ * Returns AP queue status structure.
+ */
+static inline struct ap_queue_status ap_tapq(ap_qid_t qid, unsigned long *info)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid;
+Â Â Â register struct ap_queue_status reg1 asm ("1");
+Â Â Â register unsigned long reg2 asm ("2");
+
+Â Â Â asm volatile(".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(TAPQ) */
+Â Â Â Â Â Â Â Â Â Â : "=d" (reg1), "=d" (reg2)
+Â Â Â Â Â Â Â Â Â Â : "d" (reg0)
+Â Â Â Â Â Â Â Â Â Â : "cc");
+Â Â Â if (info)
+Â Â Â Â Â Â *info = reg2;
+Â Â Â return reg1;
+}
+
 /**
 * ap_test_queue(): Test adjunct processor queue.
 * @qid: The AP queue number
@@ -54,10 +98,57 @@ struct ap_queue_status {
 *
 * Returns AP queue status structure.
 */
-struct ap_queue_status ap_test_queue(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int tbit,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long *info);
+static inline struct ap_queue_status ap_test_queue(ap_qid_t qid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int tbit,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long *info)
+{
+Â Â Â if (tbit)
+Â Â Â Â Â Â qid |= 1UL << 23; /* set T bit*/
+Â Â Â return ap_tapq(qid, info);
+}
Â
+/**
+ * ap_pqap_rapq(): Reset adjunct processor queue.
+ * @qid: The AP queue number
+ *
+ * Returns AP queue status structure.
+ */
+static inline struct ap_queue_status ap_rapq(ap_qid_t qid)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid | (1UL << 24);
+Â Â Â register struct ap_queue_status reg1 asm ("1");
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(RAPQ) */
+Â Â Â Â Â Â : "=d" (reg1)
+Â Â Â Â Â Â : "d" (reg0)
+Â Â Â Â Â Â : "cc");
+Â Â Â return reg1;
+}
+
+/**
+ * ap_pqap_zapq(): Reset and zeroize adjunct processor queue.
+ * @qid: The AP queue number
+ *
+ * Returns AP queue status structure.
+ */
+static inline struct ap_queue_status ap_zapq(ap_qid_t qid)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid | (2UL << 24);
+Â Â Â register struct ap_queue_status reg1 asm ("1");
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(ZAPQ) */
+Â Â Â Â Â Â : "=d" (reg1)
+Â Â Â Â Â Â : "d" (reg0)
+Â Â Â Â Â Â : "cc");
+Â Â Â return reg1;
+}
+
+/**
+ * struct ap_config_info - convenience struct for AP crypto
+ * config info as returned by the ap_qci() function.
+ */
 struct ap_config_info {
    unsigned int apsc    : 1;   /* S bit */
    unsigned int apxa    : 1;   /* N bit */
@@ -74,50 +165,189 @@ struct ap_config_info {
    unsigned char _reserved4[16];
 } __aligned(8);
Â
-/*
- * ap_query_configuration(): Fetch cryptographic config info
+/**
+ * ap_qci(): Get AP configuration data
 *
- * Returns the ap configuration info fetched via PQAP(QCI).
- * On success 0 is returned, on failure a negative errno
- * is returned, e.g. if the PQAP(QCI) instruction is not
- * available, the return value will be -EOPNOTSUPP.
+ * Returns 0 on success, or -EOPNOTSUPP.
 */
-int ap_query_configuration(struct ap_config_info *info);
+static inline int ap_qci(struct ap_config_info *config)
+{
+Â Â Â register unsigned long reg0 asm ("0") = 4UL << 24;
+Â Â Â register unsigned long reg1 asm ("1") = -EOPNOTSUPP;
+Â Â Â register struct ap_config_info *reg2 asm ("2") = config;
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â ".long 0xb2af0000\n"Â Â Â Â Â Â /* PQAP(QCI) */
+      "0: la   %0,0\n"
+Â Â Â Â Â Â "1:\n"
+Â Â Â Â Â Â EX_TABLE(0b, 1b)
+Â Â Â Â Â Â : "+d" (reg1)
+Â Â Â Â Â Â : "d" (reg0), "d" (reg2)
+Â Â Â Â Â Â : "cc", "memory");
+
+Â Â Â return reg1;
+}
Â
 /*
 * struct ap_qirq_ctrl - convenient struct for easy invocation
- * of the ap_queue_irq_ctrl() function. This struct is passed
- * as GR1 parameter to the PQAP(AQIC) instruction. For details
- * please see the AR documentation.
+ * of the ap_aqic() function. This struct is passed as GR1
+ * parameter to the PQAP(AQIC) instruction. For details please
+ * see the AR documentation.
 */
 struct ap_qirq_ctrl {
    unsigned int _res1 : 8;
-   unsigned int zone : 8; /* zone info */
-   unsigned int ir   : 1; /* ir flag: enable (1) or disable (0) irq */
+   unsigned int zone : 8;   /* zone info */
+   unsigned int ir   : 1;   /* ir flag: enable (1) or disable (0) irq */
    unsigned int _res2 : 4;
-   unsigned int gisc : 3; /* guest isc field */
+   unsigned int gisc : 3;   /* guest isc field */
    unsigned int _res3 : 6;
-   unsigned int gf   : 2; /* gisa format */
+   unsigned int gf   : 2;   /* gisa format */
    unsigned int _res4 : 1;
-   unsigned int gisa : 27; /* gisa origin */
+   unsigned int gisa : 27;   /* gisa origin */
    unsigned int _res5 : 1;
-   unsigned int isc  : 3; /* irq sub class */
+   unsigned int isc  : 3;   /* irq sub class */
 };
Â
 /**
- * ap_queue_irq_ctrl(): Control interruption on a AP queue.
+ * ap_aqic(): Control interruption for a specific AP.
 * @qid: The AP queue number
- * @qirqctrl: struct ap_qirq_ctrl, see above
+ * @qirqctrl: struct ap_qirq_ctrl (64 bit value)
 * @ind: The notification indicator byte
 *
 * Returns AP queue status.
+ */
+static inline struct ap_queue_status ap_aqic(ap_qid_t qid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct ap_qirq_ctrl qirqctrl,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *ind)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid | (3UL << 24);
+Â Â Â register struct ap_qirq_ctrl reg1_in asm ("1") = qirqctrl;
+Â Â Â register struct ap_queue_status reg1_out asm ("1");
+Â Â Â register void *reg2 asm ("2") = ind;
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(AQIC) */
+Â Â Â Â Â Â : "=d" (reg1_out)
+Â Â Â Â Â Â : "d" (reg0), "d" (reg1_in), "d" (reg2)
+Â Â Â Â Â Â : "cc");
+Â Â Â return reg1_out;
+}
+
+/*
+ * union ap_qact_ap_info - used together with the
+ * ap_aqic() function to provide a convenient way
+ * to handle the ap info needed by the qact function.
+ */
+union ap_qact_ap_info {
+Â Â Â unsigned long val;
+Â Â Â struct {
+      unsigned int    : 3;
+Â Â Â Â Â Â unsigned int mode : 3;
+      unsigned int    : 26;
+      unsigned int cat : 8;
+      unsigned int    : 8;
+Â Â Â Â Â Â unsigned char ver[2];
+Â Â Â };
+};
+
+/**
+ * ap_qact(): Query AP combatibility type.
+ * @qid: The AP queue number
+ * @apinfo: On input the info about the AP queue. On output the
+ *Â Â Â Â Â Â alternate AP queue info provided by the qact function
+ *Â Â Â Â Â Â in GR2 is stored in.
 *
- * Control interruption on the given AP queue.
- * Just a simple wrapper function for the low level PQAP(AQIC)
- * instruction available for other kernel modules.
+ * Returns AP queue status. Check response_code field for failures.
 */
-struct ap_queue_status ap_queue_irq_ctrl(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct ap_qirq_ctrl qirqctrl,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *ind);
+static inline struct ap_queue_status ap_qact(ap_qid_t qid, int ifbit,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â union ap_qact_ap_info *apinfo)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid | (5UL << 24)
+Â Â Â Â Â Â | ((ifbit & 0x01) << 22);
+Â Â Â register unsigned long reg1_in asm ("1") = apinfo->val;
+Â Â Â register struct ap_queue_status reg1_out asm ("1");
+Â Â Â register unsigned long reg2 asm ("2");
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(QACT) */
+Â Â Â Â Â Â : "+d" (reg1_in), "=d" (reg1_out), "=d" (reg2)
+Â Â Â Â Â Â : "d" (reg0)
+Â Â Â Â Â Â : "cc");
+Â Â Â apinfo->val = reg2;
+Â Â Â return reg1_out;
+}
+
+/**
+ * ap_nqap(): Send message to adjunct processor queue.
+ * @qid: The AP queue number
+ * @psmid: The program supplied message identifier
+ * @msg: The message text
+ * @length: The message length
+ *
+ * Returns AP queue status structure.
+ * Condition code 1 on NQAP can't happen because the L bit is 1.
+ * Condition code 2 on NQAP also means the send is incomplete,
+ * because a segment boundary was reached. The NQAP is repeated.
+ */
+static inline struct ap_queue_status ap_nqap(ap_qid_t qid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long long psmid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *msg, size_t length)
+{
+Â Â Â register unsigned long reg0 asm ("0") = qid | 0x40000000UL;
+Â Â Â register struct ap_queue_status reg1 asm ("1");
+Â Â Â register unsigned long reg2 asm ("2") = (unsigned long) msg;
+Â Â Â register unsigned long reg3 asm ("3") = (unsigned long) length;
+Â Â Â register unsigned long reg4 asm ("4") = (unsigned int) (psmid >> 32);
+Â Â Â register unsigned long reg5 asm ("5") = psmid & 0xffffffff;
+
+Â Â Â asm volatile (
+Â Â Â Â Â Â "0: .long 0xb2ad0042\n"Â Â Â Â Â Â /* NQAP */
+      "  brc  2,0b"
+Â Â Â Â Â Â : "+d" (reg0), "=d" (reg1), "+d" (reg2), "+d" (reg3)
+Â Â Â Â Â Â : "d" (reg4), "d" (reg5)
+Â Â Â Â Â Â : "cc", "memory");
+Â Â Â return reg1;
+}
+
+/**
+ * ap_dqap(): Receive message from adjunct processor queue.
+ * @qid: The AP queue number
+ * @psmid: Pointer to program supplied message identifier
+ * @msg: The message text
+ * @length: The message length
+ *
+ * Returns AP queue status structure.
+ * Condition code 1 on DQAP means the receive has taken place
+ * but only partially.   The response is incomplete, hence the
+ * DQAP is repeated.
+ * Condition code 2 on DQAP also means the receive is incomplete,
+ * this time because a segment boundary was reached. Again, the
+ * DQAP is repeated.
+ * Note that gpr2 is used by the DQAP instruction to keep track of
+ * any 'residual' length, in case the instruction gets interrupted.
+ * Hence it gets zeroed before the instruction.
+ */
+static inline struct ap_queue_status ap_dqap(ap_qid_t qid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long long *psmid,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *msg, size_t length)
+{
+Â Â Â register unsigned long reg0 asm("0") = qid | 0x80000000UL;
+Â Â Â register struct ap_queue_status reg1 asm ("1");
+Â Â Â register unsigned long reg2 asm("2") = 0UL;
+Â Â Â register unsigned long reg4 asm("4") = (unsigned long) msg;
+Â Â Â register unsigned long reg5 asm("5") = (unsigned long) length;
+Â Â Â register unsigned long reg6 asm("6") = 0UL;
+Â Â Â register unsigned long reg7 asm("7") = 0UL;
+
+
+Â Â Â asm volatile(
+Â Â Â Â Â Â "0: .long 0xb2ae0064\n"Â Â Â Â Â Â /* DQAP */
+      "  brc  6,0b\n"
+Â Â Â Â Â Â : "+d" (reg0), "=d" (reg1), "+d" (reg2),
+Â Â Â Â Â Â Â "+d" (reg4), "+d" (reg5), "+d" (reg6), "+d" (reg7)
+Â Â Â Â Â Â : : "cc", "memory");
+Â Â Â *psmid = (((unsigned long long) reg6) << 32) + reg7;
+Â Â Â return reg1;
+}
Â
 #endif /* _ASM_S390_AP_H_ */
diff --git a/drivers/s390/crypto/ap_asm.h b/drivers/s390/crypto/ap_asm.h
deleted file mode 100644
index e22ee126c9df..000000000000
--- a/drivers/s390/crypto/ap_asm.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright IBM Corp. 2016
- * Author(s): Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
- *
- * Adjunct processor bus inline assemblies.
- */
-
-#ifndef _AP_ASM_H_
-#define _AP_ASM_H_
-
-#include <asm/isc.h>
-
-/**
- * ap_intructions_available() - Test if AP instructions are available.
- *
- * Returns 0 if the AP instructions are installed.
- */
-static inline int ap_instructions_available(void)
-{
-Â Â Â register unsigned long reg0 asm ("0") = AP_MKQID(0, 0);
-Â Â Â register unsigned long reg1 asm ("1") = -ENODEV;
-Â Â Â register unsigned long reg2 asm ("2");
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â "Â Â .long 0xb2af0000\n"Â Â Â Â Â Â /* PQAP(TAPQ) */
-      "0: la   %0,0\n"
-Â Â Â Â Â Â "1:\n"
-Â Â Â Â Â Â EX_TABLE(0b, 1b)
-Â Â Â Â Â Â : "+d" (reg1), "=d" (reg2)
-Â Â Â Â Â Â : "d" (reg0)
-Â Â Â Â Â Â : "cc");
-Â Â Â return reg1;
-}
-
-/**
- * ap_tapq(): Test adjunct processor queue.
- * @qid: The AP queue number
- * @info: Pointer to queue descriptor
- *
- * Returns AP queue status structure.
- */
-static inline struct ap_queue_status ap_tapq(ap_qid_t qid, unsigned long *info)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid;
-Â Â Â register struct ap_queue_status reg1 asm ("1");
-Â Â Â register unsigned long reg2 asm ("2");
-
-Â Â Â asm volatile(".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(TAPQ) */
-Â Â Â Â Â Â Â Â Â Â : "=d" (reg1), "=d" (reg2)
-Â Â Â Â Â Â Â Â Â Â : "d" (reg0)
-Â Â Â Â Â Â Â Â Â Â : "cc");
-Â Â Â if (info)
-Â Â Â Â Â Â *info = reg2;
-Â Â Â return reg1;
-}
-
-/**
- * ap_pqap_rapq(): Reset adjunct processor queue.
- * @qid: The AP queue number
- *
- * Returns AP queue status structure.
- */
-static inline struct ap_queue_status ap_rapq(ap_qid_t qid)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid | (1UL << 24);
-Â Â Â register struct ap_queue_status reg1 asm ("1");
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(RAPQ) */
-Â Â Â Â Â Â : "=d" (reg1)
-Â Â Â Â Â Â : "d" (reg0)
-Â Â Â Â Â Â : "cc");
-Â Â Â return reg1;
-}
-
-/**
- * ap_pqap_zapq(): Reset and zeroize adjunct processor queue.
- * @qid: The AP queue number
- *
- * Returns AP queue status structure.
- */
-static inline struct ap_queue_status ap_zapq(ap_qid_t qid)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid | (2UL << 24);
-Â Â Â register struct ap_queue_status reg1 asm ("1");
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(ZAPQ) */
-Â Â Â Â Â Â : "=d" (reg1)
-Â Â Â Â Â Â : "d" (reg0)
-Â Â Â Â Â Â : "cc");
-Â Â Â return reg1;
-}
-
-/**
- * ap_aqic(): Control interruption for a specific AP.
- * @qid: The AP queue number
- * @qirqctrl: struct ap_qirq_ctrl (64 bit value)
- * @ind: The notification indicator byte
- *
- * Returns AP queue status.
- */
-static inline struct ap_queue_status ap_aqic(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct ap_qirq_ctrl qirqctrl,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *ind)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid | (3UL << 24);
-Â Â Â register struct ap_qirq_ctrl reg1_in asm ("1") = qirqctrl;
-Â Â Â register struct ap_queue_status reg1_out asm ("1");
-Â Â Â register void *reg2 asm ("2") = ind;
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(AQIC) */
-Â Â Â Â Â Â : "=d" (reg1_out)
-Â Â Â Â Â Â : "d" (reg0), "d" (reg1_in), "d" (reg2)
-Â Â Â Â Â Â : "cc");
-Â Â Â return reg1_out;
-}
-
-/**
- * ap_qci(): Get AP configuration data
- *
- * Returns 0 on success, or -EOPNOTSUPP.
- */
-static inline int ap_qci(void *config)
-{
-Â Â Â register unsigned long reg0 asm ("0") = 4UL << 24;
-Â Â Â register unsigned long reg1 asm ("1") = -EINVAL;
-Â Â Â register void *reg2 asm ("2") = (void *) config;
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â ".long 0xb2af0000\n"Â Â Â Â Â Â /* PQAP(QCI) */
-      "0: la   %0,0\n"
-Â Â Â Â Â Â "1:\n"
-Â Â Â Â Â Â EX_TABLE(0b, 1b)
-Â Â Â Â Â Â : "+d" (reg1)
-Â Â Â Â Â Â : "d" (reg0), "d" (reg2)
-Â Â Â Â Â Â : "cc", "memory");
-
-Â Â Â return reg1;
-}
-
-/*
- * union ap_qact_ap_info - used together with the
- * ap_aqic() function to provide a convenient way
- * to handle the ap info needed by the qact function.
- */
-union ap_qact_ap_info {
-Â Â Â unsigned long val;
-Â Â Â struct {
-      unsigned int    : 3;
-Â Â Â Â Â Â unsigned int mode : 3;
-      unsigned int    : 26;
-      unsigned int cat : 8;
-      unsigned int    : 8;
-Â Â Â Â Â Â unsigned char ver[2];
-Â Â Â };
-};
-
-/**
- * ap_qact(): Query AP combatibility type.
- * @qid: The AP queue number
- * @apinfo: On input the info about the AP queue. On output the
- *Â Â Â Â Â Â alternate AP queue info provided by the qact function
- *Â Â Â Â Â Â in GR2 is stored in.
- *
- * Returns AP queue status. Check response_code field for failures.
- */
-static inline struct ap_queue_status ap_qact(ap_qid_t qid, int ifbit,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â union ap_qact_ap_info *apinfo)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid | (5UL << 24)
-Â Â Â Â Â Â | ((ifbit & 0x01) << 22);
-Â Â Â register unsigned long reg1_in asm ("1") = apinfo->val;
-Â Â Â register struct ap_queue_status reg1_out asm ("1");
-Â Â Â register unsigned long reg2 asm ("2");
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â ".long 0xb2af0000"Â Â Â Â Â Â /* PQAP(QACT) */
-Â Â Â Â Â Â : "+d" (reg1_in), "=d" (reg1_out), "=d" (reg2)
-Â Â Â Â Â Â : "d" (reg0)
-Â Â Â Â Â Â : "cc");
-Â Â Â apinfo->val = reg2;
-Â Â Â return reg1_out;
-}
-
-/**
- * ap_nqap(): Send message to adjunct processor queue.
- * @qid: The AP queue number
- * @psmid: The program supplied message identifier
- * @msg: The message text
- * @length: The message length
- *
- * Returns AP queue status structure.
- * Condition code 1 on NQAP can't happen because the L bit is 1.
- * Condition code 2 on NQAP also means the send is incomplete,
- * because a segment boundary was reached. The NQAP is repeated.
- */
-static inline struct ap_queue_status ap_nqap(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long long psmid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *msg, size_t length)
-{
-Â Â Â register unsigned long reg0 asm ("0") = qid | 0x40000000UL;
-Â Â Â register struct ap_queue_status reg1 asm ("1");
-Â Â Â register unsigned long reg2 asm ("2") = (unsigned long) msg;
-Â Â Â register unsigned long reg3 asm ("3") = (unsigned long) length;
-Â Â Â register unsigned long reg4 asm ("4") = (unsigned int) (psmid >> 32);
-Â Â Â register unsigned long reg5 asm ("5") = psmid & 0xffffffff;
-
-Â Â Â asm volatile (
-Â Â Â Â Â Â "0: .long 0xb2ad0042\n"Â Â Â Â Â Â /* NQAP */
-      "  brc  2,0b"
-Â Â Â Â Â Â : "+d" (reg0), "=d" (reg1), "+d" (reg2), "+d" (reg3)
-Â Â Â Â Â Â : "d" (reg4), "d" (reg5)
-Â Â Â Â Â Â : "cc", "memory");
-Â Â Â return reg1;
-}
-
-/**
- * ap_dqap(): Receive message from adjunct processor queue.
- * @qid: The AP queue number
- * @psmid: Pointer to program supplied message identifier
- * @msg: The message text
- * @length: The message length
- *
- * Returns AP queue status structure.
- * Condition code 1 on DQAP means the receive has taken place
- * but only partially.   The response is incomplete, hence the
- * DQAP is repeated.
- * Condition code 2 on DQAP also means the receive is incomplete,
- * this time because a segment boundary was reached. Again, the
- * DQAP is repeated.
- * Note that gpr2 is used by the DQAP instruction to keep track of
- * any 'residual' length, in case the instruction gets interrupted.
- * Hence it gets zeroed before the instruction.
- */
-static inline struct ap_queue_status ap_dqap(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long long *psmid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *msg, size_t length)
-{
-Â Â Â register unsigned long reg0 asm("0") = qid | 0x80000000UL;
-Â Â Â register struct ap_queue_status reg1 asm ("1");
-Â Â Â register unsigned long reg2 asm("2") = 0UL;
-Â Â Â register unsigned long reg4 asm("4") = (unsigned long) msg;
-Â Â Â register unsigned long reg5 asm("5") = (unsigned long) length;
-Â Â Â register unsigned long reg6 asm("6") = 0UL;
-Â Â Â register unsigned long reg7 asm("7") = 0UL;
-
-
-Â Â Â asm volatile(
-Â Â Â Â Â Â "0: .long 0xb2ae0064\n"Â Â Â Â Â Â /* DQAP */
-      "  brc  6,0b\n"
-Â Â Â Â Â Â : "+d" (reg0), "=d" (reg1), "+d" (reg2),
-Â Â Â Â Â Â Â "+d" (reg4), "+d" (reg5), "+d" (reg6), "+d" (reg7)
-Â Â Â Â Â Â : : "cc", "memory");
-Â Â Â *psmid = (((unsigned long long) reg6) << 32) + reg7;
-Â Â Â return reg1;
-}
-
-#endif /* _AP_ASM_H_ */
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 35a0c2b52f82..aa1bbe6d7842 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -36,7 +36,6 @@
 #include <linux/debugfs.h>
Â
 #include "ap_bus.h"
-#include "ap_asm.h"
 #include "ap_debug.h"
Â
 /*
@@ -174,24 +173,6 @@ static inline int ap_qact_available(void)
    return 0;
 }
Â
-/**
- * ap_test_queue(): Test adjunct processor queue.
- * @qid: The AP queue number
- * @tbit: Test facilities bit
- * @info: Pointer to queue descriptor
- *
- * Returns AP queue status structure.
- */
-struct ap_queue_status ap_test_queue(ap_qid_t qid,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int tbit,
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long *info)
-{
-Â Â Â if (tbit)
-Â Â Â Â Â Â qid |= 1UL << 23; /* set T bit*/
-Â Â Â return ap_tapq(qid, info);
-}
-EXPORT_SYMBOL(ap_test_queue);
-
 /*
 * ap_query_configuration(): Fetch cryptographic config info
 *
@@ -200,7 +181,7 @@ EXPORT_SYMBOL(ap_test_queue);
 * is returned, e.g. if the PQAP(QCI) instruction is not
 * available, the return value will be -EOPNOTSUPP.
 */
-int ap_query_configuration(struct ap_config_info *info)
+static inline int ap_query_configuration(struct ap_config_info *info)
 {
    if (!ap_configuration_available())
       return -EOPNOTSUPP;
@@ -1220,7 +1201,7 @@ static int __init ap_module_init(void)
    if (rc)
       return rc;
Â
-Â Â Â if (ap_instructions_available() != 0) {
+Â Â Â if (!ap_instructions_available()) {
       pr_warn("The hardware system does not support AP instructions\n");
       return -ENODEV;
    }
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 6a273c5ebca5..936541937e15 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -15,6 +15,7 @@
Â
 #include <linux/device.h>
 #include <linux/types.h>
+#include <asm/isc.h>
 #include <asm/ap.h>
Â
 #define AP_DEVICES 256      /* Number of AP devices. */
diff --git a/drivers/s390/crypto/ap_card.c b/drivers/s390/crypto/ap_card.c
index 2c726df210f6..c13e43292cb7 100644
--- a/drivers/s390/crypto/ap_card.c
+++ b/drivers/s390/crypto/ap_card.c
@@ -14,7 +14,6 @@
 #include <asm/facility.h>
Â
 #include "ap_bus.h"
-#include "ap_asm.h"
Â
 /*
 * AP card related attributes.
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index ba3a2e13b0eb..d83c1fa291ae 100644
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -14,7 +14,6 @@
 #include <asm/facility.h>
Â
 #include "ap_bus.h"
-#include "ap_asm.h"
Â
 /**
 * ap_queue_irq_ctrl(): Control interruption on a AP queue.
--
2.17.1