Commit 8616b628 authored by Marco Chiappero's avatar Marco Chiappero Committed by Herbert Xu

crypto: qat - improve logging of PFVF messages

Improve and simplify logging of PFVF messages.
Signed-off-by: default avatarMarco Chiappero <marco.chiappero@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1d9a915f
...@@ -183,14 +183,14 @@ static u32 adf_gen2_pfvf_recv(struct adf_accel_dev *accel_dev, u8 vf_nr) ...@@ -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); msg = ADF_CSR_RD(pmisc_addr, pfvf_offset);
if (!(msg & int_bit)) { if (!(msg & int_bit)) {
dev_info(&GET_DEV(accel_dev), 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; return 0;
} }
/* Ignore legacy non-system (non-kernel) VF2PF messages */ /* Ignore legacy non-system (non-kernel) VF2PF messages */
if (!(msg & msg_origin)) { if (!(msg & msg_origin)) {
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev),
"Ignored non-system message (0x%x);\n", msg); "Ignored non-system message (0x%.8x);\n", msg);
return 0; return 0;
} }
......
...@@ -49,20 +49,13 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr, ...@@ -49,20 +49,13 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
u8 compat; u8 compat;
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev),
"Compatibility Version Request from VF%d vers=%u\n", "VersionRequest received from VF%d (vers %d) to PF (vers %d)\n",
vf_nr, vf_compat_ver); 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; compat = ADF_PF2VF_VF_COMPATIBLE;
dev_dbg(&GET_DEV(accel_dev), else
"VF (vers %d) compatible with PF (vers %d)\n",
vf_compat_ver, ADF_PFVF_COMPAT_THIS_VERSION);
} else {
compat = ADF_PF2VF_VF_COMPAT_UNKNOWN; 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_MSGORIGIN_SYSTEM;
resp |= ADF_PF2VF_MSGTYPE_VERSION_RESP << 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, ...@@ -77,8 +70,8 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
u8 compat; u8 compat;
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev),
"Legacy VersionRequest received from VF%d 0x%x\n", "Legacy VersionRequest received from VF%d to PF (vers 1.1)\n",
vf_nr, msg); vf_nr);
/* PF always newer than legacy VF */ /* PF always newer than legacy VF */
compat = ADF_PF2VF_VF_COMPATIBLE; compat = ADF_PF2VF_VF_COMPATIBLE;
...@@ -95,21 +88,19 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr, ...@@ -95,21 +88,19 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
case ADF_VF2PF_MSGTYPE_INIT: case ADF_VF2PF_MSGTYPE_INIT:
{ {
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev),
"Init message received from VF%d 0x%x\n", "Init message received from VF%d\n", vf_nr);
vf_nr, msg);
vf_info->init = true; vf_info->init = true;
} }
break; break;
case ADF_VF2PF_MSGTYPE_SHUTDOWN: case ADF_VF2PF_MSGTYPE_SHUTDOWN:
{ {
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev),
"Shutdown message received from VF%d 0x%x\n", "Shutdown message received from VF%d\n", vf_nr);
vf_nr, msg);
vf_info->init = false; vf_info->init = false;
} }
break; break;
default: 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); vf_nr, msg);
return -ENOMSG; return -ENOMSG;
} }
...@@ -132,7 +123,8 @@ bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr) ...@@ -132,7 +123,8 @@ bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
return false; return false;
if (resp && adf_send_pf2vf_msg(accel_dev, vf_nr, resp)) 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; return true;
} }
......
...@@ -90,18 +90,19 @@ static bool adf_handle_pf2vf_msg(struct adf_accel_dev *accel_dev, u32 msg) ...@@ -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) { switch ((msg & ADF_PF2VF_MSGTYPE_MASK) >> ADF_PF2VF_MSGTYPE_SHIFT) {
case ADF_PF2VF_MSGTYPE_RESTARTING: case ADF_PF2VF_MSGTYPE_RESTARTING:
dev_dbg(&GET_DEV(accel_dev), dev_dbg(&GET_DEV(accel_dev), "Restarting message received from PF\n");
"Restarting msg received from PF 0x%x\n", msg);
adf_pf2vf_handle_pf_restarting(accel_dev); adf_pf2vf_handle_pf_restarting(accel_dev);
return false; return false;
case ADF_PF2VF_MSGTYPE_VERSION_RESP: 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; accel_dev->vf.response = msg;
complete(&accel_dev->vf.msg_received); complete(&accel_dev->vf.msg_received);
return true; return true;
default: default:
dev_err(&GET_DEV(accel_dev), dev_err(&GET_DEV(accel_dev),
"Unknown PF2VF message(0x%x)\n", msg); "Unknown PF2VF message (0x%.8x) from PF\n", msg);
} }
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment