Commit cddd2dc6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-05-08 (most Intel drivers)

This series contains updates to i40e, iavf, ice, igb, igc, e1000e, and ixgbe
drivers.

Asbjørn Sloth Tønnesen adds checks against supported flower control flags
for i40e, iavf, ice, and igb drivers.

Michal corrects filters removed during eswitch release for ice.

Corinna Vinschen defers PTP initialization to later in probe so that
netdev log entry is initialized on igc.

Ilpo Järvinen removes a couple of unused, duplicate defines on
e1000e and ixgbe.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates
  igc: fix a log entry using uninitialized netdev
  ice: remove correct filters during eswitch release
  igb: flower: validate control flags
  ice: flower: validate control flags
  iavf: flower: validate control flags
  i40e: flower: validate control flags
====================

Link: https://lore.kernel.org/r/20240508173342.2760994-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 24e28b60 6918107e

drivers/net/ethernet/intel/e1000e/defines.h

+0 −2
Original line number Diff line number Diff line
@@ -679,8 +679,6 @@ 
/* PCI/PCI-X/PCI-EX Config space */

#define PCI_HEADER_TYPE_REGISTER     0x0E



#define PCI_HEADER_TYPE_MULTIFUNC    0x80



#define PHY_REVISION_MASK      0xFFFFFFF0

#define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */

#define MAX_PHY_MULTI_PAGE_REG 0xF

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

+4 −0
Original line number Diff line number Diff line
@@ -8671,6 +8671,10 @@ static int i40e_parse_cls_flower(struct i40e_vsi *vsi, 


		flow_rule_match_control(rule, &match);

		addr_type = match.key->addr_type;



		if (flow_rule_has_control_flags(match.mask->flags,

						f->common.extack))

			return -EOPNOTSUPP;

	}



	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

drivers/net/ethernet/intel/iavf/iavf_main.c

+4 −0
Original line number Diff line number Diff line
@@ -3757,6 +3757,10 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter, 


		flow_rule_match_control(rule, &match);

		addr_type = match.key->addr_type;



		if (flow_rule_has_control_flags(match.mask->flags,

						f->common.extack))

			return -EOPNOTSUPP;

	}



	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

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

+4 −1
Original line number Diff line number Diff line
@@ -246,7 +246,10 @@ static void ice_eswitch_release_env(struct ice_pf *pf) 
	ice_vsi_update_local_lb(uplink_vsi, false);

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

	vlan_ops->ena_rx_filtering(uplink_vsi);

	ice_clear_dflt_vsi(uplink_vsi);

	ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false,

			 ICE_FLTR_TX);

	ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false,

			 ICE_FLTR_RX);

	ice_fltr_add_mac_and_broadcast(uplink_vsi,

				       uplink_vsi->port_info->mac.perm_addr,

				       ICE_FWD_TO_VSI);

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

+4 −0
Original line number Diff line number Diff line
@@ -1658,6 +1658,10 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, 
		flow_rule_match_control(rule, &match);



		addr_type = match.key->addr_type;



		if (flow_rule_has_control_flags(match.mask->flags,

						fltr->extack))

			return -EOPNOTSUPP;

	}



	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {