* [net 1/4] igb: fix uninitialized variables
2018-11-28 17:10 [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 Jeff Kirsher
@ 2018-11-28 17:10 ` Jeff Kirsher
2018-11-28 17:10 ` [net 2/4] i40e: Fix deletion of MAC filters Jeff Kirsher
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2018-11-28 17:10 UTC (permalink / raw)
To: davem; +Cc: Yunjian Wang, netdev, nhorman, sassmann, Jeff Kirsher
From: Yunjian Wang <wangyunjian@huawei.com>
This patch fixes the variable 'phy_word' may be used uninitialized.
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/e1000_i210.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
index c54ebedca6da..c393cb2c0f16 100644
--- a/drivers/net/ethernet/intel/igb/e1000_i210.c
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
@@ -842,6 +842,7 @@ s32 igb_pll_workaround_i210(struct e1000_hw *hw)
nvm_word = E1000_INVM_DEFAULT_AL;
tmp_nvm = nvm_word | E1000_INVM_PLL_WO_VAL;
igb_write_phy_reg_82580(hw, I347AT4_PAGE_SELECT, E1000_PHY_PLL_FREQ_PAGE);
+ phy_word = E1000_PHY_PLL_UNCONF;
for (i = 0; i < E1000_MAX_PLL_TRIES; i++) {
/* check current state directly from internal PHY */
igb_read_phy_reg_82580(hw, E1000_PHY_PLL_FREQ_REG, &phy_word);
--
2.19.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net 2/4] i40e: Fix deletion of MAC filters
2018-11-28 17:10 [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 Jeff Kirsher
2018-11-28 17:10 ` [net 1/4] igb: fix uninitialized variables Jeff Kirsher
@ 2018-11-28 17:10 ` Jeff Kirsher
2018-11-28 17:10 ` [net 3/4] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps Jeff Kirsher
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2018-11-28 17:10 UTC (permalink / raw)
To: davem; +Cc: Lihong Yang, netdev, nhorman, sassmann, stable, Jeff Kirsher
From: Lihong Yang <lihong.yang@intel.com>
In __i40e_del_filter function, the flag __I40E_MACVLAN_SYNC_PENDING for
the PF state is wrongly set for the VSI. Deleting any of the MAC filters
has caused the incorrect syncing for the PF. Fix it by setting this state
flag to the intended PF.
CC: stable <stable@vger.kernel.org>
Signed-off-by: Lihong Yang <lihong.yang@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 21c2688d6308..a3f45335437c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1413,7 +1413,7 @@ void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)
}
vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
- set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->state);
+ set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);
}
/**
--
2.19.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net 3/4] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps
2018-11-28 17:10 [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 Jeff Kirsher
2018-11-28 17:10 ` [net 1/4] igb: fix uninitialized variables Jeff Kirsher
2018-11-28 17:10 ` [net 2/4] i40e: Fix deletion of MAC filters Jeff Kirsher
@ 2018-11-28 17:10 ` Jeff Kirsher
2018-11-28 17:10 ` [net 4/4] i40e: fix kerneldoc for xsk methods Jeff Kirsher
2018-11-28 19:33 ` [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2018-11-28 17:10 UTC (permalink / raw)
To: davem; +Cc: Josh Elsasser, netdev, nhorman, sassmann, Jeff Kirsher
From: Josh Elsasser <jelsasser@appneta.com>
Add the two 1000BaseLX enum values to the X550's check for 1Gbps modules,
allowing the core driver code to establish a link over this SFP type.
This is done by the out-of-tree driver but the fix wasn't in mainline.
Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+”)
Fixes: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
Signed-off-by: Josh Elsasser <jelsasser@appneta.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 10dbaf4f6e80..9c42f741ed5e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2262,7 +2262,9 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
*autoneg = false;
if (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
- hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 ||
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1) {
*speed = IXGBE_LINK_SPEED_1GB_FULL;
return 0;
}
--
2.19.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net 4/4] i40e: fix kerneldoc for xsk methods
2018-11-28 17:10 [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 Jeff Kirsher
` (2 preceding siblings ...)
2018-11-28 17:10 ` [net 3/4] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps Jeff Kirsher
@ 2018-11-28 17:10 ` Jeff Kirsher
2018-11-28 19:33 ` [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2018-11-28 17:10 UTC (permalink / raw)
To: davem; +Cc: Jan Sokolowski, netdev, nhorman, sassmann, Jeff Kirsher
From: Jan Sokolowski <jan.sokolowski@intel.com>
One method, xsk_umem_setup, had an incorrect kernel doc
description, which has been corrected.
Also fixes small typos found in the comments.
Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index add1e457886d..433c8e688c78 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -33,7 +33,7 @@ static int i40e_alloc_xsk_umems(struct i40e_vsi *vsi)
}
/**
- * i40e_add_xsk_umem - Store an UMEM for a certain ring/qid
+ * i40e_add_xsk_umem - Store a UMEM for a certain ring/qid
* @vsi: Current VSI
* @umem: UMEM to store
* @qid: Ring/qid to associate with the UMEM
@@ -56,7 +56,7 @@ static int i40e_add_xsk_umem(struct i40e_vsi *vsi, struct xdp_umem *umem,
}
/**
- * i40e_remove_xsk_umem - Remove an UMEM for a certain ring/qid
+ * i40e_remove_xsk_umem - Remove a UMEM for a certain ring/qid
* @vsi: Current VSI
* @qid: Ring/qid associated with the UMEM
**/
@@ -130,7 +130,7 @@ static void i40e_xsk_umem_dma_unmap(struct i40e_vsi *vsi, struct xdp_umem *umem)
}
/**
- * i40e_xsk_umem_enable - Enable/associate an UMEM to a certain ring/qid
+ * i40e_xsk_umem_enable - Enable/associate a UMEM to a certain ring/qid
* @vsi: Current VSI
* @umem: UMEM
* @qid: Rx ring to associate UMEM to
@@ -189,7 +189,7 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,
}
/**
- * i40e_xsk_umem_disable - Diassociate an UMEM from a certain ring/qid
+ * i40e_xsk_umem_disable - Disassociate a UMEM from a certain ring/qid
* @vsi: Current VSI
* @qid: Rx ring to associate UMEM to
*
@@ -255,12 +255,12 @@ int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem,
}
/**
- * i40e_xsk_umem_query - Queries a certain ring/qid for its UMEM
+ * i40e_xsk_umem_setup - Enable/disassociate a UMEM to/from a ring/qid
* @vsi: Current VSI
* @umem: UMEM to enable/associate to a ring, or NULL to disable
* @qid: Rx ring to (dis)associate UMEM (from)to
*
- * This function enables or disables an UMEM to a certain ring.
+ * This function enables or disables a UMEM to a certain ring.
*
* Returns 0 on success, <0 on failure
**/
@@ -276,7 +276,7 @@ int i40e_xsk_umem_setup(struct i40e_vsi *vsi, struct xdp_umem *umem,
* @rx_ring: Rx ring
* @xdp: xdp_buff used as input to the XDP program
*
- * This function enables or disables an UMEM to a certain ring.
+ * This function enables or disables a UMEM to a certain ring.
*
* Returns any of I40E_XDP_{PASS, CONSUMED, TX, REDIR}
**/
--
2.19.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28
2018-11-28 17:10 [net 0/4][pull request] Intel Wired LAN Driver Fixes 2018-11-28 Jeff Kirsher
` (3 preceding siblings ...)
2018-11-28 17:10 ` [net 4/4] i40e: fix kerneldoc for xsk methods Jeff Kirsher
@ 2018-11-28 19:33 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-11-28 19:33 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, nhorman, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 28 Nov 2018 09:10:18 -0800
> This series contains fixes to igb, ixgbe and i40e.
>
> Yunjian Wang from Huawei resolves a variable that could potentially be
> NULL before it is used.
>
> Lihong fixes an i40e issue which goes back to 4.17 kernels, where
> deleting any of the MAC filters was causing the incorrect syncing for
> the PF.
>
> Josh Elsasser caught that there were missing enum values in the link
> capabilities for x550 devices, which was preventing link for 1000BaseLX
> SFP modules.
>
> Jan fixes the function header comments for XSK methods.
>
> The following are changes since commit 4df5ce9bc03e47d05f400e64aa32a82ec4cef419:
> lan743x: Enable driver to work with LAN7431
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 1GbE
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 6+ messages in thread