Commit 4615855e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-12-03 (ice, idpf, ixgbe, ixgbevf, igb)

This series contains updates to ice, idpf, ixgbe, ixgbevf, and igb
drivers.

For ice:
Arkadiusz corrects search for determining whether PHY clock recovery is
supported on the device.

Przemyslaw corrects mask used for PHY timestamps on ETH56G devices.

Wojciech adds missing virtchnl ops which caused NULL pointer
dereference.

Marcin fixes VLAN filter settings for uplink VSI in switchdev mode.

For idpf:
Josh restores setting of completion tag for empty buffers.

For ixgbevf:
Jake removes incorrect initialization/support of IPSEC for mailbox
version 1.5.

For ixgbe:
Jake rewords and downgrades misleading message when negotiation
of VF mailbox version is not supported.

Tore Amundsen corrects value for BASE-BX10 capability.

For igb:
Yuan Can adds proper teardown on failed pci_register_driver() call.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  igb: Fix potential invalid memory access in igb_init_module()
  ixgbe: Correct BASE-BX10 compliance code
  ixgbe: downgrade logging of unsupported VF API version to debug
  ixgbevf: stop attempting IPSEC offload on Mailbox API 1.5
  idpf: set completion tag for "empty" bufs associated with a packet
  ice: Fix VLAN pruning in switchdev mode
  ice: Fix NULL pointer dereference in switchdev
  ice: fix PHY timestamp extraction for ETH56G
  ice: fix PHY Clock Recovery availability check
====================

Link: https://patch.msgid.link/20241203215521.1646668-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 18317290 0566f83d

drivers/net/ethernet/intel/ice/ice_common.c

+17 −8
Original line number Diff line number Diff line
@@ -542,7 +542,8 @@ ice_aq_get_netlist_node(struct ice_hw *hw, struct ice_aqc_get_link_topo *cmd, 
/**

 * ice_find_netlist_node

 * @hw: pointer to the hw struct

 * @node_type_ctx: type of netlist node to look for

 * @node_type: type of netlist node to look for

 * @ctx: context of the search

 * @node_part_number: node part number to look for

 * @node_handle: output parameter if node found - optional

 *
@@ -552,10 +553,12 @@ ice_aq_get_netlist_node(struct ice_hw *hw, struct ice_aqc_get_link_topo *cmd, 
 * valid if the function returns zero, and should be ignored on any non-zero

 * return value.

 *

 * Returns: 0 if the node is found, -ENOENT if no handle was found, and

 * a negative error code on failure to access the AQ.

 * Return:

 * * 0 if the node is found,

 * * -ENOENT if no handle was found,

 * * negative error code on failure to access the AQ.

 */

static int ice_find_netlist_node(struct ice_hw *hw, u8 node_type_ctx,

static int ice_find_netlist_node(struct ice_hw *hw, u8 node_type, u8 ctx,

				 u8 node_part_number, u16 *node_handle)

{

	u8 idx;
@@ -566,8 +569,8 @@ static int ice_find_netlist_node(struct ice_hw *hw, u8 node_type_ctx, 
		int status;



		cmd.addr.topo_params.node_type_ctx =

			FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_TYPE_M,

				   node_type_ctx);

			FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_TYPE_M, node_type) |

			FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_CTX_M, ctx);

		cmd.addr.topo_params.index = idx;



		status = ice_aq_get_netlist_node(hw, &cmd,
@@ -2747,9 +2750,11 @@ bool ice_is_pf_c827(struct ice_hw *hw) 
 */

bool ice_is_phy_rclk_in_netlist(struct ice_hw *hw)

{

	if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_CLK_CTRL,

	if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_PHY,

				  ICE_AQC_LINK_TOPO_NODE_CTX_PORT,

				  ICE_AQC_GET_LINK_TOPO_NODE_NR_C827, NULL) &&

	    ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_CLK_CTRL,

	    ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_PHY,

				  ICE_AQC_LINK_TOPO_NODE_CTX_PORT,

				  ICE_AQC_GET_LINK_TOPO_NODE_NR_E822_PHY, NULL))

		return false;
@@ -2765,6 +2770,7 @@ bool ice_is_phy_rclk_in_netlist(struct ice_hw *hw) 
bool ice_is_clock_mux_in_netlist(struct ice_hw *hw)

{

	if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_CLK_MUX,

				  ICE_AQC_LINK_TOPO_NODE_CTX_GLOBAL,

				  ICE_AQC_GET_LINK_TOPO_NODE_NR_GEN_CLK_MUX,

				  NULL))

		return false;
@@ -2785,12 +2791,14 @@ bool ice_is_clock_mux_in_netlist(struct ice_hw *hw) 
bool ice_is_cgu_in_netlist(struct ice_hw *hw)

