From c6fa0d2f6c9aaba4b970d345c84af22f593a0f89 Mon Sep 17 00:00:00 2001 From: Lukasz Bartosik Date: Wed, 29 May 2019 16:14:03 +0530 Subject: [PATCH] crypto/octeontx: sync mbox changes from kernel driver Synchronize mbox with latest changes in kernel driver Signed-off-by: Lukasz Bartosik Signed-off-by: Anoob Joseph --- drivers/crypto/octeontx/otx_cryptodev_mbox.c | 3 +++ drivers/crypto/octeontx/otx_cryptodev_mbox.h | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/octeontx/otx_cryptodev_mbox.c b/drivers/crypto/octeontx/otx_cryptodev_mbox.c index a8e51a8e7c..daba776e18 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_mbox.c +++ b/drivers/crypto/octeontx/otx_cryptodev_mbox.c @@ -24,6 +24,9 @@ otx_cpt_handle_mbox_intr(struct cpt_vf *cptvf) CPT_LOG_DP_DEBUG("%s: Mailbox msg 0x%lx from PF", cptvf->dev_name, (unsigned int long)mbx.msg); switch (mbx.msg) { + case OTX_CPT_MSG_VF_UP: + cptvf->pf_acked = true; + break; case OTX_CPT_MSG_READY: { otx_cpt_chipid_vfid_t cid; diff --git a/drivers/crypto/octeontx/otx_cryptodev_mbox.h b/drivers/crypto/octeontx/otx_cryptodev_mbox.h index b05d1c50d5..2d2e0e6a13 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_mbox.h +++ b/drivers/crypto/octeontx/otx_cryptodev_mbox.h @@ -15,11 +15,6 @@ #define OTX_CPT_MBOX_MSG_TIMEOUT 2000 /* In Milli Seconds */ -#define OTX_CPT_MBOX_MSG_TYPE_REQ 0 -#define OTX_CPT_MBOX_MSG_TYPE_ACK 1 -#define OTX_CPT_MBOX_MSG_TYPE_NACK 2 -#define OTX_CPT_MBOX_MSG_TYPE_NOP 3 - /* CPT mailbox structure */ struct cpt_mbox { /** Message type MBOX[0] */ @@ -28,7 +23,8 @@ struct cpt_mbox { uint64_t data; }; -typedef enum { +/* PF-VF message opcodes */ +enum otx_cpt_mbox_opcode { OTX_CPT_MSG_VF_UP = 1, OTX_CPT_MSG_VF_DOWN, OTX_CPT_MSG_READY, @@ -36,7 +32,9 @@ typedef enum { OTX_CPT_MSG_QBIND_GRP, OTX_CPT_MSG_VQ_PRIORITY, OTX_CPT_MSG_PF_TYPE, -} otx_cpt_mbox_opcode_t; + OTX_CPT_MBOX_MSG_TYPE_ACK, + OTX_CPT_MBOX_MSG_TYPE_NACK +}; typedef union { uint64_t u64; -- 2.20.1