Commit 17e415cf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2022-04-12

This series contains updates to i40e and ice drivers.

Joe Damato adds TSO support for MPLS packets on i40e and ice drivers. He
also adds tracking and reporting of tx_stopped statistic for i40e.

Nabil S. Alramli adds reporting of tx_restart to ethtool for i40e.

Mateusz adds new device id support for i40e.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8f1c3850 a941d5ee

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ struct i40e_vsi { 
	u64 tx_busy;

	u64 tx_linearize;

	u64 tx_force_wb;

	u64 tx_stopped;

	u64 rx_buf_failed;

	u64 rx_page_failed;

	u64 rx_page_reuse;

drivers/net/ethernet/intel/i40e/i40e_common.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_1G_BASE_T_X722:

		case I40E_DEV_ID_10G_BASE_T_X722:

		case I40E_DEV_ID_SFP_I_X722:

		case I40E_DEV_ID_SFP_X722_A:

			hw->mac.type = I40E_MAC_X722;

			break;

		default:

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -309,10 +309,11 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 tx_ring->stats.bytes,

			 tx_ring->tx_stats.restart_queue);

		dev_info(&pf->pdev->dev,

			 "    tx_rings[%i]: tx_stats: tx_busy = %lld, tx_done_old = %lld\n",

			 "    tx_rings[%i]: tx_stats: tx_busy = %lld, tx_done_old = %lld, tx_stopped = %lld\n",

			 i,

			 tx_ring->tx_stats.tx_busy,

			 tx_ring->tx_stats.tx_done_old);

			 tx_ring->tx_stats.tx_done_old,

			 tx_ring->tx_stats.tx_stopped);

		dev_info(&pf->pdev->dev,

			 "    tx_rings[%i]: size = %i\n",

			 i, tx_ring->size);

drivers/net/ethernet/intel/i40e/i40e_devids.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define I40E_DEV_ID_1G_BASE_T_X722	0x37D1

#define I40E_DEV_ID_10G_BASE_T_X722	0x37D2

#define I40E_DEV_ID_SFP_I_X722		0x37D3

#define I40E_DEV_ID_SFP_X722_A		0x0DDA





#endif /* _I40E_DEVIDS_H_ */

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -293,12 +293,14 @@ static const struct i40e_stats i40e_gstrings_misc_stats[] = { 
	I40E_VSI_STAT("tx_linearize", tx_linearize),

	I40E_VSI_STAT("tx_force_wb", tx_force_wb),

	I40E_VSI_STAT("tx_busy", tx_busy),

	I40E_VSI_STAT("tx_stopped", tx_stopped),

	I40E_VSI_STAT("rx_alloc_fail", rx_buf_failed),

	I40E_VSI_STAT("rx_pg_alloc_fail", rx_page_failed),

	I40E_VSI_STAT("rx_cache_reuse", rx_page_reuse),

	I40E_VSI_STAT("rx_cache_alloc", rx_page_alloc),

	I40E_VSI_STAT("rx_cache_waive", rx_page_waive),

	I40E_VSI_STAT("rx_cache_busy", rx_page_busy),

	I40E_VSI_STAT("tx_restart", tx_restart),

};



/* These PF_STATs might look like duplicates of some NETDEV_STATs,