Skip to content

Commit 738d290

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from David Miller: 1) Fix big endian overflow in nf_flow_table, from Arnd Bergmann. 2) Fix port selection on big endian in nft_tproxy, from Phil Sutter. 3) Fix precision tracking for unbound scalars in bpf verifier, from Daniel Borkmann. 4) Fix integer overflow in socket rcvbuf check in UDP, from Antonio Messina. 5) Do not perform a neigh confirmation during a pmtu update over a tunnel, from Hangbin Liu. 6) Fix DMA mapping leak in dpaa_eth driver, from Madalin Bucur. 7) Various PTP fixes for sja1105 dsa driver, from Vladimir Oltean. 8) Add missing to dummy definition of of_mdiobus_child_is_phy(), from Geert Uytterhoeven * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (54 commits) hsr: fix slab-out-of-bounds Read in hsr_debugfs_rename() net/sched: add delete_empty() to filters and use it in cls_flower tcp: Fix highest_sack and highest_sack_seq ptp: fix the race between the release of ptp_clock and cdev net: dsa: sja1105: Reconcile the meaning of TPID and TPID2 for E/T and P/Q/R/S Documentation: net: dsa: sja1105: Remove text about taprio base-time limitation net: dsa: sja1105: Remove restriction of zero base-time for taprio offload net: dsa: sja1105: Really make the PTP command read-write net: dsa: sja1105: Take PTP egress timestamp by port, not mgmt slot cxgb4/cxgb4vf: fix flow control display for auto negotiation mlxsw: spectrum: Use dedicated policer for VRRP packets mlxsw: spectrum_router: Skip loopback RIFs during MAC validation net: stmmac: dwmac-meson8b: Fix the RGMII TX delay on Meson8b/8m2 SoCs net/sched: act_mirred: Pull mac prior redir to non mac_header_xmit device net_sched: sch_fq: properly set sk->sk_pacing_status bnx2x: Fix accounting of vlan resources among the PFs bnx2x: Use appropriate define for vlan credit of: mdio: Add missing inline to of_mdiobus_child_is_phy() dummy net: phy: aquantia: add suspend / resume ops for AQR105 dpaa_eth: fix DMA mapping leak ...
2 parents c5c928c + 04b6942 commit 738d290

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+600
-489
lines changed

‎Documentation/networking/dsa/sja1105.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,6 @@ simultaneously on two ports. The driver checks the consistency of the schedules
230230
against this restriction and errors out when appropriate. Schedule analysis is
231231
needed to avoid this, which is outside the scope of the document.
232232

233-
At the moment, the time-aware scheduler can only be triggered based on a
234-
standalone clock and not based on PTP time. This means the base-time argument
235-
from tc-taprio is ignored and the schedule starts right away. It also means it
236-
is more difficult to phase-align the scheduler with the other devices in the
237-
network.
238-
239233
Device Tree bindings and board design
240234
=====================================
241235

‎MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ F: drivers/thermal/thermal_mmio.c
771771

772772
AMAZON ETHERNET DRIVERS
773773
M: Netanel Belgazal <[email protected]>
774+
M: Arthur Kiyanovski <[email protected]>
775+
R: Guy Tzalik <[email protected]>
774776
R: Saeed Bishara <[email protected]>
775777
R: Zorik Machulsky <[email protected]>
776778
L: [email protected]

‎drivers/net/dsa/bcm_sf2_cfp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,
358358
return -EINVAL;
359359
}
360360

361-
ip_frag = be32_to_cpu(fs->m_ext.data[0]);
361+
ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);
362362

363363
/* Locate the first rule available */
364364
if (fs->location == RX_CLS_LOC_ANY)
@@ -569,7 +569,7 @@ static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,
569569

570570
if (rule->fs.flow_type != fs->flow_type ||
571571
rule->fs.ring_cookie != fs->ring_cookie ||
572-
rule->fs.m_ext.data[0] != fs->m_ext.data[0])
572+
rule->fs.h_ext.data[0] != fs->h_ext.data[0])
573573
continue;
574574

