1 From 2d5a4b62ff2d7b79ca937a5c88654deecf4aa986 Mon Sep 17 00:00:00 2001
2 From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
3 Date: Mon, 20 Mar 2017 19:40:40 +0530
4 Subject: [PATCH] net/thunderx: sync mailbox definitions with Linux PF driver
6 - bgx_link_status mbox definition was changed in Linux
7 commit 1cc702591bae ("net: thunderx: Add ethtool support")
8 - NIC_MBOX_MSG_RES_BIT related changes were never part of Linux PF driver
10 Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
12 drivers/net/thunderx/base/nicvf_mbox.c | 7 ++-----
13 drivers/net/thunderx/base/nicvf_mbox.h | 11 +++--------
14 2 files changed, 5 insertions(+), 13 deletions(-)
16 Origin: http://dpdk.org/browse/dpdk/commit/?id=2d5a4b62ff2d7b79ca937a5c88654deecf4aa986
17 Original-Author: Jerin Jacob <jerin.jacob@caviumnetworks.com>
18 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1691659
19 Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
20 Last-Update: 2017-05-18
22 --- a/drivers/net/thunderx/base/nicvf_mbox.c
23 +++ b/drivers/net/thunderx/base/nicvf_mbox.c
25 [NIC_MBOX_MSG_RESET_STAT_COUNTER] = "NIC_MBOX_MSG_RESET_STAT_COUNTER",
26 [NIC_MBOX_MSG_CFG_DONE] = "NIC_MBOX_MSG_CFG_DONE",
27 [NIC_MBOX_MSG_SHUTDOWN] = "NIC_MBOX_MSG_SHUTDOWN",
28 - [NIC_MBOX_MSG_RES_BIT] = "NIC_MBOX_MSG_RES_BIT",
29 - [NIC_MBOX_MSG_RSS_SIZE_RES_BIT] = "NIC_MBOX_MSG_RSS_SIZE",
30 - [NIC_MBOX_MSG_ALLOC_SQS_RES_BIT] = "NIC_MBOX_MSG_ALLOC_SQS",
33 static inline const char * __attribute__((unused))
35 case NIC_MBOX_MSG_NACK:
36 nic->pf_nacked = true;
38 - case NIC_MBOX_MSG_RSS_SIZE_RES_BIT:
39 + case NIC_MBOX_MSG_RSS_SIZE:
40 nic->rss_info.rss_size = mbx.rss_size.ind_tbl_size;
44 nic->speed = mbx.link_status.speed;
47 - case NIC_MBOX_MSG_ALLOC_SQS_RES_BIT:
48 + case NIC_MBOX_MSG_ALLOC_SQS:
50 if (mbx.sqs_alloc.qs_count != nic->sqs_count) {
51 nicvf_log_error("Received %" PRIu8 "/%" PRIu8
52 --- a/drivers/net/thunderx/base/nicvf_mbox.h
53 +++ b/drivers/net/thunderx/base/nicvf_mbox.h
55 #define NIC_MBOX_MSG_ALLOC_SQS 0x12 /* Allocate secondary Qset */
56 #define NIC_MBOX_MSG_LOOPBACK 0x16 /* Set interface in loopback */
57 #define NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17 /* Reset statistics counters */
58 -#define NIC_MBOX_MSG_CFG_DONE 0x7E /* VF configuration done */
59 -#define NIC_MBOX_MSG_SHUTDOWN 0x7F /* VF is being shutdown */
60 -#define NIC_MBOX_MSG_RES_BIT 0x80 /* Reset bit from PF */
61 +#define NIC_MBOX_MSG_CFG_DONE 0xF0 /* VF configuration done */
62 +#define NIC_MBOX_MSG_SHUTDOWN 0xF1 /* VF is being shutdown */
63 #define NIC_MBOX_MSG_MAX 0x100 /* Maximum number of messages */
65 -#define NIC_MBOX_MSG_RSS_SIZE_RES_BIT \
66 - (NIC_MBOX_MSG_RSS_SIZE | NIC_MBOX_MSG_RES_BIT)
67 -#define NIC_MBOX_MSG_ALLOC_SQS_RES_BIT \
68 - (NIC_MBOX_MSG_ALLOC_SQS | NIC_MBOX_MSG_RES_BIT)
70 /* Get vNIC VF configuration */
74 /* Physical interface link status */
75 struct bgx_link_status {