s390/zcrypt: make psmid unsigned long instead of long long

Since s390 kernel build does not support 32 bit build any
more there is no difference between long and long long.
So this patch reworks all occurrences of psmid (a 64 bit
value) to use unsigned long now.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Reviewed-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/ap.h b/arch/s390/include/asm/ap.h
index c699f25..0744a00 100644 (file)
--- a/arch/s390/include/asm/ap.h
+++ b/arch/s390/include/asm/ap.h
@@ -386,7 +386,7 @@ static inline struct ap_queue_status ap_nqap(ap_qid_t qid,
  * *resgr0 is to be used instead of qid to further process this entry.
  */
 static inline struct ap_queue_status ap_dqap(ap_qid_t qid,
-                                            unsigned long long *psmid,
+                                            unsigned long *psmid,
                                             void *msg, size_t length,
                                             size_t *reslength,
                                             unsigned long *resgr0)
@@ -429,7 +429,7 @@ static inline struct ap_queue_status ap_dqap(ap_qid_t qid,
                if (resgr0)
                        *resgr0 = reg0;
        } else {
-               *psmid = (((unsigned long long)rp1.even) << 32) + rp1.odd;
+               *psmid = (rp1.even << 32) + rp1.odd;
                if (resgr0)
                        *resgr0 = 0;
        }

diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 0f17933..4ef8e6a 100644 (file)
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -242,7 +242,7 @@ enum ap_fi_flags {
 
 struct ap_message {
        struct list_head list;          /* Request queueing. */
-       unsigned long long psmid;       /* Message id. */
+       unsigned long psmid;            /* Message id. */
        void *msg;                      /* Pointer to message buffer. */
        unsigned int len;               /* actual msg len in msg buffer */
        unsigned int bufsize;           /* allocated msg buffer size */
@@ -285,8 +285,8 @@ static inline void ap_release_message(struct ap_message *ap_msg)
  * for the first time. Otherwise the ap message queue will get
  * confused.
  */
-int ap_send(ap_qid_t, unsigned long long, void *, size_t);
-int ap_recv(ap_qid_t, unsigned long long *, void *, size_t);
+int ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t length);
+int ap_recv(ap_qid_t qid, unsigned long *psmid, void *msg, size_t length);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
 enum ap_sm_wait ap_sm_event_loop(struct ap_queue *aq, enum ap_sm_event event);

diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index 2637fe1..2fe8cbf 100644 (file)
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -68,7 +68,7 @@ static int ap_queue_enable_irq(struct ap_queue *aq, void *ind)
  * because a segment boundary was reached. The NQAP is repeated.
  */
 static inline struct ap_queue_status
-__ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length,
+__ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t length,
          int special)
 {
        if (special)
@@ -76,7 +76,7 @@ __ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length,
        return ap_nqap(qid, psmid, msg, length);
 }
 
-int ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length)
+int ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t length)
 {
        struct ap_queue_status status;
 
@@ -95,7 +95,7 @@ int ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length)
 }
 EXPORT_SYMBOL(ap_send);
 
-int ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length)
+int ap_recv(ap_qid_t qid, unsigned long *psmid, void *msg, size_t length)
 {
        struct ap_queue_status status;
 
@@ -177,7 +177,7 @@ static struct ap_queue_status ap_sm_recv(struct ap_queue *aq)
                        break;
                }
                if (!found) {
-                       AP_DBF_WARN("%s unassociated reply psmid=0x%016llx on 0x%02x.%04x\n",
+                       AP_DBF_WARN("%s unassociated reply psmid=0x%016lx on 0x%02x.%04x\n",
                                    __func__, aq->reply->psmid,
                                    AP_QID_CARD(aq->qid), AP_QID_QUEUE(aq->qid));
                }

diff --git a/drivers/s390/crypto/zcrypt_cex2c.c b/drivers/s390/crypto/zcrypt_cex2c.c
index cb7849d..9cabe39 100644 (file)
--- a/drivers/s390/crypto/zcrypt_cex2c.c
+++ b/drivers/s390/crypto/zcrypt_cex2c.c
@@ -181,7 +181,7 @@ static const struct attribute_group cca_queue_attr_grp = {
 static int zcrypt_cex2c_rng_supported(struct ap_queue *aq)
 {
        struct ap_message ap_msg;
-       unsigned long long psmid;
+       unsigned long psmid;
        unsigned int domain;
        struct {
                struct type86_hdr hdr;
@@ -209,7 +209,7 @@ static int zcrypt_cex2c_rng_supported(struct ap_queue *aq)
        msg = ap_msg.msg;
        msg->cprbx.domain = AP_QID_QUEUE(aq->qid);
 
-       rc = ap_send(aq->qid, 0x0102030405060708ULL, ap_msg.msg, ap_msg.len);
+       rc = ap_send(aq->qid, 0x0102030405060708UL, ap_msg.msg, ap_msg.len);
        if (rc)
                goto out_free;
 
@@ -217,7 +217,7 @@ static int zcrypt_cex2c_rng_supported(struct ap_queue *aq)
        for (i = 0; i < 2 * HZ; i++) {
                msleep(1000 / HZ);
                rc = ap_recv(aq->qid, &psmid, ap_msg.msg, 4096);
-               if (rc == 0 && psmid == 0x0102030405060708ULL)
+               if (rc == 0 && psmid == 0x0102030405060708UL)
                        break;
        }
 

diff --git a/drivers/s390/crypto/zcrypt_msgtype50.c b/drivers/s390/crypto/zcrypt_msgtype50.c
index 7d24564..1b6b60b 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype50.c
+++ b/drivers/s390/crypto/zcrypt_msgtype50.c
@@ -476,7 +476,7 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_queue *zq,
        if (!ap_msg->msg)
                return -ENOMEM;
        ap_msg->receive = zcrypt_cex2a_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                atomic_inc_return(&zcrypt_step);
        ap_msg->private = &work;
        rc = ICAMEX_msg_to_type50MEX_msg(zq, ap_msg, mex);
@@ -527,7 +527,7 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_queue *zq,
        if (!ap_msg->msg)
                return -ENOMEM;
        ap_msg->receive = zcrypt_cex2a_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                atomic_inc_return(&zcrypt_step);
        ap_msg->private = &work;
        rc = ICACRT_msg_to_type50CRT_msg(zq, ap_msg, crt);

diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c b/drivers/s390/crypto/zcrypt_msgtype6.c
index a2e7fe3..6c87480 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ b/drivers/s390/crypto/zcrypt_msgtype6.c
@@ -1034,7 +1034,7 @@ static long zcrypt_msgtype6_modexpo(struct zcrypt_queue *zq,
                return -ENOMEM;
        ap_msg->bufsize = PAGE_SIZE;
        ap_msg->receive = zcrypt_msgtype6_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                atomic_inc_return(&zcrypt_step);
        ap_msg->private = &resp_type;
        rc = icamex_msg_to_type6mex_msgx(zq, ap_msg, mex);
@@ -1084,7 +1084,7 @@ static long zcrypt_msgtype6_modexpo_crt(struct zcrypt_queue *zq,
                return -ENOMEM;
        ap_msg->bufsize = PAGE_SIZE;
        ap_msg->receive = zcrypt_msgtype6_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                atomic_inc_return(&zcrypt_step);
        ap_msg->private = &resp_type;
        rc = icacrt_msg_to_type6crt_msgx(zq, ap_msg, crt);
@@ -1135,7 +1135,7 @@ int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
        if (!ap_msg->msg)
                return -ENOMEM;
        ap_msg->receive = zcrypt_msgtype6_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                                atomic_inc_return(&zcrypt_step);
        ap_msg->private = kmemdup(&resp_type, sizeof(resp_type), GFP_KERNEL);
        if (!ap_msg->private)
@@ -1216,7 +1216,7 @@ int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
        if (!ap_msg->msg)
                return -ENOMEM;
        ap_msg->receive = zcrypt_msgtype6_receive_ep11;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                                atomic_inc_return(&zcrypt_step);
        ap_msg->private = kmemdup(&resp_type, sizeof(resp_type), GFP_KERNEL);
        if (!ap_msg->private)
@@ -1326,7 +1326,7 @@ int prep_rng_ap_msg(struct ap_message *ap_msg, int *func_code,
        if (!ap_msg->msg)
                return -ENOMEM;
        ap_msg->receive = zcrypt_msgtype6_receive;
-       ap_msg->psmid = (((unsigned long long)current->pid) << 32) +
+       ap_msg->psmid = (((unsigned long)current->pid) << 32) +
                                atomic_inc_return(&zcrypt_step);
        ap_msg->private = kmemdup(&resp_type, sizeof(resp_type), GFP_KERNEL);
        if (!ap_msg->private)