{

	if (!ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_CLK_CTRL,

				   ICE_AQC_LINK_TOPO_NODE_CTX_GLOBAL,

				   ICE_AQC_GET_LINK_TOPO_NODE_NR_ZL30632_80032,

				   NULL)) {

		hw->cgu_part_number = ICE_AQC_GET_LINK_TOPO_NODE_NR_ZL30632_80032;

		return true;

	} else if (!ice_find_netlist_node(hw,

					  ICE_AQC_LINK_TOPO_NODE_TYPE_CLK_CTRL,

					  ICE_AQC_LINK_TOPO_NODE_CTX_GLOBAL,

					  ICE_AQC_GET_LINK_TOPO_NODE_NR_SI5383_5384,

					  NULL)) {

		hw->cgu_part_number = ICE_AQC_GET_LINK_TOPO_NODE_NR_SI5383_5384;
@@ -2809,6 +2817,7 @@ bool ice_is_cgu_in_netlist(struct ice_hw *hw) 
bool ice_is_gps_in_netlist(struct ice_hw *hw)

{

	if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_GPS,

				  ICE_AQC_LINK_TOPO_NODE_CTX_GLOBAL,

				  ICE_AQC_GET_LINK_TOPO_NODE_NR_GEN_GPS, NULL))

		return false;

drivers/net/ethernet/intel/ice/ice_main.c

+5 −3
Original line number Diff line number Diff line
@@ -6408,10 +6408,12 @@ ice_set_vlan_filtering_features(struct ice_vsi *vsi, netdev_features_t features) 
	int err = 0;



	/* support Single VLAN Mode (SVM) and Double VLAN Mode (DVM) by checking

	 * if either bit is set

	 * if either bit is set. In switchdev mode Rx filtering should never be

	 * enabled.

	 */

	if (features &

	    (NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER))

	if ((features &

	     (NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER)) &&

	     !ice_is_eswitch_mode_switchdev(vsi->back))

		err = vlan_ops->ena_rx_filtering(vsi);

	else

		err = vlan_ops->dis_rx_filtering(vsi);

drivers/net/ethernet/intel/ice/ice_ptp_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -1518,7 +1518,8 @@ static int ice_read_ptp_tstamp_eth56g(struct ice_hw *hw, u8 port, u8 idx, 
	 * lower 8 bits in the low register, and the upper 32 bits in the high

	 * register.

	 */

	*tstamp = ((u64)hi) << TS_PHY_HIGH_S | ((u64)lo & TS_PHY_LOW_M);

	*tstamp = FIELD_PREP(TS_PHY_HIGH_M, hi) |

		  FIELD_PREP(TS_PHY_LOW_M, lo);



	return 0;

}

drivers/net/ethernet/intel/ice/ice_ptp_hw.h

+2 −3
Original line number Diff line number Diff line
@@ -682,9 +682,8 @@ static inline bool ice_is_dual(struct ice_hw *hw) 
#define TS_HIGH_M			0xFF

#define TS_HIGH_S			32



#define TS_PHY_LOW_M			0xFF

#define TS_PHY_HIGH_M			0xFFFFFFFF

#define TS_PHY_HIGH_S			8

#define TS_PHY_LOW_M			GENMASK(7, 0)

#define TS_PHY_HIGH_M			GENMASK_ULL(39, 8)



#define BYTES_PER_IDX_ADDR_L_U		8

#define BYTES_PER_IDX_ADDR_L		4

drivers/net/ethernet/intel/ice/ice_virtchnl.c

+6 −0
Original line number Diff line number Diff line
@@ -4128,6 +4128,9 @@ static const struct ice_virtchnl_ops ice_virtchnl_dflt_ops = { 
	.get_qos_caps = ice_vc_get_qos_caps,

	.cfg_q_bw = ice_vc_cfg_q_bw,

	.cfg_q_quanta = ice_vc_cfg_q_quanta,

	/* If you add a new op here please make sure to add it to

	 * ice_virtchnl_repr_ops as well.

	 */

};



/**
@@ -4258,6 +4261,9 @@ static const struct ice_virtchnl_ops ice_virtchnl_repr_ops = { 
	.dis_vlan_stripping_v2_msg = ice_vc_dis_vlan_stripping_v2_msg,

	.ena_vlan_insertion_v2_msg = ice_vc_ena_vlan_insertion_v2_msg,

	.dis_vlan_insertion_v2_msg = ice_vc_dis_vlan_insertion_v2_msg,

	.get_qos_caps = ice_vc_get_qos_caps,

	.cfg_q_bw = ice_vc_cfg_q_bw,

	.cfg_q_quanta = ice_vc_cfg_q_quanta,

};



/**