s390/zcrypt: rework of debug feature messages

This patch reworks all the debug feature invocations to be
more uniform. All invocations now use the macro with the
level already part of the macro name. All messages now start
with %s filled with __func__ (well there are still some
exceptions), and some message text has been shortened or
reworked.

There is no functional code touched with this patch.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index d9b804943d1923a60d187f3bb733c6405d7652b4..38d71e0760482f9323c5163274e2e75a7f25ad0a 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -725,7 +725,7 @@ static void ap_check_bindings_complete(void)
                if (bound == apqns) {
                        if (!completion_done(&ap_init_apqn_bindings_complete)) {
                                complete_all(&ap_init_apqn_bindings_complete);
-                               AP_DBF(DBF_INFO, "%s complete\n", __func__);
+                               AP_DBF_INFO("%s complete\n", __func__);
                        }
                        ap_send_bindings_complete_uevent();
                }
@@ -786,8 +786,8 @@ static int __ap_revise_reserved(struct device *dev, void *dummy)
                drvres = to_ap_drv(dev->driver)->flags
                        & AP_DRIVER_FLAG_DEFAULT;
                if (!!devres != !!drvres) {
-                       AP_DBF_DBG("reprobing queue=%02x.%04x\n",
-                                  card, queue);
+                       AP_DBF_DBG("%s reprobing queue=%02x.%04x\n",
+                                  __func__, card, queue);
                        rc = device_reprobe(dev);
                }
        }
@@ -1118,7 +1118,8 @@ static ssize_t ap_domain_store(struct bus_type *bus,
        ap_domain_index = domain;
        spin_unlock_bh(&ap_domain_lock);
 
-       AP_DBF_INFO("stored new default domain=%d\n", domain);
+       AP_DBF_INFO("%s stored new default domain=%d\n",
+                   __func__, domain);
 
        return count;
 }
@@ -1433,8 +1434,9 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func)
 
        /* < CEX2A is not supported */
        if (rawtype < AP_DEVICE_TYPE_CEX2A) {
-               AP_DBF_WARN("get_comp_type queue=%02x.%04x unsupported type %d\n",
-                           AP_QID_CARD(qid), AP_QID_QUEUE(qid), rawtype);
+               AP_DBF_WARN("%s queue=%02x.%04x unsupported type %d\n",
+                           __func__, AP_QID_CARD(qid),
+                           AP_QID_QUEUE(qid), rawtype);
                return 0;
        }
        /* up to CEX7 known and fully supported */
@@ -1458,11 +1460,12 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func)
                        comp_type = apinfo.cat;
        }
        if (!comp_type)
-               AP_DBF_WARN("get_comp_type queue=%02x.%04x unable to map type %d\n",
-                           AP_QID_CARD(qid), AP_QID_QUEUE(qid), rawtype);
+               AP_DBF_WARN("%s queue=%02x.%04x unable to map type %d\n",
+                           __func__, AP_QID_CARD(qid),
+                           AP_QID_QUEUE(qid), rawtype);
        else if (comp_type != rawtype)
-               AP_DBF_INFO("get_comp_type queue=%02x.%04x map type %d to %d\n",
-                           AP_QID_CARD(qid), AP_QID_QUEUE(qid),
+               AP_DBF_INFO("%s queue=%02x.%04x map type %d to %d\n",
+                           __func__, AP_QID_CARD(qid), AP_QID_QUEUE(qid),
                            rawtype, comp_type);
        return comp_type;
 }
