Skip to content

Commit cddd2dc

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 24e28b6 + 6918107 commit cddd2dc

File tree

8 files changed

+22
-6
lines changed

8 files changed

+22
-6
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,6 @@
679679
/* PCI/PCI-X/PCI-EX Config space */
680680
#define PCI_HEADER_TYPE_REGISTER 0x0E
681681

682-
#define PCI_HEADER_TYPE_MULTIFUNC 0x80
683-
684682
#define PHY_REVISION_MASK 0xFFFFFFF0
685683
#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */
686684
#define MAX_PHY_MULTI_PAGE_REG 0xF

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8671,6 +8671,10 @@ static int i40e_parse_cls_flower(struct i40e_vsi *vsi,
86718671

86728672
flow_rule_match_control(rule, &match);
86738673
addr_type = match.key->addr_type;
8674+
8675+
if (flow_rule_has_control_flags(match.mask->flags,
8676+
f->common.extack))
8677+
return -EOPNOTSUPP;
86748678
}
86758679

86768680
if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,6 +3757,10 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,
37573757

37583758
flow_rule_match_control(rule, &match);
37593759
addr_type = match.key->addr_type;
3760+
3761+
if (flow_rule_has_control_flags(match.mask->flags,
3762+
f->common.extack))
3763+
return -EOPNOTSUPP;
37603764
}
37613765

37623766
if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,10 @@ static void ice_eswitch_release_env(struct ice_pf *pf)
246246
ice_vsi_update_local_lb(uplink_vsi, false);
247247
ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);
248248
vlan_ops->ena_rx_filtering(uplink_vsi);
249-
ice_clear_dflt_vsi(uplink_vsi);
249+
ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false,
250+
ICE_FLTR_TX);
251+
ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false,
252+
ICE_FLTR_RX);
250253
ice_fltr_add_mac_and_broadcast(uplink_vsi,
251254
uplink_vsi->port_info->mac.perm_addr,
252255
ICE_FWD_TO_VSI);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,6 +1658,10 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi,
16581658
flow_rule_match_control(rule, &match);
16591659

16601660
addr_type = match.key->addr_type;
1661+
1662+
if (flow_rule_has_control_flags(match.mask->flags,
1663+
fltr->extack))
1664+
return -EOPNOTSUPP;
16611665
}
16621666

16631667
if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

drivers/net/ethernet/intel/igb/igb_main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,6 +2597,9 @@ static int igb_parse_cls_flower(struct igb_adapter *adapter,
25972597
return -EOPNOTSUPP;
25982598
}
25992599

2600+
if (flow_rule_match_has_control_flags(rule, extack))
2601+
return -EOPNOTSUPP;
2602+
26002603
if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
26012604
struct flow_match_eth_addrs match;
26022605

drivers/net/ethernet/intel/igc/igc_main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7028,8 +7028,6 @@ static int igc_probe(struct pci_dev *pdev,
70287028
device_set_wakeup_enable(&adapter->pdev->dev,
70297029
adapter->flags & IGC_FLAG_WOL_SUPPORTED);
70307030

7031-
igc_ptp_init(adapter);
7032-
70337031
igc_tsn_clear_schedule(adapter);
70347032

70357033
/* reset the hardware with the new settings */
@@ -7051,6 +7049,9 @@ static int igc_probe(struct pci_dev *pdev,
70517049
/* Check if Media Autosense is enabled */
70527050
adapter->ei = *ei;
70537051

7052+
/* do hw tstamp init after resetting */
7053+
igc_ptp_init(adapter);
7054+
70547055
/* print pcie link status and MAC address */
70557056
pcie_print_link_status(pdev);
70567057
netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,6 @@ enum {
21792179
#define IXGBE_PCI_LINK_SPEED_5000 0x2
21802180
#define IXGBE_PCI_LINK_SPEED_8000 0x3
21812181
#define IXGBE_PCI_HEADER_TYPE_REGISTER 0x0E
2182-
#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
21832182
#define IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005
21842183

21852184
#define IXGBE_PCIDEVCTRL2_TIMEO_MASK 0xf

0 commit comments

Comments
 (0)