net/thunderx: sync mailbox definitions with Linux PF driver

- bgx_link_status mbox definition was changed in Linux
commit 1cc702591bae ("net: thunderx: Add ethtool support")
- NIC_MBOX_MSG_RES_BIT related changes were never part of Linux PF driver

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

diff --git a/drivers/net/thunderx/base/nicvf_mbox.c b/drivers/net/thunderx/base/nicvf_mbox.c
index 3b7b8a5..8b3477d 100644 (file)
--- a/drivers/net/thunderx/base/nicvf_mbox.c
+++ b/drivers/net/thunderx/base/nicvf_mbox.c
@@ -62,9 +62,6 @@ static const char *mbox_message[NIC_MBOX_MSG_MAX] =  {
        [NIC_MBOX_MSG_RESET_STAT_COUNTER] = "NIC_MBOX_MSG_RESET_STAT_COUNTER",
        [NIC_MBOX_MSG_CFG_DONE]           = "NIC_MBOX_MSG_CFG_DONE",
        [NIC_MBOX_MSG_SHUTDOWN]           = "NIC_MBOX_MSG_SHUTDOWN",
-       [NIC_MBOX_MSG_RES_BIT]            = "NIC_MBOX_MSG_RES_BIT",
-       [NIC_MBOX_MSG_RSS_SIZE_RES_BIT]   = "NIC_MBOX_MSG_RSS_SIZE",
-       [NIC_MBOX_MSG_ALLOC_SQS_RES_BIT]  = "NIC_MBOX_MSG_ALLOC_SQS",
 };
 
 static inline const char * __attribute__((unused))
@@ -176,7 +173,7 @@ nicvf_handle_mbx_intr(struct nicvf *nic)
        case NIC_MBOX_MSG_NACK:
                nic->pf_nacked = true;
                break;
-       case NIC_MBOX_MSG_RSS_SIZE_RES_BIT:
+       case NIC_MBOX_MSG_RSS_SIZE:
                nic->rss_info.rss_size = mbx.rss_size.ind_tbl_size;
                nic->pf_acked = true;
                break;
@@ -186,7 +183,7 @@ nicvf_handle_mbx_intr(struct nicvf *nic)
                nic->speed = mbx.link_status.speed;
                nic->pf_acked = true;
                break;
-       case NIC_MBOX_MSG_ALLOC_SQS_RES_BIT:
+       case NIC_MBOX_MSG_ALLOC_SQS:
                assert_primary(nic);
                if (mbx.sqs_alloc.qs_count != nic->sqs_count) {
                        nicvf_log_error("Received %" PRIu8 "/%" PRIu8

diff --git a/drivers/net/thunderx/base/nicvf_mbox.h b/drivers/net/thunderx/base/nicvf_mbox.h
index 084f3a7..8675fe8 100644 (file)
--- a/drivers/net/thunderx/base/nicvf_mbox.h
+++ b/drivers/net/thunderx/base/nicvf_mbox.h
@@ -68,16 +68,10 @@
 #define        NIC_MBOX_MSG_ALLOC_SQS          0x12    /* Allocate secondary Qset */
 #define        NIC_MBOX_MSG_LOOPBACK           0x16    /* Set interface in loopback */
 #define        NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17    /* Reset statistics counters */
-#define        NIC_MBOX_MSG_CFG_DONE           0x7E    /* VF configuration done */
-#define        NIC_MBOX_MSG_SHUTDOWN           0x7F    /* VF is being shutdown */
-#define        NIC_MBOX_MSG_RES_BIT            0x80    /* Reset bit from PF */
+#define        NIC_MBOX_MSG_CFG_DONE           0xF0    /* VF configuration done */
+#define        NIC_MBOX_MSG_SHUTDOWN           0xF1    /* VF is being shutdown */
 #define        NIC_MBOX_MSG_MAX                0x100   /* Maximum number of messages */
 
-#define NIC_MBOX_MSG_RSS_SIZE_RES_BIT \
-       (NIC_MBOX_MSG_RSS_SIZE | NIC_MBOX_MSG_RES_BIT)
-#define NIC_MBOX_MSG_ALLOC_SQS_RES_BIT \
-       (NIC_MBOX_MSG_ALLOC_SQS | NIC_MBOX_MSG_RES_BIT)
-
 /* Get vNIC VF configuration */
 struct nic_cfg_msg {
        uint8_t    msg;
@@ -157,6 +151,7 @@ struct rss_cfg_msg {
 /* Physical interface link status */
 struct bgx_link_status {
        uint8_t    msg;
+       uint8_t    mac_type;
        uint8_t    link_up;
        uint8_t    duplex;
        uint32_t   speed;