[v2] crypto/octeontx: sync mbox changes done in kernel driver

Message ID 1559126643-29933-1-git-send-email-anoobj@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [v2] crypto/octeontx: sync mbox changes done in kernel driver |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Anoob Joseph May 29, 2019, 10:44 a.m. UTC
  From: Lukasz Bartosik <lbartosik@marvell.com>

Synchronize mbox with latest changes in kernel driver

Signed-off-by: Lukasz Bartosik <lbartosik@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
---
 drivers/crypto/octeontx/otx_cryptodev_mbox.c |  3 +++
 drivers/crypto/octeontx/otx_cryptodev_mbox.h | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
  

Comments

Anoob Joseph June 11, 2019, 3:34 a.m. UTC | #1
Hi Akhil, Pablo,

This patch is ready for merge.

Thanks,
Anoob

> -----Original Message-----
> From: Anoob Joseph <anoobj@marvell.com>
> Sent: Wednesday, May 29, 2019 4:14 PM
> To: Akhil Goyal <akhil.goyal@nxp.com>; Pablo de Lara
> <pablo.de.lara.guarch@intel.com>
> Cc: Lukas Bartosik <lbartosik@marvell.com>; Jerin Jacob Kollanukkaran
> <jerinj@marvell.com>; Narayana Prasad Raju Athreya
> <pathreya@marvell.com>; dev@dpdk.org; Anoob Joseph
> <anoobj@marvell.com>
> Subject: [PATCH v2] crypto/octeontx: sync mbox changes done in kernel
> driver
> 
> From: Lukasz Bartosik <lbartosik@marvell.com>
> 
> Synchronize mbox with latest changes in kernel driver
> 
> Signed-off-by: Lukasz Bartosik <lbartosik@marvell.com>
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> ---
>  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 a8e51a8..daba776 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 b05d1c5..2d2e0e6 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.7.4
  
Akhil Goyal June 19, 2019, 2:49 p.m. UTC | #2
> From: Lukasz Bartosik <lbartosik@marvell.com>
> 
> Synchronize mbox with latest changes in kernel driver
> 
> Signed-off-by: Lukasz Bartosik <lbartosik@marvell.com>
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> ---
>  drivers/crypto/octeontx/otx_cryptodev_mbox.c |  3 +++
>  drivers/crypto/octeontx/otx_cryptodev_mbox.h | 12 +++++-------
>  2 files changed, 8 insertions(+), 7 deletions(-)
> 
Applied to dpdk-next-crypto

Thanks.
  

Patch

diff --git a/drivers/crypto/octeontx/otx_cryptodev_mbox.c b/drivers/crypto/octeontx/otx_cryptodev_mbox.c
index a8e51a8..daba776 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 b05d1c5..2d2e0e6 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;