* [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24
@ 2020-11-24 16:52 Tony Nguyen
2020-11-24 16:52 ` [net-next v2 1/3] i40e: remove redundant assignment Tony Nguyen
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Tony Nguyen @ 2020-11-24 16:52 UTC (permalink / raw)
To: davem, kuba; +Cc: Tony Nguyen, netdev, sassmann
This series contains updates to i40e and igbvf drivers.
Marek removes a redundant assignment for i40e.
Stefan Assmann corrects reporting of VF link speed for i40e.
Karen revises a couple of error messages to warnings for igbvf as they
could be misinterpreted as issues when they are not.
v2: Dropped PTP patch as it's being updated.
The following are changes since commit 5112cf59d76d799b1c4d66af92417e2673fb1d5b:
sctp: Fix some typo
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 40GbE
Karen Sornek (1):
igbvf: Refactor traces
Marek Majtyka (1):
i40e: remove redundant assignment
Stefan Assmann (1):
i40e: report correct VF link speed when link state is set to enable
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 +++--
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 1 -
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [net-next v2 1/3] i40e: remove redundant assignment
2020-11-24 16:52 [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 Tony Nguyen
@ 2020-11-24 16:52 ` Tony Nguyen
2020-11-24 16:52 ` [net-next v2 2/3] i40e: report correct VF link speed when link state is set to enable Tony Nguyen
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Tony Nguyen @ 2020-11-24 16:52 UTC (permalink / raw)
To: davem, kuba
Cc: Marek Majtyka, netdev, sassmann, anthony.l.nguyen,
Björn Töpel, George Kuruvinakunnel
From: Marek Majtyka <marekx.majtyka@intel.com>
Remove a redundant assignment of the software ring pointer in the i40e
driver. The variable is assigned twice with no use in between, so just
get rid of the first occurrence.
Fixes: 3b4f0b66c2b3 ("i40e, xsk: Migrate to new MEM_TYPE_XSK_BUFF_POOL")
Signed-off-by: Marek Majtyka <marekx.majtyka@intel.com>
Acked-by: Björn Töpel <bjorn.topel@intel.com>
Tested-by: George Kuruvinakunnel <george.kuruvinakunnel@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 567fd67e900e..67febc7b6798 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -311,7 +311,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
continue;
}
- bi = i40e_rx_bi(rx_ring, rx_ring->next_to_clean);
size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>
I40E_RXD_QW1_LENGTH_PBUF_SHIFT;
if (!size)
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [net-next v2 2/3] i40e: report correct VF link speed when link state is set to enable
2020-11-24 16:52 [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 Tony Nguyen
2020-11-24 16:52 ` [net-next v2 1/3] i40e: remove redundant assignment Tony Nguyen
@ 2020-11-24 16:52 ` Tony Nguyen
2020-11-24 16:52 ` [net-next v2 3/3] igbvf: Refactor traces Tony Nguyen
2020-11-26 2:20 ` [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Tony Nguyen @ 2020-11-24 16:52 UTC (permalink / raw)
To: davem, kuba
Cc: Stefan Assmann, netdev, sassmann, anthony.l.nguyen, Aaron Brown
From: Stefan Assmann <sassmann@kpanic.de>
When the virtual link state was set to "enable" ethtool would report
link speed as 40000Mb/s regardless of the underlying device.
Report the correct link speed.
Example from a XXV710 NIC.
Before:
$ ip link set ens3f0 vf 0 state auto
$ ethtool enp8s2 | grep Speed
Speed: 25000Mb/s
$ ip link set ens3f0 vf 0 state enable
$ ethtool enp8s2 | grep Speed
Speed: 40000Mb/s
After:
$ ip link set ens3f0 vf 0 state auto
$ ethtool enp8s2 | grep Speed
Speed: 25000Mb/s
$ ip link set ens3f0 vf 0 state enable
$ ethtool enp8s2 | grep Speed
Speed: 25000Mb/s
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 4919d22d7b6b..2532f8eed6a8 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -63,7 +63,7 @@ static void i40e_vc_notify_vf_link_state(struct i40e_vf *vf)
} else if (vf->link_forced) {
pfe.event_data.link_event.link_status = vf->link_up;
pfe.event_data.link_event.link_speed =
- (vf->link_up ? VIRTCHNL_LINK_SPEED_40GB : 0);
+ (vf->link_up ? i40e_virtchnl_link_speed(ls->link_speed) : 0);
} else {
pfe.event_data.link_event.link_status =
ls->link_info & I40E_AQ_LINK_UP;
@@ -4437,6 +4437,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_pf *pf = np->vsi->back;
+ struct i40e_link_status *ls = &pf->hw.phy.link_info;
struct virtchnl_pf_event pfe;
struct i40e_hw *hw = &pf->hw;
struct i40e_vf *vf;
@@ -4474,7 +4475,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
vf->link_forced = true;
vf->link_up = true;
pfe.event_data.link_event.link_status = true;
- pfe.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_40GB;
+ pfe.event_data.link_event.link_speed = i40e_virtchnl_link_speed(ls->link_speed);
break;
case IFLA_VF_LINK_STATE_DISABLE:
vf->link_forced = true;
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [net-next v2 3/3] igbvf: Refactor traces
2020-11-24 16:52 [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 Tony Nguyen
2020-11-24 16:52 ` [net-next v2 1/3] i40e: remove redundant assignment Tony Nguyen
2020-11-24 16:52 ` [net-next v2 2/3] i40e: report correct VF link speed when link state is set to enable Tony Nguyen
@ 2020-11-24 16:52 ` Tony Nguyen
2020-11-26 2:20 ` [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Tony Nguyen @ 2020-11-24 16:52 UTC (permalink / raw)
To: davem, kuba
Cc: Karen Sornek, netdev, sassmann, anthony.l.nguyen,
Aleksandr Loktionov, Aaron Brown
From: Karen Sornek <karen.sornek@intel.com>
Refactoring "PF still resetting" and changing "Failed
to add vlan id" to "Vlan id is not added"
messages because previous version looked like a bug
- it informed about changes that worked as
designed but might confuse users
Signed-off-by: Karen Sornek <karen.sornek@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index ee9f8c1dca83..30fdea24e94a 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1236,7 +1236,7 @@ static int igbvf_vlan_rx_add_vid(struct net_device *netdev,
spin_lock_bh(&hw->mbx_lock);
if (hw->mac.ops.set_vfta(hw, vid, true)) {
- dev_err(&adapter->pdev->dev, "Failed to add vlan id %d\n", vid);
+ dev_warn(&adapter->pdev->dev, "Vlan id %d\n is not added", vid);
spin_unlock_bh(&hw->mbx_lock);
return -EINVAL;
}
@@ -1520,7 +1520,7 @@ static void igbvf_reset(struct igbvf_adapter *adapter)
/* Allow time for pending master requests to run */
if (mac->ops.reset_hw(hw))
- dev_err(&adapter->pdev->dev, "PF still resetting\n");
+ dev_warn(&adapter->pdev->dev, "PF still resetting\n");
mac->ops.init_hw(hw);
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24
2020-11-24 16:52 [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 Tony Nguyen
` (2 preceding siblings ...)
2020-11-24 16:52 ` [net-next v2 3/3] igbvf: Refactor traces Tony Nguyen
@ 2020-11-26 2:20 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2020-11-26 2:20 UTC (permalink / raw)
To: Tony Nguyen; +Cc: davem, kuba, netdev, sassmann
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Tue, 24 Nov 2020 08:52:42 -0800 you wrote:
> This series contains updates to i40e and igbvf drivers.
>
> Marek removes a redundant assignment for i40e.
>
> Stefan Assmann corrects reporting of VF link speed for i40e.
>
> Karen revises a couple of error messages to warnings for igbvf as they
> could be misinterpreted as issues when they are not.
>
> [...]
Here is the summary with links:
- [net-next,v2,1/3] i40e: remove redundant assignment
https://git.kernel.org/netdev/net-next/c/088d5360d05a
- [net-next,v2,2/3] i40e: report correct VF link speed when link state is set to enable
https://git.kernel.org/netdev/net-next/c/6ec12e1e9404
- [net-next,v2,3/3] igbvf: Refactor traces
https://git.kernel.org/netdev/net-next/c/24453a84285e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-26 2:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 16:52 [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 Tony Nguyen
2020-11-24 16:52 ` [net-next v2 1/3] i40e: remove redundant assignment Tony Nguyen
2020-11-24 16:52 ` [net-next v2 2/3] i40e: report correct VF link speed when link state is set to enable Tony Nguyen
2020-11-24 16:52 ` [net-next v2 3/3] igbvf: Refactor traces Tony Nguyen
2020-11-26 2:20 ` [net-next v2 0/3][pull request] 40GbE Intel Wired LAN Driver Updates 2020-11-24 patchwork-bot+netdevbpf
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).