Hello community,
here is the log from the commit of package dpdk for openSUSE:Factory checked in
at 2017-04-28 09:13:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dpdk (Old)
and /work/SRC/openSUSE:Factory/.dpdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpdk"
Fri Apr 28 09:13:28 2017 rev:15 rq:491001 version:16.11.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/dpdk/dpdk-thunderx.changes 2017-04-20
20:58:49.829100906 +0200
+++ /work/SRC/openSUSE:Factory/.dpdk.new/dpdk-thunderx.changes 2017-04-28
09:13:44.782333873 +0200
@@ -1,0 +2,6 @@
+Tue Apr 25 13:40:05 CEST 2017 - n...@suse.de
+
+- sync mailbox definitions with Linux PF driver(bsc#1035993)
+ [+0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch]
+
+-------------------------------------------------------------------
dpdk.changes: same change
New:
----
0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dpdk-thunderx.spec ++++++
--- /var/tmp/diff_new_pack.ymG5jf/_old 2017-04-28 09:13:46.090149451 +0200
+++ /var/tmp/diff_new_pack.ymG5jf/_new 2017-04-28 09:13:46.094148887 +0200
@@ -60,6 +60,7 @@
Patch1: 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
Patch2: 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
Patch3: 0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch
+Patch4: 0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc6
@@ -147,6 +148,7 @@
%patch1 -p1 -z .enic
%patch2 -p1 -z .kni1
%patch3 -p1 -z .kni2
+%patch4 -p1 -z .thunderx
# This fixes CROSS compilation (broken) in the mk file for ThunderX
sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk
dpdk.spec: same change
++++++ 0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch ++++++
>From 2d5a4b62ff2d7b79ca937a5c88654deecf4aa986 Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerin.ja...@caviumnetworks.com>
Date: Mon, 20 Mar 2017 19:40:40 +0530
Subject: [PATCH] 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.ja...@caviumnetworks.com>
---
drivers/net/thunderx/base/nicvf_mbox.c | 7 ++-----
drivers/net/thunderx/base/nicvf_mbox.h | 11 +++--------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/net/thunderx/base/nicvf_mbox.c
b/drivers/net/thunderx/base/nicvf_mbox.c
index 3b7b8a518..8b3477d5f 100644
--- 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 084f3a769..8675fe8fb 100644
--- 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;
--
2.12.2