@@ -1535,7 +1538,7 @@ static inline void ap_scan_domains(struct ap_card *ac)
                aq = dev ? to_ap_queue(dev) : NULL;
                if (!ap_test_config_usage_domain(dom)) {
                        if (dev) {
-                               AP_DBF_INFO("%s(%d,%d) not in config any more, rm queue device\n",
+                               AP_DBF_INFO("%s(%d,%d) not in config anymore, rm queue dev\n",
                                            __func__, ac->id, dom);
                                device_unregister(dev);
                                put_device(dev);
@@ -1545,9 +1548,8 @@ static inline void ap_scan_domains(struct ap_card *ac)
                /* domain is valid, get info from this APQN */
                if (!ap_queue_info(qid, &type, &func, &depth, &ml, &decfg)) {
                        if (aq) {
-                               AP_DBF_INFO(
-                                       "%s(%d,%d) ap_queue_info() not successful, rm queue device\n",
-                                       __func__, ac->id, dom);
+                               AP_DBF_INFO("%s(%d,%d) queue_info() failed, rm queue dev\n",
+                                           __func__, ac->id, dom);
                                device_unregister(dev);
                                put_device(dev);
                        }
@@ -1577,10 +1579,10 @@ static inline void ap_scan_domains(struct ap_card *ac)
                        /* get it and thus adjust reference counter */
                        get_device(dev);
                        if (decfg)
-                               AP_DBF_INFO("%s(%d,%d) new (decfg) queue device created\n",
+                               AP_DBF_INFO("%s(%d,%d) new (decfg) queue dev created\n",
                                            __func__, ac->id, dom);
                        else
-                               AP_DBF_INFO("%s(%d,%d) new queue device created\n",
+                               AP_DBF_INFO("%s(%d,%d) new queue dev created\n",
                                            __func__, ac->id, dom);
                        goto put_dev_and_continue;
                }
@@ -1594,7 +1596,7 @@ static inline void ap_scan_domains(struct ap_card *ac)
                                aq->last_err_rc = AP_RESPONSE_DECONFIGURED;
                        }
                        spin_unlock_bh(&aq->lock);
-                       AP_DBF_INFO("%s(%d,%d) queue device config off\n",
+                       AP_DBF_INFO("%s(%d,%d) queue dev config off\n",
                                    __func__, ac->id, dom);
                        ap_send_config_uevent(&aq->ap_dev, aq->config);
                        /* 'receive' pending messages with -EAGAIN */
@@ -1609,7 +1611,7 @@ static inline void ap_scan_domains(struct ap_card *ac)
                                aq->sm_state = AP_SM_STATE_RESET_START;
                        }
                        spin_unlock_bh(&aq->lock);
-                       AP_DBF_INFO("%s(%d,%d) queue device config on\n",
+                       AP_DBF_INFO("%s(%d,%d) queue dev config on\n",
                                    __func__, ac->id, dom);
                        ap_send_config_uevent(&aq->ap_dev, aq->config);
                        goto put_dev_and_continue;
@@ -1621,7 +1623,7 @@ static inline void ap_scan_domains(struct ap_card *ac)
                        ap_flush_queue(aq);
                        /* re-init (with reset) the queue device */
                        ap_queue_init_state(aq);
-                       AP_DBF_INFO("%s(%d,%d) queue device reinit enforced\n",
+                       AP_DBF_INFO("%s(%d,%d) queue dev reinit enforced\n",
                                    __func__, ac->id, dom);
                        goto put_dev_and_continue;
                }
@@ -1653,7 +1655,7 @@ static inline void ap_scan_adapter(int ap)
        /* Adapter not in configuration ? */
        if (!ap_test_config_card_id(ap)) {
                if (ac) {
-                       AP_DBF_INFO("%s(%d) ap not in config any more, rm card and queue devices\n",
+                       AP_DBF_INFO("%s(%d) ap not in config any more, rm card and queue devs\n",
                                    __func__, ap);
                        ap_scan_rm_card_dev_and_queue_devs(ac);
                        put_device(dev);
@@ -1678,9 +1680,8 @@ static inline void ap_scan_adapter(int ap)
        if (dom > ap_max_domain_id) {
                /* Could not find a valid APQN for this adapter */
                if (ac) {
-                       AP_DBF_INFO(
-                               "%s(%d) no type info (no APQN found), rm card and queue devices\n",
-                               __func__, ap);
+                       AP_DBF_INFO("%s(%d) no type info (no APQN found), rm card and queue devs\n",
+                                   __func__, ap);
                        ap_scan_rm_card_dev_and_queue_devs(ac);
                        put_device(dev);
                } else {
@@ -1692,7 +1693,7 @@ static inline void ap_scan_adapter(int ap)
        if (!type) {
                /* No apdater type info available, an unusable adapter */
                if (ac) {
-                       AP_DBF_INFO("%s(%d) no valid type (0) info, rm card and queue devices\n",
+                       AP_DBF_INFO("%s(%d) no valid type (0) info, rm card and queue devs\n",
                                    __func__, ap);
                        ap_scan_rm_card_dev_and_queue_devs(ac);
                        put_device(dev);
@@ -1706,13 +1707,13 @@ static inline void ap_scan_adapter(int ap)
        if (ac) {
                /* Check APQN against existing card device for changes */
                if (ac->raw_hwtype != type) {
-                       AP_DBF_INFO("%s(%d) hwtype %d changed, rm card and queue devices\n",
+                       AP_DBF_INFO("%s(%d) hwtype %d changed, rm card and queue devs\n",
                                    __func__, ap, type);
                        ap_scan_rm_card_dev_and_queue_devs(ac);
                        put_device(dev);
                        ac = NULL;
                } else if (ac->functions != func) {
-                       AP_DBF_INFO("%s(%d) functions 0x%08x changed, rm card and queue devices\n",
+                       AP_DBF_INFO("%s(%d) functions 0x%08x changed, rm card and queue devs\n",
                                    __func__, ap, type);
                        ap_scan_rm_card_dev_and_queue_devs(ac);
                        put_device(dev);
@@ -1720,13 +1721,13 @@ static inline void ap_scan_adapter(int ap)
                } else {
                        if (decfg && ac->config) {
                                ac->config = false;
-                               AP_DBF_INFO("%s(%d) card device config off\n",
+                               AP_DBF_INFO("%s(%d) card dev config off\n",
                                            __func__, ap);
                                ap_send_config_uevent(&ac->ap_dev, ac->config);
                        }
                        if (!decfg && !ac->config) {
                                ac->config = true;
-                               AP_DBF_INFO("%s(%d) card device config on\n",
+                               AP_DBF_INFO("%s(%d) card dev config on\n",
                                            __func__, ap);
                                ap_send_config_uevent(&ac->ap_dev, ac->config);
                        }
@@ -1756,7 +1757,8 @@ static inline void ap_scan_adapter(int ap)
                if (ac->maxmsgsize > atomic_read(&ap_max_msg_size)) {
                        atomic_set(&ap_max_msg_size, ac->maxmsgsize);
                        AP_DBF_INFO("%s(%d) ap_max_msg_size update to %d byte\n",
-                                   __func__, ap, atomic_read(&ap_max_msg_size));
+                                   __func__, ap,
+                                   atomic_read(&ap_max_msg_size));
                }
                /* Register the new card device with AP bus */
                rc = device_register(dev);
@@ -1769,10 +1771,10 @@ static inline void ap_scan_adapter(int ap)
                /* get it and thus adjust reference counter */
                get_device(dev);
                if (decfg)
-                       AP_DBF_INFO("%s(%d) new (decfg) card device type=%d func=0x%08x created\n",
+                       AP_DBF_INFO("%s(%d) new (decfg) card dev type=%d func=0x%08x created\n",
                                    __func__, ap, type, func);
                else
-                       AP_DBF_INFO("%s(%d) new card device type=%d func=0x%08x created\n",
+                       AP_DBF_INFO("%s(%d) new card dev type=%d func=0x%08x created\n",
                                    __func__, ap, type, func);
        }
 
@@ -1810,12 +1812,12 @@ static void ap_scan_bus(struct work_struct *unused)
                if (dev)
                        put_device(dev);
                else
-                       AP_DBF_INFO("no queue device with default domain %d available\n",
-                                   ap_domain_index);
+                       AP_DBF_INFO("%s no queue device with default domain %d available\n",
+                                   __func__, ap_domain_index);
        }
 
        if (atomic64_inc_return(&ap_scan_bus_count) == 1) {
-               AP_DBF(DBF_DEBUG, "%s init scan complete\n", __func__);
+               AP_DBF_DBG("%s init scan complete\n", __func__);
                ap_send_init_scan_done_uevent();
                ap_check_bindings_complete();
        }
@@ -1830,7 +1832,7 @@ static void ap_config_timeout(struct timer_list *unused)
 
 static int __init ap_debug_init(void)
 {
-       ap_dbf_info = debug_register("ap", 1, 1,
+       ap_dbf_info = debug_register("ap", 2, 1,
                                     DBF_MAX_SPRINTF_ARGS * sizeof(long));
        debug_register_view(ap_dbf_info, &debug_sprintf_view);
        debug_set_level(ap_dbf_info, DBF_ERR);

diff --git a/drivers/s390/crypto/ap_debug.h b/drivers/s390/crypto/ap_debug.h
index 34b0350d0b1ae37353165f8d0fd933c55fdf59f7..c083ce88a9a61f1b24022827420900e6d521f166 100644 (file)
--- a/drivers/s390/crypto/ap_debug.h
+++ b/drivers/s390/crypto/ap_debug.h
@@ -16,7 +16,7 @@
 #define RC2ERR(rc) ((rc) ? DBF_ERR : DBF_INFO)
 #define RC2WARN(rc) ((rc) ? DBF_WARN : DBF_INFO)
 
-#define DBF_MAX_SPRINTF_ARGS 5
+#define DBF_MAX_SPRINTF_ARGS 6
 
 #define AP_DBF(...)                                    \
        debug_sprintf_event(ap_dbf_info, ##__VA_ARGS__)

diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index 032bf7b282bab9a87d6750266cd0dff7220e3da7..1901449768ddd45cf63f73c39f804336e18a6104 100644 (file)
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -248,6 +248,7 @@ static enum ap_sm_wait ap_sm_write(struct ap_queue *aq)
 
        if (aq->requestq_count <= 0)
                return AP_SM_WAIT_NONE;
+
        /* Start the next request on the queue. */
        ap_msg = list_entry(aq->requestq.next, struct ap_message, list);
 #ifdef CONFIG_ZCRYPT_DEBUG
@@ -281,7 +282,7 @@ static enum ap_sm_wait ap_sm_write(struct ap_queue *aq)
                aq->sm_state = AP_SM_STATE_RESET_WAIT;
                return AP_SM_WAIT_TIMEOUT;
        case AP_RESPONSE_INVALID_DOMAIN:
-               AP_DBF(DBF_WARN, "AP_RESPONSE_INVALID_DOMAIN on NQAP\n");
+               AP_DBF_WARN("%s RESPONSE_INVALID_DOMAIN on NQAP\n", __func__);
                fallthrough;
        case AP_RESPONSE_MESSAGE_TOO_BIG:
        case AP_RESPONSE_REQ_FAC_NOT_INST:
@@ -573,8 +574,8 @@ static ssize_t reset_store(struct device *dev,
        ap_wait(ap_sm_event(aq, AP_SM_EVENT_POLL));
        spin_unlock_bh(&aq->lock);
 
-       AP_DBF(DBF_INFO, "reset queue=%02x.%04x triggered by user\n",
-              AP_QID_CARD(aq->qid), AP_QID_QUEUE(aq->qid));
+       AP_DBF_INFO("%s reset queue=%02x.%04x triggered by user\n",
+                   __func__, AP_QID_CARD(aq->qid), AP_QID_QUEUE(aq->qid));
 
        return count;
 }

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 356318746dd169bfb3b2d563cb29d70d0008265b..4c3dcc435e83d38ba217dd3fe21a14cb3159c781 100644 (file)
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -82,8 +82,8 @@ static inline int zcrypt_process_rescan(void)
                atomic_set(&zcrypt_rescan_req, 0);
                atomic_inc(&zcrypt_rescan_count);
                ap_bus_force_rescan();
-               ZCRYPT_DBF(DBF_INFO, "rescan count=%07d\n",
-                          atomic_inc_return(&zcrypt_rescan_count));
+               ZCRYPT_DBF_INFO("%s rescan count=%07d\n", __func__,
+                               atomic_inc_return(&zcrypt_rescan_count));
                return 1;
        }
        return 0;
@@ -341,8 +341,8 @@ static void zcdn_device_release(struct device *dev)
 {
        struct zcdn_device *zcdndev = to_zcdn_dev(dev);
 
-       ZCRYPT_DBF(DBF_INFO, "releasing zcdn device %d:%d\n",
-                  MAJOR(dev->devt), MINOR(dev->devt));
+       ZCRYPT_DBF_INFO("%s releasing zcdn device %d:%d\n",
+                       __func__, MAJOR(dev->devt), MINOR(dev->devt));
 
        kfree(zcdndev);
 }
@@ -407,8 +407,8 @@ static int zcdn_create(const char *name)
                goto unlockout;
        }
 
-       ZCRYPT_DBF(DBF_INFO, "created zcdn device %d:%d\n",
-                  MAJOR(devt), MINOR(devt));
+       ZCRYPT_DBF_INFO("%s created zcdn device %d:%d\n",
+                       __func__, MAJOR(devt), MINOR(devt));
 
 unlockout:
        mutex_unlock(&ap_perms_mutex);
@@ -550,9 +550,8 @@ static inline int zcrypt_check_ioctl(struct ap_perms *perms,
        }
 
        if (rc)
-               ZCRYPT_DBF(DBF_WARN,
-                          "ioctl check failed: ioctlnr=0x%04x rc=%d\n",
-                          ioctlnr, rc);
+               ZCRYPT_DBF_WARN("%s ioctl check failed: ioctlnr=0x%04x rc=%d\n",
+                               __func__, ioctlnr, rc);
 
        return rc;
 }
@@ -1446,7 +1445,7 @@ static int icarsamodexpo_ioctl(struct ap_perms *perms, unsigned long arg)
        if (rc == -EAGAIN && tr.again_counter >= TRACK_AGAIN_MAX)
                rc = -EIO;
        if (rc) {
-               ZCRYPT_DBF(DBF_DEBUG, "ioctl ICARSAMODEXPO rc=%d\n", rc);
+               ZCRYPT_DBF_DBG("ioctl ICARSAMODEXPO rc=%d\n", rc);
                return rc;
        }
        return put_user(mex.outputdatalength, &umex->outputdatalength);
@@ -1491,7 +1490,7 @@ static int icarsacrt_ioctl(struct ap_perms *perms, unsigned long arg)
        if (rc == -EAGAIN && tr.again_counter >= TRACK_AGAIN_MAX)
                rc = -EIO;
        if (rc) {
-               ZCRYPT_DBF(DBF_DEBUG, "ioctl ICARSACRT rc=%d\n", rc);
+               ZCRYPT_DBF_DBG("ioctl ICARSACRT rc=%d\n", rc);
                return rc;
        }
        return put_user(crt.outputdatalength, &ucrt->outputdatalength);
@@ -1509,12 +1508,12 @@ static int zsecsendcprb_ioctl(struct ap_perms *perms, unsigned long arg)
                return -EFAULT;
 
 #ifdef CONFIG_ZCRYPT_DEBUG
-       if (xcRB.status & (1U << 31)) {
+       if ((xcRB.status & 0x8000FFFF) == 0x80004649 /* 'FI' */) {
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
                tr.fi.cmd = (u16)(xcRB.status >> 16);
        }
-       xcRB.status &= 0x0000FFFF;
+       xcRB.status = 0;
 #endif
 
        do {
@@ -1536,8 +1535,8 @@ static int zsecsendcprb_ioctl(struct ap_perms *perms, unsigned long arg)
        if (rc == -EAGAIN && tr.again_counter >= TRACK_AGAIN_MAX)
                rc = -EIO;
        if (rc)
-               ZCRYPT_DBF(DBF_DEBUG, "ioctl ZSENDCPRB rc=%d status=0x%x\n",
-                          rc, xcRB.status);
+               ZCRYPT_DBF_DBG("ioctl ZSENDCPRB rc=%d status=0x%x\n",
+                              rc, xcRB.status);
        if (copy_to_user(uxcRB, &xcRB, sizeof(xcRB)))
                return -EFAULT;
        return rc;
@@ -1582,7 +1581,7 @@ static int zsendep11cprb_ioctl(struct ap_perms *perms, unsigned long arg)
        if (rc == -EAGAIN && tr.again_counter >= TRACK_AGAIN_MAX)
                rc = -EIO;
        if (rc)
-               ZCRYPT_DBF(DBF_DEBUG, "ioctl ZSENDEP11CPRB rc=%d\n", rc);
+               ZCRYPT_DBF_DBG("ioctl ZSENDEP11CPRB rc=%d\n", rc);
        if (copy_to_user(uxcrb, &xcrb, sizeof(xcrb)))
                return -EFAULT;
        return rc;
@@ -1709,7 +1708,7 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
        }
        /* unknown ioctl number */
        default:
-               ZCRYPT_DBF(DBF_DEBUG, "unknown ioctl 0x%08x\n", cmd);
+               ZCRYPT_DBF_DBG("unknown ioctl 0x%08x\n", cmd);
                return -ENOIOCTLCMD;
        }
 }
@@ -2048,16 +2047,14 @@ int zcrypt_wait_api_operational(void)
                        break;
                case -ETIME:
                        /* timeout */
-                       ZCRYPT_DBF(DBF_WARN,
-                                  "%s ap_wait_init_apqn_bindings_complete() returned with ETIME\n",
-                                  __func__);
+                       ZCRYPT_DBF_WARN("%s ap_wait_init_apqn_bindings_complete()=ETIME\n",
+                                       __func__);
                        zcrypt_wait_api_state = -ETIME;
                        break;
                default:
                        /* other failure */
-                       ZCRYPT_DBF(DBF_DEBUG,
-                                  "%s ap_wait_init_apqn_bindings_complete() failure rc=%d\n",
-                                  __func__, rc);
+                       ZCRYPT_DBF_DBG("%s ap_wait_init_apqn_bindings_complete()=%d\n",
+                                      __func__, rc);
                        break;
                }
                break;
@@ -2079,7 +2076,7 @@ EXPORT_SYMBOL(zcrypt_wait_api_operational);
 
 int __init zcrypt_debug_init(void)
 {
-       zcrypt_dbf_info = debug_register("zcrypt", 1, 1,
+       zcrypt_dbf_info = debug_register("zcrypt", 2, 1,
                                         DBF_MAX_SPRINTF_ARGS * sizeof(long));
        debug_register_view(zcrypt_dbf_info, &debug_sprintf_view);
        debug_set_level(zcrypt_dbf_info, DBF_ERR);

diff --git a/drivers/s390/crypto/zcrypt_card.c b/drivers/s390/crypto/zcrypt_card.c
index ef11d2a0ca6c591e6f6726f52ca61be7f031ab04..3e259befd30addb51154b53c89da64200dcbc757 100644 (file)
--- a/drivers/s390/crypto/zcrypt_card.c
+++ b/drivers/s390/crypto/zcrypt_card.c
@@ -76,7 +76,7 @@ static ssize_t online_store(struct device *dev,
        zc->online = online;
        id = zc->card->id;
 
-       ZCRYPT_DBF(DBF_INFO, "card=%02x online=%d\n", id, online);
+       ZCRYPT_DBF_INFO("%s card=%02x online=%d\n", __func__, id, online);
 
        ap_send_online_uevent(&ac->ap_dev, online);
 
@@ -189,7 +189,8 @@ int zcrypt_card_register(struct zcrypt_card *zc)
 
        zc->online = 1;
 
-       ZCRYPT_DBF(DBF_INFO, "card=%02x register online=1\n", zc->card->id);
+       ZCRYPT_DBF_INFO("%s card=%02x register online=1\n",
+                       __func__, zc->card->id);
 
        rc = sysfs_create_group(&zc->card->ap_dev.device.kobj,
                                &zcrypt_card_attr_group);
@@ -211,7 +212,8 @@ EXPORT_SYMBOL(zcrypt_card_register);
  */
 void zcrypt_card_unregister(struct zcrypt_card *zc)
 {
-       ZCRYPT_DBF(DBF_INFO, "card=%02x unregister\n", zc->card->id);
+       ZCRYPT_DBF_INFO("%s card=%02x unregister\n",
+                       __func__, zc->card->id);
 
        spin_lock(&zcrypt_list_lock);
        list_del_init(&zc->list);

diff --git a/drivers/s390/crypto/zcrypt_debug.h b/drivers/s390/crypto/zcrypt_debug.h
index 3225489a1c411ffa7802896457059db95eb40b91..5cf88aabd64b9f9048cc8374b664847f87b286a0 100644 (file)
--- a/drivers/s390/crypto/zcrypt_debug.h
+++ b/drivers/s390/crypto/zcrypt_debug.h
@@ -17,7 +17,7 @@
 #define RC2ERR(rc) ((rc) ? DBF_ERR : DBF_INFO)
 #define RC2WARN(rc) ((rc) ? DBF_WARN : DBF_INFO)
 
-#define DBF_MAX_SPRINTF_ARGS 5
+#define DBF_MAX_SPRINTF_ARGS 6
 
 #define ZCRYPT_DBF(...)                                        \
        debug_sprintf_event(zcrypt_dbf_info, ##__VA_ARGS__)

diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h
index 39e626e3a37940675a504745a8187822234a612b..8b0ce600b749e0999333a56866ec285754a02a27 100644 (file)
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -98,9 +98,8 @@ static inline int convert_error(struct zcrypt_queue *zq,
        case REP88_ERROR_MESSAGE_MALFORMD:       /* 0x22 */
        case REP88_ERROR_KEY_TYPE:               /* 0x34 */
                /* RY indicates malformed request */
-               ZCRYPT_DBF(DBF_WARN,
-                          "dev=%02x.%04x RY=0x%02x => rc=EINVAL\n",
-                          card, queue, ehdr->reply_code);
+               ZCRYPT_DBF_WARN("%s dev=%02x.%04x RY=0x%02x => rc=EINVAL\n",
+                               __func__, card, queue, ehdr->reply_code);
                return -EINVAL;
        case REP82_ERROR_MACHINE_FAILURE:        /* 0x10 */
        case REP82_ERROR_MESSAGE_TYPE:           /* 0x20 */
@@ -119,19 +118,18 @@ static inline int convert_error(struct zcrypt_queue *zq,
                        } __packed * head = reply->msg;
                        unsigned int apfs = *((u32 *)head->fmt2.apfs);
 
-                       ZCRYPT_DBF(DBF_WARN,
-                                  "dev=%02x.%04x RY=0x%02x apfs=0x%x => bus rescan, rc=EAGAIN\n",
-                                  card, queue, ehdr->reply_code, apfs);
+                       ZCRYPT_DBF_WARN(
+                               "%s dev=%02x.%04x RY=0x%02x apfs=0x%x => bus rescan, rc=EAGAIN\n",
+                               __func__, card, queue, ehdr->reply_code, apfs);
                } else
-                       ZCRYPT_DBF(DBF_WARN,
-                                  "dev=%02x.%04x RY=0x%02x => bus rescan, rc=EAGAIN\n",
-                                  card, queue, ehdr->reply_code);
+                       ZCRYPT_DBF_WARN("%s dev=%02x.%04x RY=0x%02x => bus rescan, rc=EAGAIN\n",
+                                       __func__, card, queue,
+                                       ehdr->reply_code);
                return -EAGAIN;
        default:
                /* Assume request is valid and a retry will be worth it */
-               ZCRYPT_DBF(DBF_WARN,
-                          "dev=%02x.%04x RY=0x%02x => rc=EAGAIN\n",
-                          card, queue, ehdr->reply_code);
+               ZCRYPT_DBF_WARN("%s dev=%02x.%04x RY=0x%02x => rc=EAGAIN\n",
+                               __func__, card, queue, ehdr->reply_code);
                return -EAGAIN;
        }
 }

diff --git a/drivers/s390/crypto/zcrypt_msgtype50.c b/drivers/s390/crypto/zcrypt_msgtype50.c
index 99937f3e1d49bb2529b962ec197d7c07e89dfd46..f42e8c511184f480c3b554bb10a84f87f411e681 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype50.c
+++ b/drivers/s390/crypto/zcrypt_msgtype50.c
@@ -369,12 +369,10 @@ static int convert_type80(struct zcrypt_queue *zq,
                zq->online = 0;
                pr_err("Crypto dev=%02x.%04x code=0x%02x => online=0 rc=EAGAIN\n",
                       AP_QID_CARD(zq->queue->qid),
-                      AP_QID_QUEUE(zq->queue->qid),
-                      t80h->code);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x code=0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              t80h->code);
+                      AP_QID_QUEUE(zq->queue->qid), t80h->code);
+               ZCRYPT_DBF_ERR("%s dev=%02x.%04x code=0x%02x => online=0 rc=EAGAIN\n",
+                              __func__, AP_QID_CARD(zq->queue->qid),
+                              AP_QID_QUEUE(zq->queue->qid), t80h->code);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }
@@ -409,10 +407,10 @@ static int convert_response_cex2a(struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) rtype);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              (int) rtype);
+               ZCRYPT_DBF_ERR(
+                       "%s dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), (int) rtype);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }

diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c b/drivers/s390/crypto/zcrypt_msgtype6.c
index bc5a8c31ba73bcdcf7d7c3b986992d7cfa58ac4c..8582dd0d6969b2da8f604da0b5e973f0b2019257 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ b/drivers/s390/crypto/zcrypt_msgtype6.c
@@ -649,8 +649,8 @@ static int convert_type86_ica(struct zcrypt_queue *zq,
                    (service_rc == 8 && service_rs == 72) ||
                    (service_rc == 8 && service_rs == 770) ||
                    (service_rc == 12 && service_rs == 769)) {
-                       ZCRYPT_DBF_WARN("dev=%02x.%04x rc/rs=%d/%d => rc=EINVAL\n",
-                                       AP_QID_CARD(zq->queue->qid),
+                       ZCRYPT_DBF_WARN("%s dev=%02x.%04x rc/rs=%d/%d => rc=EINVAL\n",
+                                       __func__, AP_QID_CARD(zq->queue->qid),
                                        AP_QID_QUEUE(zq->queue->qid),
                                        (int) service_rc, (int) service_rs);
                        return -EINVAL;
@@ -660,8 +660,8 @@ static int convert_type86_ica(struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) service_rc, (int) service_rs);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x rc/rs=%d/%d => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
+               ZCRYPT_DBF_ERR("%s dev=%02x.%04x rc/rs=%d/%d => online=0 rc=EAGAIN\n",
+                              __func__, AP_QID_CARD(zq->queue->qid),
                               AP_QID_QUEUE(zq->queue->qid),
                               (int) service_rc, (int) service_rs);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
@@ -806,10 +806,10 @@ static int convert_response_ica(struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) msg->hdr.type);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              (int) msg->hdr.type);
+               ZCRYPT_DBF_ERR(
+                       "%s dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), (int) msg->hdr.type);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }
@@ -841,10 +841,10 @@ static int convert_response_xcrb(bool userspace, struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) msg->hdr.type);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              (int) msg->hdr.type);
+               ZCRYPT_DBF_ERR(
+                       "%s dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), (int) msg->hdr.type);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }
@@ -871,10 +871,10 @@ static int convert_response_ep11_xcrb(bool userspace, struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) msg->hdr.type);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              (int) msg->hdr.type);
+               ZCRYPT_DBF_ERR(
+                       "%s dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), (int) msg->hdr.type);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }
@@ -902,10 +902,10 @@ static int convert_response_rng(struct zcrypt_queue *zq,
                       AP_QID_CARD(zq->queue->qid),
                       AP_QID_QUEUE(zq->queue->qid),
                       (int) msg->hdr.type);
-               ZCRYPT_DBF_ERR("dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
-                              AP_QID_CARD(zq->queue->qid),
-                              AP_QID_QUEUE(zq->queue->qid),
-                              (int) msg->hdr.type);
+               ZCRYPT_DBF_ERR(
+                       "%s dev=%02x.%04x unknown response type 0x%02x => online=0 rc=EAGAIN\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), (int) msg->hdr.type);
                ap_send_online_uevent(&zq->queue->ap_dev, zq->online);
                return -EAGAIN;
        }

diff --git a/drivers/s390/crypto/zcrypt_queue.c b/drivers/s390/crypto/zcrypt_queue.c
index 398bde237e376ece811addbb60b81353ab13becf..1552a850a52ede68e854550b8902fc5fdd45ddd1 100644 (file)
--- a/drivers/s390/crypto/zcrypt_queue.c
+++ b/drivers/s390/crypto/zcrypt_queue.c
@@ -65,10 +65,9 @@ static ssize_t online_store(struct device *dev,
                return -EINVAL;
        zq->online = online;
 
-       ZCRYPT_DBF(DBF_INFO, "queue=%02x.%04x online=%d\n",
-                  AP_QID_CARD(zq->queue->qid),
-                  AP_QID_QUEUE(zq->queue->qid),
-                  online);
+       ZCRYPT_DBF_INFO("%s queue=%02x.%04x online=%d\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid), online);
 
        ap_send_online_uevent(&aq->ap_dev, online);
 
@@ -175,8 +174,9 @@ int zcrypt_queue_register(struct zcrypt_queue *zq)
        zq->zcard = zc;
        zq->online = 1; /* New devices are online by default. */
 
-       ZCRYPT_DBF(DBF_INFO, "queue=%02x.%04x register online=1\n",
-                  AP_QID_CARD(zq->queue->qid), AP_QID_QUEUE(zq->queue->qid));
+       ZCRYPT_DBF_INFO("%s queue=%02x.%04x register online=1\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid));
 
        list_add_tail(&zq->list, &zc->zqueues);
        spin_unlock(&zcrypt_list_lock);
@@ -215,8 +215,9 @@ void zcrypt_queue_unregister(struct zcrypt_queue *zq)
 {
        struct zcrypt_card *zc;
 
-       ZCRYPT_DBF(DBF_INFO, "queue=%02x.%04x unregister\n",
-                  AP_QID_CARD(zq->queue->qid), AP_QID_QUEUE(zq->queue->qid));
+       ZCRYPT_DBF_INFO("%s queue=%02x.%04x unregister\n",
+                       __func__, AP_QID_CARD(zq->queue->qid),
+                       AP_QID_QUEUE(zq->queue->qid));
 
        zc = zq->zcard;
        spin_lock(&zcrypt_list_lock);