* [dpdk-dev] [PATCH 1/9] net/ixgbe/base: make a debug message simple
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 2/9] net/ixgbe/base: remove X550em SFP iXFI setup Wenzhuo Lu
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
The debug message is too long. Make it shorter.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 6f9c034..cf72bba 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2519,7 +2519,7 @@ s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)
status);
if (status == IXGBE_ERR_SFP_NOT_SUPPORTED) {
- DEBUGOUT("Returning from reset HW since PHY ops init returned IXGBE_ERR_SFP_NOT_SUPPORTED\n");
+ DEBUGOUT("Returning from reset HW due to PHY init failure\n");
return status;
}
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 2/9] net/ixgbe/base: remove X550em SFP iXFI setup
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 1/9] net/ixgbe/base: make a debug message simple Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 3/9] net/ixgbe/base: add link block check for KR Wenzhuo Lu
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Removes X550em SFP iXFI setup since there is no released
HW production with SFP iXFI.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 57 +++++++------------------------------
1 file changed, 11 insertions(+), 46 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index cf72bba..a28ced1 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2694,53 +2694,18 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
if (ret_val != IXGBE_SUCCESS)
return ret_val;
- if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
- /* Configure CS4227 LINE side to 10G SR. */
- reg_slice = IXGBE_CS4227_LINE_SPARE22_MSB +
- (hw->bus.lan_id << 12);
- reg_val = IXGBE_CS4227_SPEED_10G;
- ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
- reg_val);
-
- reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
- (hw->bus.lan_id << 12);
+ /* Configure internal PHY for KR/KX. */
+ ixgbe_setup_kr_speed_x550em(hw, speed);
+
+ /* Configure CS4227 LINE side to proper mode. */
+ reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
+ (hw->bus.lan_id << 12);
+ if (setup_linear)
+ reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
+ else
reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
- ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
- reg_val);
-
- /* Configure CS4227 for HOST connection rate then type. */
- reg_slice = IXGBE_CS4227_HOST_SPARE22_MSB +
- (hw->bus.lan_id << 12);
- reg_val = (speed & IXGBE_LINK_SPEED_10GB_FULL) ?
- IXGBE_CS4227_SPEED_10G : IXGBE_CS4227_SPEED_1G;
- ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
- reg_val);
-
- reg_slice = IXGBE_CS4227_HOST_SPARE24_LSB +
- (hw->bus.lan_id << 12);
- if (setup_linear)
- reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
- else
- reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
- ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
- reg_val);
-
- /* Setup XFI internal link. */
- ret_val = ixgbe_setup_ixfi_x550em(hw, &speed);
- } else {
- /* Configure internal PHY for KR/KX. */
- ixgbe_setup_kr_speed_x550em(hw, speed);
-
- /* Configure CS4227 LINE side to proper mode. */
- reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
- (hw->bus.lan_id << 12);
- if (setup_linear)
- reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
- else
- reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
- ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
- reg_val);
- }
+ ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+ reg_val);
return ret_val;
}
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 3/9] net/ixgbe/base: add link block check for KR
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 1/9] net/ixgbe/base: make a debug message simple Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 2/9] net/ixgbe/base: remove X550em SFP iXFI setup Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 4/9] net/ixgbe/base: add bit for enabling L3/L4 filtering Wenzhuo Lu
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
When setting up link on x550 KR devices, should check
if there're constraints on link from manageability, which
may result in link loss.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_x550.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index a28ced1..1058684 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2663,6 +2663,9 @@ s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL)
return IXGBE_SUCCESS;
+ if (ixgbe_check_reset_blocked(hw))
+ return 0;
+
return ixgbe_setup_kr_speed_x550em(hw, hw->phy.autoneg_advertised);
}
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 4/9] net/ixgbe/base: add bit for enabling L3/L4 filtering
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (2 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 3/9] net/ixgbe/base: add link block check for KR Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 5/9] net/ixgbe/base: complete hw init when SFP not present Wenzhuo Lu
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Add a L3/L4 filtering definition of register MRQC for
the future use.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_type.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index bb1f85b..6acd966 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -2622,6 +2622,7 @@ enum {
#define IXGBE_MRQC_VMDQRSS64EN 0x0000000B /* VMDq2 64 pools w/ RSS */
#define IXGBE_MRQC_VMDQRT8TCEN 0x0000000C /* VMDq2/RT 16 pool 8 TC */
#define IXGBE_MRQC_VMDQRT4TCEN 0x0000000D /* VMDq2/RT 32 pool 4 TC */
+#define IXGBE_MRQC_L3L4TXSWEN 0x00008000 /* Enable L3/L4 Tx switch */
#define IXGBE_MRQC_RSS_FIELD_MASK 0xFFFF0000
#define IXGBE_MRQC_RSS_FIELD_IPV4_TCP 0x00010000
#define IXGBE_MRQC_RSS_FIELD_IPV4 0x00020000
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 5/9] net/ixgbe/base: complete hw init when SFP not present
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (3 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 4/9] net/ixgbe/base: add bit for enabling L3/L4 filtering Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 6/9] net/ixgbe/base: disable FC for 15B0 Wenzhuo Lu
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
If SFP module is not present, reset_hw doesn't return success.
SW should complete the initialization, or with specific module
it resulted in no link when the module was later inserted.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 9645667..df6fbf9 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -495,7 +495,7 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)
/* Reset the hardware */
status = hw->mac.ops.reset_hw(hw);
- if (status == IXGBE_SUCCESS) {
+ if (status == IXGBE_SUCCESS || status == IXGBE_ERR_SFP_NOT_PRESENT) {
/* Start the HW */
status = hw->mac.ops.start_hw(hw);
}
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 6/9] net/ixgbe/base: disable FC for 15B0
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (4 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 5/9] net/ixgbe/base: complete hw init when SFP not present Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 7/9] net/ixgbe: support xcast promisc mode Wenzhuo Lu
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Make sure that ixgbe_device_supports_autoneg_fc()
returns false and hw->fc.disable_fc_autoneg is set
to true to avoid running the fc_autoneg function
for the device 15B0, as this device doesn't support
this function.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_common.c | 5 ++++-
drivers/net/ixgbe/base/ixgbe_x550.c | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index df6fbf9..4dabb43 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -189,7 +189,10 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
break;
case ixgbe_media_type_backplane:
- supported = true;
+ if (hw->device_id == IXGBE_DEV_ID_X550EM_X_XFI)
+ supported = false;
+ else
+ supported = true;
break;
case ixgbe_media_type_copper:
/* only some copper devices support flow control autoneg */
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 1058684..3049865 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -4005,6 +4005,9 @@ s32 ixgbe_setup_fc_X550em(struct ixgbe_hw *hw)
/* This device does not fully support AN. */
hw->fc.disable_fc_autoneg = true;
break;
+ case IXGBE_DEV_ID_X550EM_X_XFI:
+ hw->fc.disable_fc_autoneg = true;
+ break;
default:
break;
}
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 7/9] net/ixgbe: support xcast promisc mode
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (5 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 6/9] net/ixgbe/base: disable FC for 15B0 Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-01 6:04 ` [dpdk-dev] [PATCH 8/9] net/ixgbe/base: fix build error Wenzhuo Lu
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Add the support of xcast promiscuous mode. It's
added in mailbox v1.3.
Move the definition of xcast mode to base code.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_mbx.h | 8 ++++++++
drivers/net/ixgbe/base/ixgbe_vf.c | 4 ++++
drivers/net/ixgbe/ixgbe_ethdev.c | 6 ------
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.h b/drivers/net/ixgbe/base/ixgbe_mbx.h
index 7556a81..bde50a5 100644
--- a/drivers/net/ixgbe/base/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/base/ixgbe_mbx.h
@@ -114,6 +114,14 @@ enum ixgbe_pfvf_api_rev {
#define IXGBE_VF_GET_RSS_KEY 0x0b /* get RSS key */
#define IXGBE_VF_UPDATE_XCAST_MODE 0x0c
+/* mode choices for IXGBE_VF_UPDATE_XCAST_MODE */
+enum ixgbevf_xcast_modes {
+ IXGBEVF_XCAST_MODE_NONE = 0,
+ IXGBEVF_XCAST_MODE_MULTI,
+ IXGBEVF_XCAST_MODE_ALLMULTI,
+ IXGBEVF_XCAST_MODE_PROMISC,
+};
+
/* GET_QUEUES return data indices within the mailbox */
#define IXGBE_VF_TX_QUEUES 1 /* number of Tx queues supported */
#define IXGBE_VF_RX_QUEUES 2 /* number of Rx queues supported */
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c
index 8775ee5..b513190 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -432,6 +432,10 @@ s32 ixgbevf_update_xcast_mode(struct ixgbe_hw *hw, int xcast_mode)
switch (hw->api_version) {
case ixgbe_mbox_api_12:
+ /* New modes were introduced in 1.3 version */
+ if (xcast_mode > IXGBEVF_XCAST_MODE_ALLMULTI)
+ return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+ /* Fall through */
case ixgbe_mbox_api_13:
break;
default:
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 7169007..2e497a8 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -155,12 +155,6 @@
#define IXGBE_QDE_STRIP_TAG 0x00000004
#define IXGBE_VTEICR_MASK 0x07
-enum ixgbevf_xcast_modes {
- IXGBEVF_XCAST_MODE_NONE = 0,
- IXGBEVF_XCAST_MODE_MULTI,
- IXGBEVF_XCAST_MODE_ALLMULTI,
-};
-
#define IXGBE_EXVET_VET_EXT_SHIFT 16
#define IXGBE_DMATXCTL_VT_MASK 0xFFFF0000
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 8/9] net/ixgbe/base: fix build error
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (6 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 7/9] net/ixgbe: support xcast promisc mode Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-03 22:27 ` Ferruh Yigit
2017-03-01 6:04 ` [dpdk-dev] [PATCH 9/9] net/ixgbe/base: update readme Wenzhuo Lu
2017-03-03 22:29 ` [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Ferruh Yigit
9 siblings, 1 reply; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Fix ICC build error by removing the EWARN third parameter.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/ixgbe/base/ixgbe_phy.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index c953805..d2d06cf 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -1540,16 +1540,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
status = IXGBE_SUCCESS;
} else {
if (hw->allow_unsupported_sfp == true) {
- EWARN(hw, "WARNING: Intel (R) Network "
- "Connections are quality tested "
- "using Intel (R) Ethernet Optics."
- " Using untested modules is not "
- "supported and may cause unstable"
- " operation or damage to the "
- "module or the adapter. Intel "
- "Corporation is not responsible "
- "for any harm caused by using "
- "untested modules.\n", status);
+ EWARN(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
status = IXGBE_SUCCESS;
} else {
DEBUGOUT("SFP+ module not supported\n");
@@ -1802,16 +1793,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
status = IXGBE_SUCCESS;
} else {
if (hw->allow_unsupported_sfp == true) {
- EWARN(hw, "WARNING: Intel (R) Network "
- "Connections are quality tested "
- "using Intel (R) Ethernet Optics."
- " Using untested modules is not "
- "supported and may cause unstable"
- " operation or damage to the "
- "module or the adapter. Intel "
- "Corporation is not responsible "
- "for any harm caused by using "
- "untested modules.\n", status);
+ EWARN(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
status = IXGBE_SUCCESS;
} else {
DEBUGOUT("QSFP module not supported\n");
@@ -1836,7 +1818,6 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
return IXGBE_ERR_SFP_NOT_PRESENT;
}
-
/**
* ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
* @hw: pointer to hardware structure
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-dev] [PATCH 8/9] net/ixgbe/base: fix build error
2017-03-01 6:04 ` [dpdk-dev] [PATCH 8/9] net/ixgbe/base: fix build error Wenzhuo Lu
@ 2017-03-03 22:27 ` Ferruh Yigit
0 siblings, 0 replies; 13+ messages in thread
From: Ferruh Yigit @ 2017-03-03 22:27 UTC (permalink / raw)
To: Wenzhuo Lu, dev
On 3/1/2017 6:04 AM, Wenzhuo Lu wrote:
> Fix ICC build error by removing the EWARN third parameter.
Build error:
.../drivers/net/ixgbe/base/ixgbe_phy.c(1543):
error #268: the format string ends before this argument
EWARN(hw, "WARNING: Intel (R) Network "
^
.../drivers/net/ixgbe/base/ixgbe_phy.c(1805):
error #268: the format string ends before this argument
EWARN(hw, "WARNING: Intel (R) Network "
^
Fixes: aa4fc14d2cee ("ixgbe: update base driver")
Fixes: b94a06c1b451 ("ixgbe/base: support qsfp and lco")
Cc: stable@dpdk.org
>
> Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> ---
> drivers/net/ixgbe/base/ixgbe_phy.c | 23 ++---------------------
> 1 file changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
> index c953805..d2d06cf 100644
> --- a/drivers/net/ixgbe/base/ixgbe_phy.c
> +++ b/drivers/net/ixgbe/base/ixgbe_phy.c
> @@ -1540,16 +1540,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
> status = IXGBE_SUCCESS;
> } else {
> if (hw->allow_unsupported_sfp == true) {
> - EWARN(hw, "WARNING: Intel (R) Network "
> - "Connections are quality tested "
> - "using Intel (R) Ethernet Optics."
> - " Using untested modules is not "
> - "supported and may cause unstable"
> - " operation or damage to the "
> - "module or the adapter. Intel "
> - "Corporation is not responsible "
> - "for any harm caused by using "
> - "untested modules.\n", status);
> + EWARN(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
Although it has been agreed to not break log messages, this one is too long.
The reason to not break log message is to be able to search and find
message in the source code. Not required to have multi sentences in
single line, so log updated to break by sentences boundaries.
> status = IXGBE_SUCCESS;
> } else {
> DEBUGOUT("SFP+ module not supported\n");
> @@ -1802,16 +1793,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
> status = IXGBE_SUCCESS;
> } else {
> if (hw->allow_unsupported_sfp == true) {
> - EWARN(hw, "WARNING: Intel (R) Network "
> - "Connections are quality tested "
> - "using Intel (R) Ethernet Optics."
> - " Using untested modules is not "
> - "supported and may cause unstable"
> - " operation or damage to the "
> - "module or the adapter. Intel "
> - "Corporation is not responsible "
> - "for any harm caused by using "
> - "untested modules.\n", status);
> + EWARN(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
> status = IXGBE_SUCCESS;
> } else {
> DEBUGOUT("QSFP module not supported\n");
> @@ -1836,7 +1818,6 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
> return IXGBE_ERR_SFP_NOT_PRESENT;
> }
>
> -
> /**
> * ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
> * @hw: pointer to hardware structure
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH 9/9] net/ixgbe/base: update readme
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (7 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 8/9] net/ixgbe/base: fix build error Wenzhuo Lu
@ 2017-03-01 6:04 ` Wenzhuo Lu
2017-03-03 22:28 ` Ferruh Yigit
2017-03-03 22:29 ` [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Ferruh Yigit
9 siblings, 1 reply; 13+ messages in thread
From: Wenzhuo Lu @ 2017-03-01 6:04 UTC (permalink / raw)
To: dev; +Cc: Wenzhuo Lu
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
doc/guides/rel_notes/release_17_05.rst | 8 ++++++++
drivers/net/ixgbe/base/README | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/guides/rel_notes/release_17_05.rst b/doc/guides/rel_notes/release_17_05.rst
index e25ea9f..ab87e81 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -41,6 +41,14 @@ New Features
Also, make sure to start the actual text at the margin.
=========================================================
+* **Updated the ixgbe base driver.**
+
+ Updated the ixgbe base driver, including the following changes:
+
+ * Add link block check for KR.
+ * Complete HW initialization even if SFP is not present.
+ * Add VF xcast promiscuous mode.
+
Resolved Issues
---------------
diff --git a/drivers/net/ixgbe/base/README b/drivers/net/ixgbe/base/README
index 0a6054f..49bb27c 100644
--- a/drivers/net/ixgbe/base/README
+++ b/drivers/net/ixgbe/base/README
@@ -1,7 +1,7 @@
..
BSD LICENSE
- Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@ Intel® IXGBE driver
===================
This directory contains source code of FreeBSD ixgbe driver of version
-cid-10g-shared-code.2017.01.05 released by the team which develop
+cid-10g-shared-code.2017.02.27 released by the team which develop
basic drivers for any ixgbe NIC. The sub-directory of base/
contains the original source package.
This driver is valid for the product(s) listed below
--
1.9.3
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-dev] [PATCH 0/9] Update ixgbe base driver
2017-03-01 6:04 [dpdk-dev] [PATCH 0/9] Update ixgbe base driver Wenzhuo Lu
` (8 preceding siblings ...)
2017-03-01 6:04 ` [dpdk-dev] [PATCH 9/9] net/ixgbe/base: update readme Wenzhuo Lu
@ 2017-03-03 22:29 ` Ferruh Yigit
9 siblings, 0 replies; 13+ messages in thread
From: Ferruh Yigit @ 2017-03-03 22:29 UTC (permalink / raw)
To: Wenzhuo Lu, dev
On 3/1/2017 6:04 AM, Wenzhuo Lu wrote:
> Some minor changes and fixes, including,
> link block check for KR,
> complete HW initialization even if SFP is not present,
> add VF xcast promiscuous mode.
>
> Wenzhuo Lu (9):
> net/ixgbe/base: make a debug message simple
> net/ixgbe/base: remove X550em SFP iXFI setup
> net/ixgbe/base: add link block check for KR
> net/ixgbe/base: add bit for enabling L3/L4 filtering
> net/ixgbe/base: complete hw init when SFP not present
> net/ixgbe/base: disable FC for 15B0
> net/ixgbe: support xcast promisc mode
> net/ixgbe/base: fix build error
> net/ixgbe/base: update readme
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread