From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: Jingjing Wu <jingjing.wu@intel.com>
Cc: Yuanhan Liu <yuanhan.liu@linux.intel.com>,
Beilei Xing <beilei.xing@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/i40e: fix DCB configuration' has been queued to stable release 16.07.2
Date: Tue, 15 Nov 2016 19:40:27 +0800 [thread overview]
Message-ID: <1479210033-24775-7-git-send-email-yuanhan.liu@linux.intel.com> (raw)
In-Reply-To: <1479210033-24775-1-git-send-email-yuanhan.liu@linux.intel.com>
Hi,
FYI, your patch has been queued to stable release 16.07.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable
yet. It will be pushed if I get no objections before 11/19/16.
So please shout if anyone has objections.
Thanks.
--yliu
---
>From aba9c7a3b1874f93347e2881f1fc55096393b8f7 Mon Sep 17 00:00:00 2001
From: Jingjing Wu <jingjing.wu@intel.com>
Date: Fri, 4 Nov 2016 13:42:33 +0800
Subject: [PATCH] net/i40e: fix DCB configuration
[ upstream commit c6431c891d9e9691e3205fe5c5350071cbaeb852 ]
Removing stopping LLDP in firmware is a workaround for a
known errata which can cause Rx hang. But the changing will
cause DCB configuration fails. That is because when LLDP is
enabled, the return value of i40e_init_dcb is success. But
following check just considered the case when LLDP agent
is disabled.
This patch fixes this issue.
Fixes: fcbd40d4327b ("net/i40e: fix Rx hang when disable LLDP")
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7614525..0a8f55d 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -9193,12 +9193,12 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb)
*/
if (sw_dcb == TRUE) {
ret = i40e_init_dcb(hw);
- /* if sw_dcb, lldp agent is stopped, the return from
+ /* If lldp agent is stopped, the return value from
* i40e_init_dcb we expect is failure with I40E_AQ_RC_EPERM
- * adminq status.
+ * adminq status. Otherwise, it should return success.
*/
- if (ret != I40E_SUCCESS &&
- hw->aq.asq_last_status == I40E_AQ_RC_EPERM) {
+ if ((ret == I40E_SUCCESS) || (ret != I40E_SUCCESS &&
+ hw->aq.asq_last_status == I40E_AQ_RC_EPERM)) {
memset(&hw->local_dcbx_config, 0,
sizeof(struct i40e_dcbx_config));
/* set dcb default configuration */
@@ -9227,8 +9227,8 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb)
return -ENOSYS;
}
} else {
- PMD_INIT_LOG(ERR, "DCBX configuration failed, err = %d,"
- " aq_err = %d.", ret,
+ PMD_INIT_LOG(ERR, "DCB initialization in FW fails,"
+ " err = %d, aq_err = %d.", ret,
hw->aq.asq_last_status);
return -ENOTSUP;
}
--
1.9.0
next prev parent reply other threads:[~2016-11-15 11:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-15 11:40 [dpdk-stable] patch 'eal/arm: fix file descriptor leak when getting CPU features' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'eal/ppc: " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'lpm: fix freeing memory' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'pci: fix probing error if no driver found' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'net/ixgbe: fix VF registers' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'app/testpmd: fix DCB configuration' " Yuanhan Liu
2016-11-15 11:40 ` Yuanhan Liu [this message]
2016-11-15 11:40 ` [dpdk-stable] patch 'net/enic: fix max packet length check' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'net/mlx5: fix handling of small mbuf sizes' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'net/mlx5: fix Rx checksum macros' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'net/vmxnet3: fix mbuf release on reset/stop' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'mempool: fix leak if populate fails' " Yuanhan Liu
2016-11-15 11:40 ` [dpdk-stable] patch 'net/virtio: revert fix restart' " Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479210033-24775-7-git-send-email-yuanhan.liu@linux.intel.com \
--to=yuanhan.liu@linux.intel.com \
--cc=beilei.xing@intel.com \
--cc=jingjing.wu@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).