575575
switch (fs->flow_type & ~FLOW_EXT) {
@@ -621,7 +621,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,
621621
return -EINVAL;
622622
}
623623

624-
ip_frag = be32_to_cpu(fs->m_ext.data[0]);
624+
ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);
625625

626626
layout = &udf_tcpip6_layout;
627627
slice_num = bcm_sf2_get_slice_number(layout, 0);

‎drivers/net/dsa/sja1105/sja1105_main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,8 +1569,8 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
15691569

15701570
if (enabled) {
15711571
/* Enable VLAN filtering. */
1572-
tpid = ETH_P_8021AD;
1573-
tpid2 = ETH_P_8021Q;
1572+
tpid = ETH_P_8021Q;
1573+
tpid2 = ETH_P_8021AD;
15741574
} else {
15751575
/* Disable VLAN filtering. */
15761576
tpid = ETH_P_SJA1105;
@@ -1579,9 +1579,9 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
15791579

15801580
table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS];
15811581
general_params = table->entries;
1582-
/* EtherType used to identify outer tagged (S-tag) VLAN traffic */
1583-
general_params->tpid = tpid;
15841582
/* EtherType used to identify inner tagged (C-tag) VLAN traffic */
1583+
general_params->tpid = tpid;
1584+
/* EtherType used to identify outer tagged (S-tag) VLAN traffic */
15851585
general_params->tpid2 = tpid2;
15861586
/* When VLAN filtering is on, we need to at least be able to
15871587
* decode management traffic through the "backup plan".
@@ -1855,7 +1855,7 @@ static netdev_tx_t sja1105_port_deferred_xmit(struct dsa_switch *ds, int port,
18551855
if (!clone)
18561856
goto out;
18571857

1858-
sja1105_ptp_txtstamp_skb(ds, slot, clone);
1858+
sja1105_ptp_txtstamp_skb(ds, port, clone);
18591859

18601860
out:
18611861
mutex_unlock(&priv->mgmt_lock);

‎drivers/net/dsa/sja1105/sja1105_ptp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ int sja1105_ptp_commit(struct dsa_switch *ds, struct sja1105_ptp_cmd *cmd,
234234
if (rw == SPI_WRITE)
235235
priv->info->ptp_cmd_packing(buf, cmd, PACK);
236236

237-
rc = sja1105_xfer_buf(priv, SPI_WRITE, regs->ptp_control, buf,
237+
rc = sja1105_xfer_buf(priv, rw, regs->ptp_control, buf,
238238
SJA1105_SIZE_PTP_CMD);
239239

240240
if (rw == SPI_READ)
@@ -659,7 +659,7 @@ void sja1105_ptp_clock_unregister(struct dsa_switch *ds)
659659
ptp_data->clock = NULL;
660660
}
661661

662-
void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,
662+
void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int port,
663663
struct sk_buff *skb)
664664
{
665665
struct sja1105_private *priv = ds->priv;
@@ -679,7 +679,7 @@ void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,
679679
goto out;
680680
}
681681

682-
rc = sja1105_ptpegr_ts_poll(ds, slot, &ts);
682+
rc = sja1105_ptpegr_ts_poll(ds, port, &ts);
683683
if (rc < 0) {
684684
dev_err(ds->dev, "timed out polling for tstamp\n");
685685
kfree_skb(skb);

‎drivers/net/dsa/sja1105/sja1105_static_config.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ static size_t sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,
142142
return size;
143143
}
144144

145+
/* TPID and TPID2 are intentionally reversed so that semantic
146+
* compatibility with E/T is kept.
147+
*/
145148
static size_t
146149
sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,
147150
enum packing_op op)
@@ -166,9 +169,9 @@ sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,
166169
sja1105_packing(buf, &entry->mirr_port, 141, 139, size, op);
167170
sja1105_packing(buf, &entry->vlmarker, 138, 107, size, op);
168171
sja1105_packing(buf, &entry->vlmask, 106, 75, size, op);
169-
sja1105_packing(buf, &entry->tpid, 74, 59, size, op);
172+
sja1105_packing(buf, &entry->tpid2, 74, 59, size, op);
170173
sja1105_packing(buf, &entry->ignore2stf, 58, 58, size, op);
171-
sja1105_packing(buf, &entry->tpid2, 57, 42, size, op);
174+
sja1105_packing(buf, &entry->tpid, 57, 42, size, op);
172175
sja1105_packing(buf, &entry->queue_ts, 41, 41, size, op);
173176
sja1105_packing(buf, &entry->egrmirrvid, 40, 29, size, op);
174177
sja1105_packing(buf, &entry->egrmirrpcp, 28, 26, size, op);

