crypto: qat - improve logging of PFVF messages

Improve and simplify logging of PFVF messages.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c b/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
index f3a0a9d651e0d86d70f7ae9c9701d15af9e55996..099e39808d139e8b87368c1e328ba1caccade34d 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
+++ b/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
@@ -183,14 +183,14 @@ static u32 adf_gen2_pfvf_recv(struct adf_accel_dev *accel_dev, u8 vf_nr)
        msg = ADF_CSR_RD(pmisc_addr, pfvf_offset);
        if (!(msg & int_bit)) {
                dev_info(&GET_DEV(accel_dev),
-                        "Spurious PFVF interrupt, msg %X. Ignored\n", msg);
+                        "Spurious PFVF interrupt, msg 0x%.8x. Ignored\n", msg);
                return 0;
        }
 
        /* Ignore legacy non-system (non-kernel) VF2PF messages */
        if (!(msg & msg_origin)) {
                dev_dbg(&GET_DEV(accel_dev),
-                       "Ignored non-system message (0x%x);\n", msg);
+                       "Ignored non-system message (0x%.8x);\n", msg);
                return 0;
        }
 

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c
index b486b2b599c257db34ca6c83f2d292e39663c3dd..4f20dd35fcd4577847cb52ffae98afcae6f61008 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c
@@ -49,20 +49,13 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
                u8 compat;
 
                dev_dbg(&GET_DEV(accel_dev),
-                       "Compatibility Version Request from VF%d vers=%u\n",
-                       vf_nr, vf_compat_ver);
+                       "VersionRequest received from VF%d (vers %d) to PF (vers %d)\n",
+                       vf_nr, vf_compat_ver, ADF_PFVF_COMPAT_THIS_VERSION);
 
-               if (vf_compat_ver <= ADF_PFVF_COMPAT_THIS_VERSION) {
+               if (vf_compat_ver <= ADF_PFVF_COMPAT_THIS_VERSION)
                        compat = ADF_PF2VF_VF_COMPATIBLE;
-                       dev_dbg(&GET_DEV(accel_dev),
-                               "VF (vers %d) compatible with PF (vers %d)\n",
-                               vf_compat_ver, ADF_PFVF_COMPAT_THIS_VERSION);
-               } else {
+               else
                        compat = ADF_PF2VF_VF_COMPAT_UNKNOWN;
-                       dev_err(&GET_DEV(accel_dev),
-                               "VF (vers %d) compat with PF (vers %d) unkn.\n",
-                               vf_compat_ver, ADF_PFVF_COMPAT_THIS_VERSION);
-               }
 
                resp =  ADF_PF2VF_MSGORIGIN_SYSTEM;
                resp |= ADF_PF2VF_MSGTYPE_VERSION_RESP <<
@@ -77,8 +70,8 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
                u8 compat;
 
                dev_dbg(&GET_DEV(accel_dev),
-                       "Legacy VersionRequest received from VF%d 0x%x\n",
-                       vf_nr, msg);
+                       "Legacy VersionRequest received from VF%d to PF (vers 1.1)\n",
+                       vf_nr);
 
                /* PF always newer than legacy VF */
                compat = ADF_PF2VF_VF_COMPATIBLE;
@@ -95,21 +88,19 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
        case ADF_VF2PF_MSGTYPE_INIT:
                {
                dev_dbg(&GET_DEV(accel_dev),
-                       "Init message received from VF%d 0x%x\n",
-                       vf_nr, msg);
+                       "Init message received from VF%d\n", vf_nr);
                vf_info->init = true;
                }
                break;
        case ADF_VF2PF_MSGTYPE_SHUTDOWN:
                {
                dev_dbg(&GET_DEV(accel_dev),
-                       "Shutdown message received from VF%d 0x%x\n",
-                       vf_nr, msg);
+                       "Shutdown message received from VF%d\n", vf_nr);
                vf_info->init = false;
                }
                break;
        default:
-               dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%x)\n",
+               dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%.8x)\n",
                        vf_nr, msg);
                return -ENOMSG;
        }
@@ -132,7 +123,8 @@ bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
                return false;
 
        if (resp && adf_send_pf2vf_msg(accel_dev, vf_nr, resp))
-               dev_err(&GET_DEV(accel_dev), "Failed to send response to VF\n");
+               dev_err(&GET_DEV(accel_dev),
+                       "Failed to send response to VF%d\n", vf_nr);
 
        return true;
 }

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
index ea1a00e746ff5e9a9002a5d96c3d2268f8d3c4e4..9c7489ed122cae89f1364c2e9a8cc0ec90aa6fb2 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
@@ -90,18 +90,19 @@ static bool adf_handle_pf2vf_msg(struct adf_accel_dev *accel_dev, u32 msg)
 {
        switch ((msg & ADF_PF2VF_MSGTYPE_MASK) >> ADF_PF2VF_MSGTYPE_SHIFT) {
        case ADF_PF2VF_MSGTYPE_RESTARTING:
-               dev_dbg(&GET_DEV(accel_dev),
-                       "Restarting msg received from PF 0x%x\n", msg);
+               dev_dbg(&GET_DEV(accel_dev), "Restarting message received from PF\n");
 
                adf_pf2vf_handle_pf_restarting(accel_dev);
                return false;
        case ADF_PF2VF_MSGTYPE_VERSION_RESP:
+               dev_dbg(&GET_DEV(accel_dev),
+                       "Response message received from PF (0x%.8x)\n", msg);
                accel_dev->vf.response = msg;
                complete(&accel_dev->vf.msg_received);
                return true;
        default:
                dev_err(&GET_DEV(accel_dev),
-                       "Unknown PF2VF message(0x%x)\n", msg);
+                       "Unknown PF2VF message (0x%.8x) from PF\n", msg);
        }
 
        return false;