‎drivers/net/dsa/sja1105/sja1105_tas.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,6 @@ int sja1105_setup_tc_taprio(struct dsa_switch *ds, int port,
477477
if (admin->cycle_time_extension)
478478
return -ENOTSUPP;
479479

480-
if (!ns_to_sja1105_delta(admin->base_time)) {
481-
dev_err(ds->dev, "A base time of zero is not hardware-allowed\n");
482-
return -ERANGE;
483-
}
484-
485480
for (i = 0; i < admin->num_entries; i++) {
486481
s64 delta_ns = admin->entries[i].interval;
487482
s64 delta_cycles = ns_to_sja1105_delta(delta_ns);

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1536,8 +1536,11 @@ void bnx2x_get_rss_ind_table(struct bnx2x_rss_config_obj *rss_obj,
15361536
((MAX_MAC_CREDIT_E2 - GET_NUM_VFS_PER_PATH(bp) * VF_MAC_CREDIT_CNT) / \
15371537
func_num + GET_NUM_VFS_PER_PF(bp) * VF_MAC_CREDIT_CNT)
15381538

1539+
#define BNX2X_VFS_VLAN_CREDIT(bp) \
1540+
(GET_NUM_VFS_PER_PATH(bp) * VF_VLAN_CREDIT_CNT)
1541+
15391542
#define PF_VLAN_CREDIT_E2(bp, func_num) \
1540-
((MAX_MAC_CREDIT_E2 - GET_NUM_VFS_PER_PATH(bp) * VF_VLAN_CREDIT_CNT) / \
1543+
((MAX_VLAN_CREDIT_E2 - 1 - BNX2X_VFS_VLAN_CREDIT(bp)) / \
15411544
func_num + GET_NUM_VFS_PER_PF(bp) * VF_VLAN_CREDIT_CNT)
15421545

15431546
#endif /* BNX2X_SP_VERBS */

‎drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ struct link_config {
504504

505505
enum cc_pause requested_fc; /* flow control user has requested */
506506
enum cc_pause fc; /* actual link flow control */
507+
enum cc_pause advertised_fc; /* actual advertised flow control */
507508

508509
enum cc_fec requested_fec; /* Forward Error Correction: */
509510
enum cc_fec fec; /* requested and actual in use */

‎drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,8 @@ static void get_pauseparam(struct net_device *dev,
807807
struct port_info *p = netdev_priv(dev);
808808

809809
epause->autoneg = (p->link_cfg.requested_fc & PAUSE_AUTONEG) != 0;
810-
epause->rx_pause = (p->link_cfg.fc & PAUSE_RX) != 0;
811-
epause->tx_pause = (p->link_cfg.fc & PAUSE_TX) != 0;
810+
epause->rx_pause = (p->link_cfg.advertised_fc & PAUSE_RX) != 0;
811+
epause->tx_pause = (p->link_cfg.advertised_fc & PAUSE_TX) != 0;
812812
}
813813

814814
static int set_pauseparam(struct net_device *dev,

0 commit comments

Comments
 (0)