Merge tag 'net-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

805185b7 · Linus Torvalds <[email protected]> · 2026-06-25 12:25:36 -07:00

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter and IPsec.

  Current release - regressions:

   - do not acquire dev->tx_global_lock in netdev_watchdog_up()

   - ethtool: keep rtnl_lock for ops using ethtool_op_get_link()

   - fix deadlock in nested UP notifier events

  Current release - new code bugs:

   - eth:
      - cn20k: fix subbank free list indexing for search order
      - airoha: fix BQL underflow in shared QDMA TX ring

  Previous releases - regressions:

   - netfilter:
     - flowtable: fix offloaded ct timeout never being extended
     - nf_conncount: prevent connlimit drops for early confirmed ct

  Previous releases - always broken:

   - require CAP_NET_ADMIN in the originating netns when modifying
     cross-netns devices

   - report NAPI thread PID in the caller's pid namespace

   - mac802154: fix dirty frag in in-place crypto for IOT radios

   - sctp: hold socket lock when dumping endpoints in sctp_diag, avoid
     an overflow

   - eth: gve: fix header buffer corruption with header-split and HW-GRO

   - af_key: initialize alg_key_len for IPComp states, prevent OOB read"

* tag 'net-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (213 commits)
  selftests: bonding: add a test for VLAN propagation over a bonded real device
  vlan: defer real device state propagation to netdev_work
  net: add the driver-facing netdev_work scheduling API
  net: turn the rx_mode work into a generic netdev_work facility
  net: ethtool: keep rtnl_lock for ops using ethtool_op_get_link()
  rxrpc: Fix rxrpc_rotate_tx_rotate() to check there's something to rotate
  rxrpc: Fix leak of released call in recvmsg(MSG_PEEK)
  rxrpc: Fix socket notification race
  rxrpc: Fix potential infinite loop in rxrpc_recvmsg()
  rxrpc: Fix oob challenge leak in cleanup after notification failure
  rxrpc: Fix the reception of a reply packet before data transmission
  afs: Fix uncancelled rxrpc OOB message handler
  afs: Fix further netns teardown to cancel the preallocation charger
  rxrpc: Fix double unlock in rxrpc_recvmsg()
  rxrpc: Fix leak of connection from OOB challenge
  rxrpc: Fix ACKALL packet handling
  net: hns3: differentiate autoneg default values between copper and fiber
  net: hns3: fix permanent link down deadlock after reset
  net: hns3: refactor MAC autoneg and speed configuration
  net: hns3: unify copper port ksettings configuration path
  ...

Commit: 805185b7c7a1069e407b6f7b3bc98e44d415f484
Parents: c75597ca · fe9f4ee6

Merge commit. Changes below are compared with the first parent: c75597ca.

Changes

239 files changed · +3040 −1289

File	Status	Add	Del	Content
.mailmap	modified	+2	−1	View file
Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/net/renesas,ether.yaml	modified	+1	−2	View file
Documentation/networking/netdevices.rst	modified	+2	−0	View file
MAINTAINERS	modified	+3	−4	View file
drivers/net/dsa/mxl862xx/mxl862xx-host.c	modified	+10	−8	View file
drivers/net/dsa/realtek/rtl8366rb-leds.c	modified	+4	−4	View file
drivers/net/dsa/sja1105/sja1105_ptp.c	modified	+1	−1	View file
drivers/net/ethernet/airoha/airoha_eth.c	modified	+111	−86	View file
drivers/net/ethernet/airoha/airoha_eth.h	modified	+1	−2	View file
drivers/net/ethernet/airoha/airoha_ppe.c	modified	+2	−1	View file
drivers/net/ethernet/amazon/ena/ena_netdev.c	modified	+21	−2	View file
drivers/net/ethernet/amd/au1000_eth.c	modified	+2	−1	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	modified	+1	−2	View file
drivers/net/ethernet/broadcom/bnxt/bnxt.c	modified	+47	−1	View file
drivers/net/ethernet/broadcom/bnxt/bnxt.h	modified	+5	−0	View file
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	modified	+1	−0	View file
drivers/net/ethernet/cadence/macb_main.c	modified	+8	−0	View file
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c	modified	+9	−1	View file
drivers/net/ethernet/freescale/enetc/enetc4_pf.c	modified	+3	−0	View file
drivers/net/ethernet/google/gve/gve_ethtool.c	modified	+2	−1	View file
drivers/net/ethernet/google/gve/gve_rx_dqo.c	modified	+18	−10	View file
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c	modified	+15	−16	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	modified	+86	−22	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	modified	+1	−0	View file
drivers/net/ethernet/ibm/ehea/ehea_main.c	modified	+2	−0	View file
drivers/net/ethernet/ibm/emac/core.c	modified	+6	−7	View file
drivers/net/ethernet/intel/e1000e/ich8lan.c	modified	+3	−0	View file
drivers/net/ethernet/intel/e1000e/netdev.c	modified	+14	−1	View file
drivers/net/ethernet/intel/i40e/i40e_debug.h	modified	+1	−1	View file
drivers/net/ethernet/intel/iavf/iavf_ethtool.c	modified	+1	−0	View file
drivers/net/ethernet/intel/ice/ice_common.c	modified	+0	−1	View file
drivers/net/ethernet/intel/ice/ice_dpll.c	modified	+14	−6	View file
drivers/net/ethernet/intel/ice/ice_eswitch.c	modified	+2	−2	View file
drivers/net/ethernet/intel/ice/ice_ethtool.c	modified	+8	−4	View file
drivers/net/ethernet/intel/ice/ice_main.c	modified	+5	−11	View file
drivers/net/ethernet/intel/ice/ice_vf_lib.c	modified	+1	−1	View file
drivers/net/ethernet/marvell/mvneta.c	modified	+3	−0	View file
drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c	modified	+45	−15	View file
drivers/net/ethernet/marvell/octeontx2/af/mcs.c	modified	+3	−3	View file
drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c	modified	+9	−0	View file
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c	modified	+32	−27	View file
drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c	modified	+19	−8	View file
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	modified	+8	−3	View file
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c	modified	+1	−1	View file
drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c	modified	+8	−2	View file
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c	modified	+1	−0	View file
drivers/net/ethernet/marvell/prestera/prestera_main.c	modified	+1	−1	View file
drivers/net/ethernet/mediatek/mtk_eth_soc.c	modified	+5	−5	View file
drivers/net/ethernet/mediatek/mtk_ppe.c	modified	+2	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/Kconfig	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	modified	+2	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	modified	+2	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c	modified	+3	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h	modified	+0	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/port.c	modified	+0	−19	View file
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c	modified	+2	−1	View file
drivers/net/ethernet/meta/fbnic/fbnic_fw.c	modified	+4	−5	View file
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c	modified	+6	−1	View file
drivers/net/ethernet/meta/fbnic/fbnic_pci.c	modified	+4	−0	View file
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c	modified	+2	−0	View file
drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c	modified	+3	−1	View file
drivers/net/ethernet/microsoft/mana/gdma_main.c	modified	+64	−14	View file
drivers/net/ethernet/microsoft/mana/mana_bpf.c	modified	+2	−1	View file
drivers/net/ethernet/microsoft/mana/mana_en.c	modified	+14	−2	View file
drivers/net/ethernet/microsoft/mana/mana_ethtool.c	modified	+2	−1	View file
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	modified	+29	−9	View file
drivers/net/ethernet/rocker/rocker_ofdpa.c	modified	+3	−0	View file
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c	modified	+8	−5	View file
drivers/net/ethernet/sun/sungem.c	modified	+9	−4	View file
drivers/net/ethernet/sunplus/spl2sw_phy.c	modified	+4	−2	View file
drivers/net/ethernet/ti/icssg/icssg_common.c	modified	+39	−33	View file
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c	modified	+0	−1	View file
drivers/net/ethernet/wangxun/txgbe/txgbe_main.c	modified	+0	−1	View file
drivers/net/geneve.c	modified	+16	−2	View file
drivers/net/ieee802154/ca8210.c	modified	+6	−3	View file
drivers/net/netconsole.c	modified	+7	−5	View file
drivers/net/phy/realtek/realtek_main.c	modified	+2	−1	View file
drivers/net/pse-pd/pd692x0.c	modified	+1	−1	View file
drivers/net/thunderbolt/main.c	modified	+6	−2	View file
drivers/net/usb/kalmia.c	modified	+8	−0	View file
drivers/net/usb/lan78xx.c	modified	+31	−6	View file
drivers/net/veth.c	modified	+2	−0	View file
drivers/net/virtio_net.c	modified	+6	−3	View file
drivers/net/wan/hdlc_ppp.c	modified	+13	−2	View file
drivers/net/wan/ixp4xx_hss.c	modified	+2	−2	View file
drivers/net/wwan/t7xx/t7xx_hif_cldma.c	modified	+3	−0	View file
fs/afs/cm_security.c	modified	+2	−1	View file
fs/afs/rxrpc.c	modified	+9	−1	View file
include/linux/ethtool.h	modified	+2	−0	View file
include/linux/netdevice.h	modified	+17	−4	View file
include/linux/netfilter/x_tables.h	modified	+21	−8	View file
include/net/dst_metadata.h	modified	+5	−2	View file
include/net/ip_fib.h	modified	+3	−4	View file
include/net/netfilter/nf_conntrack_expect.h	modified	+14	−3	View file
include/net/netfilter/nf_conntrack_helper.h	modified	+4	−0	View file
include/net/netfilter/nf_queue.h	modified	+1	−0	View file
include/net/netfilter/nft_meta.h	modified	+2	−0	View file
include/net/rtnetlink.h	modified	+2	−0	View file
include/net/sctp/sctp.h	modified	+2	−1	View file
include/net/xfrm.h	modified	+11	−4	View file
include/uapi/linux/netfilter/nf_conntrack_common.h	modified	+1	−0	View file
net/8021q/vlan.c	modified	+8	−68	View file
net/8021q/vlan.h	modified	+11	−0	View file
net/8021q/vlan_dev.c	modified	+60	−0	View file
net/batman-adv/bat_iv_ogm.c	modified	+10	−1	View file
net/batman-adv/bat_v.c	modified	+1	−0	View file
net/batman-adv/bat_v_ogm.c	modified	+22	−1	View file
net/batman-adv/distributed-arp-table.c	modified	+9	−3	View file
net/batman-adv/fragmentation.c	modified	+21	−1	View file
net/batman-adv/fragmentation.h	modified	+2	−1	View file
net/batman-adv/hard-interface.c	modified	+2	−26	View file
net/batman-adv/routing.c	modified	+69	−4	View file
net/batman-adv/tp_meter.c	modified	+48	−26	View file
net/batman-adv/translation-table.c	modified	+10	−2	View file
net/batman-adv/tvlv.c	modified	+63	−6	View file
net/batman-adv/types.h	modified	+13	−8	View file
net/bridge/netfilter/nft_meta_bridge.c	modified	+21	−2	View file
net/core/Makefile	modified	+1	−1	View file
net/core/dev.c	modified	+2	−0	View file
net/core/dev.h	modified	+10	−1	View file
net/core/dev_addr_lists.c	modified	+3	−74	View file
net/core/filter.c	modified	+1	−1	View file
net/core/flow_dissector.c	modified	+10	−2	View file
net/core/lwtunnel.c	modified	+6	−0	View file
net/core/netdev-genl.c	modified	+3	−1	View file
net/core/netdev_work.c	added	+162	−0	View file
net/core/rtnetlink.c	modified	+8	−0	View file
net/devlink/rate.c	modified	+14	−11	View file
net/ethtool/common.h	modified	+4	−0	View file
net/ieee802154/core.c	modified	+29	−22	View file
net/ieee802154/header_ops.c	modified	+6	−3	View file
net/ieee802154/ieee802154.h	modified	+17	−0	View file
net/ieee802154/netlink.c	modified	+18	−18	View file
net/ipv4/ip_gre.c	modified	+6	−0	View file
net/ipv4/ip_output.c	modified	+2	−5	View file
net/ipv4/ip_vti.c	modified	+3	−0	View file
net/ipv4/ipip.c	modified	+3	−0	View file
net/ipv4/netfilter/nf_reject_ipv4.c	modified	+1	−1	View file
net/ipv4/sysctl_net_ipv4.c	modified	+8	−2	View file
net/ipv4/tcp_ao.c	modified	+4	−0	View file
net/ipv4/tcp_output.c	modified	+2	−2	View file
net/ipv4/udp_tunnel_nic.c	modified	+1	−1	View file
net/ipv4/xfrm4_input.c	modified	+0	−2	View file
net/ipv6/addrconf.c	modified	+28	−14	View file
net/ipv6/ioam6_iptunnel.c	modified	+4	−4	View file
net/ipv6/ip6_gre.c	modified	+6	−0	View file
net/ipv6/ip6_output.c	modified	+3	−6	View file
net/ipv6/ip6_tunnel.c	modified	+10	−0	View file
net/ipv6/ip6_vti.c	modified	+3	−0	View file
net/ipv6/ndisc.c	modified	+3	−5	View file
net/ipv6/route.c	modified	+3	−0	View file
net/ipv6/sit.c	modified	+3	−0	View file
net/ipv6/xfrm6_input.c	modified	+0	−2	View file
net/key/af_key.c	modified	+1	−0	View file
net/llc/sysctl_net_llc.c	modified	+1	−1	View file
net/mac802154/llsec.c	modified	+14	−0	View file
net/mac802154/scan.c	modified	+1	−0	View file
net/netfilter/Kconfig	modified	+6	−5	View file
net/netfilter/ipset/ip_set_bitmap_gen.h	modified	+3	−1	View file
net/netfilter/ipset/ip_set_bitmap_ip.c	modified	+1	−1	View file
net/netfilter/ipset/ip_set_bitmap_ipmac.c	modified	+1	−1	View file
net/netfilter/ipset/ip_set_bitmap_port.c	modified	+1	−1	View file
net/netfilter/ipset/ip_set_core.c	modified	+2	−2	View file
net/netfilter/ipset/ip_set_hash_gen.h	modified	+6	−6	View file
net/netfilter/nf_conncount.c	modified	+5	−6	View file
net/netfilter/nf_conntrack_broadcast.c	modified	+1	−0	View file
net/netfilter/nf_conntrack_core.c	modified	+32	−1	View file
net/netfilter/nf_conntrack_expect.c	modified	+81	−74	View file
net/netfilter/nf_conntrack_h323_main.c	modified	+2	−2	View file
net/netfilter/nf_conntrack_helper.c	modified	+11	−8	View file
net/netfilter/nf_conntrack_irc.c	modified	+2	−0	View file
net/netfilter/nf_conntrack_netlink.c	modified	+13	−32	View file
net/netfilter/nf_conntrack_pptp.c	modified	+2	−0	View file
net/netfilter/nf_conntrack_sip.c	modified	+5	−8	View file
net/netfilter/nf_flow_table_core.c	modified	+9	−4	View file
net/netfilter/nf_flow_table_ip.c	modified	+24	−64	View file
net/netfilter/nf_flow_table_path.c	modified	+3	−1	View file
net/netfilter/nf_nat_core.c	modified	+10	−0	View file
net/netfilter/nf_queue.c	modified	+14	−0	View file
net/netfilter/nfnetlink_queue.c	modified	+3	−0	View file
net/netfilter/nft_compat.c	modified	+21	−3	View file
net/netfilter/nft_ct.c	modified	+18	−4	View file
net/netfilter/nft_meta.c	modified	+3	−2	View file
net/netfilter/nft_payload.c	modified	+13	−3	View file
net/netfilter/nft_synproxy.c	modified	+4	−5	View file
net/netfilter/xt_cluster.c	modified	+1	−1	View file
net/openvswitch/conntrack.c	modified	+2	−1	View file
net/psample/psample.c	modified	+4	−2	View file
net/rds/send.c	modified	+2	−0	View file
net/rxrpc/ar-internal.h	modified	+4	−2	View file
net/rxrpc/call_event.c	modified	+4	−1	View file
net/rxrpc/call_object.c	modified	+2	−0	View file
net/rxrpc/conn_client.c	modified	+1	−1	View file
net/rxrpc/conn_event.c	modified	+7	−2	View file
net/rxrpc/input.c	modified	+32	−7	View file
net/rxrpc/oob.c	modified	+10	−2	View file
net/rxrpc/recvmsg.c	modified	+4	−6	View file
net/rxrpc/sendmsg.c	modified	+2	−1	View file
net/sched/act_ct.c	modified	+8	−5	View file
net/sched/cls_api.c	modified	+3	−0	View file
net/sched/sch_dualpi2.c	modified	+5	−6	View file
net/sched/sch_generic.c	modified	+2	−5	View file
net/sctp/diag.c	modified	+32	−35	View file
net/sctp/sm_statefuns.c	modified	+5	−0	View file
net/sctp/socket.c	modified	+22	−7	View file
net/tipc/core.c	modified	+7	−2	View file
net/tipc/crypto.c	modified	+9	−0	View file
net/tipc/discover.c	modified	+12	−2	View file
net/tipc/udp_media.c	modified	+14	−5	View file
net/xfrm/espintcp.c	modified	+7	−27	View file
net/xfrm/xfrm_input.c	modified	+16	−13	View file
net/xfrm/xfrm_interface_core.c	modified	+3	−0	View file
net/xfrm/xfrm_policy.c	modified	+15	−12	View file
net/xfrm/xfrm_state.c	modified	+15	−8	View file
net/xfrm/xfrm_user.c	modified	+10	−10	View file
tools/net/ynl/Makefile	modified	+1	−1	View file
tools/net/ynl/Makefile.deps	modified	+2	−0	View file
tools/net/ynl/generated/Makefile	modified	+1	−1	View file
tools/net/ynl/lib/Makefile	modified	+1	−1	View file
tools/testing/selftests/bpf/config	modified	+3	−0	View file
tools/testing/selftests/bpf/prog_tests/test_xsk.c	modified	+54	−42	View file
tools/testing/selftests/bpf/prog_tests/test_xsk.h	modified	+2	−0	View file
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c	modified	+175	−0	View file
tools/testing/selftests/bpf/progs/test_xdp_meta.c	modified	+71	−52	View file
tools/testing/selftests/drivers/net/bonding/Makefile	modified	+1	−0	View file
tools/testing/selftests/drivers/net/bonding/bond_vlan_real_dev.sh	added	+180	−0	View file
tools/testing/selftests/drivers/net/so_txtime.c	modified	+1	−1	View file
tools/testing/selftests/net/broadcast_ether_dst.sh	modified	+1	−1	View file
tools/testing/selftests/net/netfilter/conntrack_sctp_collision.sh	modified	+67	−22	View file
tools/testing/selftests/net/netfilter/nft_flowtable.sh	modified	+4	−4	View file
tools/testing/selftests/net/netfilter/nft_queue.sh	modified	+58	−8	View file
tools/testing/selftests/net/tls.c	modified	+7	−1	View file
tools/testing/selftests/net/vlan_bridge_binding.sh	modified	+1	−1	View file
tools/testing/selftests/tc-testing/tc-tests/actions/ct.json	modified	+38	−0	View file
tools/testing/selftests/tc-testing/tc-tests/qdiscs/dualpi2.json	modified	+44	−0	View file
tools/testing/selftests/tc-testing/tdc_gso.py	added	+43	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index 1f23ea6..23eb9a4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -530,7 +530,8 @@ Luca Ceresoli <[email protected]> <[email protected]>
 Luca Weiss <[email protected]> <[email protected]>
 Lucas De Marchi <[email protected]> <[email protected]>
 Lukasz Luba <[email protected]> <[email protected]>
-Luo Jie <[email protected]> <[email protected]>
+Luo Jie <[email protected]> <[email protected]>
+Luo Jie <[email protected]> <[email protected]>
 Lance Yang <[email protected]> <[email protected]>
 Lance Yang <[email protected]> <[email protected]>
 Maciej W. Rozycki <[email protected]> <[email protected]>

Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml

View file

diff --git a/Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml b/Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml
index de338c0..8cb86d7 100644
--- a/Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml
@@ -8,7 +8,7 @@ title: Qualcomm CMN PLL Clock Controller on IPQ SoC
 
 maintainers:
   - Bjorn Andersson <[email protected]>
-  - Luo Jie <[email protected]>
+  - Luo Jie <[email protected]>
 
 description:
   The CMN (or common) PLL clock controller expects a reference

Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml

View file

diff --git a/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml b/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
index 6147338..4807453 100644
--- a/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
@@ -8,7 +8,7 @@ title: Qualcomm NSS Clock & Reset Controller on QCA8386/QCA8084
 
 maintainers:
   - Bjorn Andersson <[email protected]>
-  - Luo Jie <[email protected]>
+  - Luo Jie <[email protected]>
 
 description: |
   Qualcomm NSS clock control module provides the clocks and resets

Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml

View file

diff --git a/Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml b/Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml
index 753f370..6d0b21a 100644
--- a/Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml
+++ b/Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Qualcomm IPQ packet process engine (PPE)
 
 maintainers:
-  - Luo Jie <[email protected]>
+  - Luo Jie <[email protected]>
   - Lei Wei <[email protected]>
   - Suruchi Agarwal <[email protected]>
   - Pavithra R <[email protected]>

Documentation/devicetree/bindings/net/renesas,ether.yaml

View file

diff --git a/Documentation/devicetree/bindings/net/renesas,ether.yaml b/Documentation/devicetree/bindings/net/renesas,ether.yaml
index f0a52f4..dd7187f 100644
--- a/Documentation/devicetree/bindings/net/renesas,ether.yaml
+++ b/Documentation/devicetree/bindings/net/renesas,ether.yaml
@@ -121,8 +121,7 @@ examples:
         #size-cells = <0>;
 
         phy1: ethernet-phy@1 {
-            compatible = "ethernet-phy-id0022.1537",
-                         "ethernet-phy-ieee802.3-c22";
+            compatible = "ethernet-phy-id0022.1537";
             reg = <1>;
             interrupt-parent = <&irqc0>;
             interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

Documentation/networking/netdevices.rst

View file

diff --git a/Documentation/networking/netdevices.rst b/Documentation/networking/netdevices.rst
index fde601a..d2a238f 100644
--- a/Documentation/networking/netdevices.rst
+++ b/Documentation/networking/netdevices.rst
@@ -433,6 +433,8 @@ exceptions) notifiers run under the instance lock. Please extend this
 documentation whenever you make explicit assumption about lock being held
 from a notifier.
 
+Drivers **must not** generate nested notifications of the ops-locked types.
+
 NETDEV_INTERNAL symbol namespace
 ================================
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index bf97399..15011f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22323,9 +22323,9 @@ F:	Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
 F:	drivers/power/supply/qcom_smbx.c
 
 QUALCOMM PPE DRIVER
-M:	Luo Jie <[email protected]>
+M:	Luo Jie <[email protected]>
 L:	[email protected]
-S:	Supported
+S:	Maintained
 F:	Documentation/devicetree/bindings/net/qcom,ipq9574-ppe.yaml
 F:	Documentation/networking/device_drivers/ethernet/qualcomm/ppe/ppe.rst
 F:	drivers/net/ethernet/qualcomm/ppe/
@@ -26001,9 +26001,8 @@ S:	Maintained
 F:	drivers/net/ethernet/dlink/sundance.c
 
 SUNPLUS ETHERNET DRIVER
-M:	Wells Lu <[email protected]>
 L:	[email protected]
-S:	Maintained
+S:	Orphan
 W:	https://sunplus.atlassian.net/wiki/spaces/doc/overview
 F:	Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
 F:	drivers/net/ethernet/sunplus/

drivers/net/dsa/mxl862xx/mxl862xx-host.c

View file

diff --git a/drivers/net/dsa/mxl862xx/mxl862xx-host.c b/drivers/net/dsa/mxl862xx/mxl862xx-host.c
index d55f9df..4acd216 100644
--- a/drivers/net/dsa/mxl862xx/mxl862xx-host.c
+++ b/drivers/net/dsa/mxl862xx/mxl862xx-host.c
@@ -12,6 +12,7 @@
 #include <linux/crc16.h>
 #include <linux/iopoll.h>
 #include <linux/limits.h>
+#include <linux/unaligned.h>
 #include <net/dsa.h>
 #include "mxl862xx.h"
 #include "mxl862xx-host.h"
@@ -40,12 +41,13 @@ static void mxl862xx_crc_err_work_fn(struct work_struct *work)
 						  crc_err_work);
 	struct dsa_port *dp;
 
-	dev_warn(&priv->mdiodev->dev,
-		 "MDIO CRC error detected, shutting down all ports\n");
-
 	rtnl_lock();
-	dsa_switch_for_each_cpu_port(dp, priv->ds)
-		dev_close(dp->conduit);
+	if (!test_bit(MXL862XX_FLAG_WORK_STOPPED, &priv->flags)) {
+		dev_warn(&priv->mdiodev->dev,
+			 "MDIO CRC error detected, shutting down all ports\n");
+		dsa_switch_for_each_cpu_port(dp, priv->ds)
+			dev_close(dp->conduit);
+	}
 	rtnl_unlock();
 
 	clear_bit(MXL862XX_FLAG_CRC_ERR, &priv->flags);
@@ -349,7 +351,7 @@ int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data,
 	 * zero words individually.
 	 */
 	for (i = 0, zeros = 0; i < size / 2 && zeros < RST_DATA_THRESHOLD; i++)
-		if (!data[i])
+		if (!get_unaligned_le16(&data[i]))
 			zeros++;
 
 	if (zeros < RST_DATA_THRESHOLD && (size & 1) && !*(u8 *)&data[i])
@@ -395,7 +397,7 @@ int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data,
 			 */
 			val = *(u8 *)&data[i] | ((crc & 0xff) << 8);
 		} else {
-			val = le16_to_cpu(data[i]);
+			val = get_unaligned_le16(&data[i]);
 		}
 
 		/* After RST_DATA, skip zero data words as the registers
@@ -453,7 +455,7 @@ int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *_data,
 			*(uint8_t *)&data[i] = ret & 0xff;
 			crc = (ret >> 8) & 0xff;
 		} else {
-			data[i] = cpu_to_le16((u16)ret);
+			put_unaligned_le16((u16)ret, &data[i]);
 		}
 	}
 

drivers/net/dsa/realtek/rtl8366rb-leds.c

View file

diff --git a/drivers/net/dsa/realtek/rtl8366rb-leds.c b/drivers/net/dsa/realtek/rtl8366rb-leds.c
index 509ffd3..ba50d31 100644
--- a/drivers/net/dsa/realtek/rtl8366rb-leds.c
+++ b/drivers/net/dsa/realtek/rtl8366rb-leds.c
@@ -89,6 +89,7 @@ static int rtl8366rb_setup_led(struct realtek_priv *priv, struct dsa_port *dp,
 	struct led_init_data init_data = { };
 	enum led_default_state state;
 	struct rtl8366rb_led *led;
+	char name[64];
 	u32 led_group;
 	int ret;
 
@@ -129,10 +130,9 @@ static int rtl8366rb_setup_led(struct realtek_priv *priv, struct dsa_port *dp,
 	init_data.fwnode = led_fwnode;
 	init_data.devname_mandatory = true;
 
-	init_data.devicename = kasprintf(GFP_KERNEL, "Realtek-%d:0%d:%d",
-					 dp->ds->index, dp->index, led_group);
-	if (!init_data.devicename)
-		return -ENOMEM;
+	snprintf(name, sizeof(name), "Realtek-%d:0%d:%d",
+		 dp->ds->index, dp->index, led_group);
+	init_data.devicename = name;
 
 	ret = devm_led_classdev_register_ext(priv->dev, &led->cdev, &init_data);
 	if (ret) {

drivers/net/dsa/sja1105/sja1105_ptp.c

View file

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index fefe46e..350f958 100644
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -755,7 +755,7 @@ static int sja1105_per_out_enable(struct sja1105_private *priv,
 		 * 2 edges on PTP_CLK. So check for truncation which happens
 		 * at periods larger than around 68.7 seconds.
 		 */
-		pin_duration = ns_to_sja1105_ticks(pin_duration / 2);
+		pin_duration = max_t(u64, ns_to_sja1105_ticks(pin_duration / 2), 1);
 		if (pin_duration > U32_MAX) {
 			rc = -ERANGE;
 			goto out;

drivers/net/ethernet/airoha/airoha_eth.c

View file

diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
index 64dde64..932b3a3 100644
--- a/drivers/net/ethernet/airoha/airoha_eth.c
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
@@ -1004,6 +1004,7 @@ static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)
 
 		e = &q->entry[index];
 		skb = e->skb;
+		e->skb = NULL;
 
 		dma_unmap_single(eth->dev, e->dma_addr, e->dma_len,
 				 DMA_TO_DEVICE);
@@ -1147,55 +1148,76 @@ static int airoha_qdma_init_tx(struct airoha_qdma *qdma)
 	return 0;
 }
 
-static void airoha_qdma_cleanup_tx_queue(struct airoha_queue *q)
+static void airoha_qdma_tx_cleanup(struct airoha_qdma *qdma)
 {
-	struct airoha_qdma *qdma = q->qdma;
-	struct airoha_eth *eth = qdma->eth;
-	int i, qid = q - &qdma->q_tx[0];
-	u16 index = 0;
+	u32 status;
+	int i;
 
-	spin_lock_bh(&q->lock);
-	for (i = 0; i < q->ndesc; i++) {
-		struct airoha_queue_entry *e = &q->entry[i];
-		struct airoha_qdma_desc *desc = &q->desc[i];
+	airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG,
+			  GLOBAL_CFG_TX_DMA_EN_MASK);
+	if (read_poll_timeout(airoha_qdma_rr, status,
+			      !(status & GLOBAL_CFG_TX_DMA_BUSY_MASK),
+			      USEC_PER_MSEC, 50 * USEC_PER_MSEC, true,
+			      qdma, REG_QDMA_GLOBAL_CFG))
+		dev_warn(qdma->eth->dev, "QDMA TX DMA busy timeout\n");
 
-		if (!e->dma_addr)
+	for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) {
+		struct airoha_queue *q = &qdma->q_tx[i];
+		u16 index = 0;
+		int j;
+
+		if (!q->ndesc)
 			continue;
 
-		dma_unmap_single(eth->dev, e->dma_addr, e->dma_len,
-				 DMA_TO_DEVICE);
-		dev_kfree_skb_any(e->skb);
-		e->dma_addr = 0;
-		e->skb = NULL;
-		list_add_tail(&e->list, &q->tx_list);
+		spin_lock_bh(&q->lock);
 
-		/* Reset DMA descriptor */
-		WRITE_ONCE(desc->ctrl, 0);
-		WRITE_ONCE(desc->addr, 0);
-		WRITE_ONCE(desc->data, 0);
-		WRITE_ONCE(desc->msg0, 0);
-		WRITE_ONCE(desc->msg1, 0);
-		WRITE_ONCE(desc->msg2, 0);
+		q->flushing = true;
+		for (j = 0; j < q->ndesc; j++) {
+			struct airoha_queue_entry *e = &q->entry[j];
+			struct airoha_qdma_desc *desc = &q->desc[j];
+			struct sk_buff *skb = e->skb;
 
-		q->queued--;
-	}
+			if (!e->dma_addr)
+				continue;
 
-	if (!list_empty(&q->tx_list)) {
-		struct airoha_queue_entry *e;
+			dma_unmap_single(qdma->eth->dev, e->dma_addr,
+					 e->dma_len, DMA_TO_DEVICE);
+			e->dma_addr = 0;
+			list_add_tail(&e->list, &q->tx_list);
+
+			WRITE_ONCE(desc->ctrl, 0);
+			WRITE_ONCE(desc->addr, 0);
+			WRITE_ONCE(desc->data, 0);
+			WRITE_ONCE(desc->msg0, 0);
+			WRITE_ONCE(desc->msg1, 0);
+			WRITE_ONCE(desc->msg2, 0);
+
+			if (skb) {
+				struct netdev_queue *txq;
+
+				txq = skb_get_tx_queue(skb->dev, skb);
+				netdev_tx_completed_queue(txq, 1, skb->len);
+				dev_kfree_skb_any(skb);
+				e->skb = NULL;
+			}
 
-		e = list_first_entry(&q->tx_list, struct airoha_queue_entry,
-				     list);
-		index = e - q->entry;
-	}
-	/* Set TX_DMA_IDX to TX_CPU_IDX to notify the hw the QDMA TX ring is
-	 * empty.
-	 */
-	airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid), TX_RING_CPU_IDX_MASK,
-			FIELD_PREP(TX_RING_CPU_IDX_MASK, index));
-	airoha_qdma_rmw(qdma, REG_TX_DMA_IDX(qid), TX_RING_DMA_IDX_MASK,
-			FIELD_PREP(TX_RING_DMA_IDX_MASK, index));
+			q->queued--;
+		}
 
-	spin_unlock_bh(&q->lock);
+		if (!list_empty(&q->tx_list)) {
+			struct airoha_queue_entry *e;
+
+			e = list_first_entry(&q->tx_list,
+					     struct airoha_queue_entry, list);
+			index = e - q->entry;
+		}
+		airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(i), TX_RING_CPU_IDX_MASK,
+				FIELD_PREP(TX_RING_CPU_IDX_MASK, index));
+		airoha_qdma_rmw(qdma, REG_TX_DMA_IDX(i), TX_RING_DMA_IDX_MASK,
+				FIELD_PREP(TX_RING_DMA_IDX_MASK, index));
+
+		spin_unlock_bh(&q->lock);
+	}
 }
 
 static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma)
@@ -1523,10 +1545,23 @@ static int airoha_qdma_init(struct platform_device *pdev,
 	return airoha_qdma_hw_init(qdma);
 }
 
-static void airoha_qdma_cleanup(struct airoha_qdma *qdma)
+static void airoha_qdma_cleanup(struct airoha_eth *eth,
+				struct airoha_qdma *qdma)
 {
 	int i;
 
+	if (test_bit(DEV_STATE_INITIALIZED, &eth->state)) {
+		u32 status;
+
+		airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG,
+				  GLOBAL_CFG_RX_DMA_EN_MASK);
+		if (read_poll_timeout(airoha_qdma_rr, status,
+				      !(status & GLOBAL_CFG_RX_DMA_BUSY_MASK),
+				      USEC_PER_MSEC, 50 * USEC_PER_MSEC, true,
+				      qdma, REG_QDMA_GLOBAL_CFG))
+			dev_warn(eth->dev, "QDMA RX DMA busy timeout\n");
+	}
+
 	for (i = 0; i < ARRAY_SIZE(qdma->q_rx); i++) {
 		if (!qdma->q_rx[i].ndesc)
 			continue;
@@ -1546,12 +1581,6 @@ static void airoha_qdma_cleanup(struct airoha_qdma *qdma)
 		netif_napi_del(&qdma->q_tx_irq[i].napi);
 	}
 
-	for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) {
-		if (!qdma->q_tx[i].ndesc)
-			continue;
-
-		airoha_qdma_cleanup_tx_queue(&qdma->q_tx[i]);
-	}
 }
 
 static int airoha_hw_init(struct platform_device *pdev,
@@ -1593,7 +1622,7 @@ static int airoha_hw_init(struct platform_device *pdev,
 	return 0;
 error:
 	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
-		airoha_qdma_cleanup(&eth->qdma[i]);
+		airoha_qdma_cleanup(eth, &eth->qdma[i]);
 
 	return err;
 }
@@ -1603,7 +1632,7 @@ static void airoha_hw_cleanup(struct airoha_eth *eth)
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
-		airoha_qdma_cleanup(&eth->qdma[i]);
+		airoha_qdma_cleanup(eth, &eth->qdma[i]);
 	airoha_ppe_deinit(eth);
 }
 
@@ -1837,11 +1866,6 @@ static int airoha_dev_open(struct net_device *netdev)
 	}
 	port->users++;
 
-	airoha_qdma_set(qdma, REG_QDMA_GLOBAL_CFG,
-			GLOBAL_CFG_TX_DMA_EN_MASK |
-			GLOBAL_CFG_RX_DMA_EN_MASK);
-	qdma->users++;
-
 	if (!airoha_is_lan_gdm_dev(dev) &&
 	    airoha_ppe_is_enabled(qdma->eth, 1))
 		pse_port = FE_PSE_PORT_PPE2;
@@ -1880,12 +1904,9 @@ static int airoha_dev_stop(struct net_device *netdev)
 	struct airoha_gdm_dev *dev = netdev_priv(netdev);
 	struct airoha_gdm_port *port = dev->port;
 	struct airoha_qdma *qdma = dev->qdma;
-	int i;
 
 	netif_tx_disable(netdev);
 	airoha_set_vip_for_gdm_port(dev, false);
-	for (i = 0; i < netdev->num_tx_queues; i++)
-		netdev_tx_reset_subqueue(netdev, i);
 
 	if (--port->users)
 		airoha_set_port_mtu(dev->eth, port);
@@ -1893,20 +1914,6 @@ static int airoha_dev_stop(struct net_device *netdev)
 		airoha_set_gdm_port_fwd_cfg(qdma->eth,
 					    REG_GDM_FWD_CFG(port->id),
 					    FE_PSE_PORT_DROP);
-
-	if (!--qdma->users) {
-		airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG,
-				  GLOBAL_CFG_TX_DMA_EN_MASK |
-				  GLOBAL_CFG_RX_DMA_EN_MASK);
-
-		for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) {
-			if (!qdma->q_tx[i].ndesc)
-				continue;
-
-			airoha_qdma_cleanup_tx_queue(&qdma->q_tx[i]);
-		}
-	}
-
 	return 0;
 }
 
@@ -2110,7 +2117,7 @@ static u16 airoha_dev_select_queue(struct net_device *netdev,
 	 */
 	channel = netdev_uses_dsa(netdev) ? skb_get_queue_mapping(skb) : port->id;
 	channel = channel % AIROHA_NUM_QOS_CHANNELS;
-	queue = (skb->priority - 1) % AIROHA_NUM_QOS_QUEUES; /* QoS queue */
+	queue = skb->priority % AIROHA_NUM_QOS_QUEUES;
 	queue = channel * AIROHA_NUM_QOS_QUEUES + queue;
 
 	return queue < netdev->num_tx_queues ? queue : 0;
@@ -2229,6 +2236,9 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb,
 
 	spin_lock_bh(&q->lock);
 
+	if (q->flushing)
+		goto error_unlock;
+
 	txq = skb_get_tx_queue(netdev, skb);
 	nr_frags = 1 + skb_shinfo(skb)->nr_frags;
 
@@ -2309,7 +2319,7 @@ error_unmap:
 		e->dma_addr = 0;
 	}
 	list_splice(&tx_list, &q->tx_list);
-
+error_unlock:
 	spin_unlock_bh(&q->lock);
 error:
 	dev_kfree_skb_any(skb);
@@ -2395,7 +2405,7 @@ static int airoha_qdma_set_chan_tx_sched(struct net_device *netdev,
 	struct airoha_gdm_dev *dev = netdev_priv(netdev);
 	int i;
 
-	for (i = 0; i < AIROHA_NUM_TX_RING; i++)
+	for (i = 0; i < AIROHA_NUM_QOS_QUEUES; i++)
 		airoha_qdma_clear(dev->qdma, REG_QUEUE_CLOSE_CFG(channel),
 				  TXQ_DISABLE_CHAN_QUEUE_MASK(channel, i));
 
@@ -2789,7 +2799,7 @@ static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev,
 					  struct tc_htb_qopt_offload *opt)
 {
 	u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;
-	int err, num_tx_queues = netdev->real_num_tx_queues;
+	int err, num_tx_queues = AIROHA_NUM_TX_RING + channel + 1;
 	struct airoha_gdm_dev *dev = netdev_priv(netdev);
 	struct airoha_qdma *qdma = dev->qdma;
 
@@ -2806,13 +2816,15 @@ static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev,
 	if (err)
 		goto error;
 
-	err = netif_set_real_num_tx_queues(netdev, num_tx_queues + 1);
-	if (err) {
-		airoha_qdma_set_tx_rate_limit(netdev, channel, 0,
-					      opt->quantum);
-		NL_SET_ERR_MSG_MOD(opt->extack,
-				   "failed setting real_num_tx_queues");
-		goto error;
+	if (num_tx_queues > netdev->real_num_tx_queues) {
+		err = netif_set_real_num_tx_queues(netdev, num_tx_queues);
+		if (err) {
+			airoha_qdma_set_tx_rate_limit(netdev, channel, 0,
+						      opt->quantum);
+			NL_SET_ERR_MSG_MOD(opt->extack,
+					   "failed setting real_num_tx_queues");
+			goto error;
+		}
 	}
 
 	set_bit(channel, dev->qos_sq_bmap);
@@ -3003,13 +3015,18 @@ static int airoha_dev_setup_tc_block(struct net_device *dev,
 static void airoha_tc_remove_htb_queue(struct net_device *netdev, int queue)
 {
 	struct airoha_gdm_dev *dev = netdev_priv(netdev);
+	int num_tx_queues = AIROHA_NUM_TX_RING;
 	struct airoha_qdma *qdma = dev->qdma;
 
-	netif_set_real_num_tx_queues(netdev, netdev->real_num_tx_queues - 1);
-	airoha_qdma_set_tx_rate_limit(netdev, queue + 1, 0, 0);
+	airoha_qdma_set_tx_rate_limit(netdev, queue, 0, 0);
 
 	clear_bit(queue, qdma->qos_channel_map);
 	clear_bit(queue, dev->qos_sq_bmap);
+
+	if (!bitmap_empty(dev->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS))
+		num_tx_queues += find_last_bit(dev->qos_sq_bmap,
+					       AIROHA_NUM_QOS_CHANNELS) + 1;
+	netif_set_real_num_tx_queues(netdev, num_tx_queues);
 }
 
 static int airoha_tc_htb_delete_leaf_queue(struct net_device *netdev,
@@ -3413,8 +3430,12 @@ static int airoha_probe(struct platform_device *pdev)
 	if (err)
 		goto error_netdev_free;
 
-	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
+	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) {
 		airoha_qdma_start_napi(&eth->qdma[i]);
+		airoha_qdma_set(&eth->qdma[i], REG_QDMA_GLOBAL_CFG,
+				GLOBAL_CFG_TX_DMA_EN_MASK |
+				GLOBAL_CFG_RX_DMA_EN_MASK);
+	}
 
 	for_each_child_of_node(pdev->dev.of_node, np) {
 		if (!of_device_is_compatible(np, "airoha,eth-mac"))
@@ -3437,8 +3458,10 @@ static int airoha_probe(struct platform_device *pdev)
 	return 0;
 
 error_napi_stop:
-	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
+	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) {
 		airoha_qdma_stop_napi(&eth->qdma[i]);
+		airoha_qdma_tx_cleanup(&eth->qdma[i]);
+	}
 
 	for (i = 0; i < ARRAY_SIZE(eth->ports); i++) {
 		struct airoha_gdm_port *port = eth->ports[i];
@@ -3474,8 +3497,10 @@ static void airoha_remove(struct platform_device *pdev)
 	struct airoha_eth *eth = platform_get_drvdata(pdev);
 	int i;
 
-	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
+	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) {
 		airoha_qdma_stop_napi(&eth->qdma[i]);
+		airoha_qdma_tx_cleanup(&eth->qdma[i]);
+	}
 
 	for (i = 0; i < ARRAY_SIZE(eth->ports); i++) {
 		struct airoha_gdm_port *port = eth->ports[i];

drivers/net/ethernet/airoha/airoha_eth.h

View file

diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h
index 41d2e7a..d7ff8c5 100644
--- a/drivers/net/ethernet/airoha/airoha_eth.h
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
@@ -197,6 +197,7 @@ struct airoha_queue {
 	int free_thr;
 	int buf_size;
 	bool txq_stopped;
+	bool flushing;
 
 	struct napi_struct napi;
 	struct page_pool *page_pool;
@@ -524,8 +525,6 @@ struct airoha_qdma {
 	struct airoha_eth *eth;
 	void __iomem *regs;
 
-	int users;
-
 	struct airoha_irq_bank irq_banks[AIROHA_MAX_NUM_IRQ_BANKS];
 
 	struct airoha_tx_irq_queue q_tx_irq[AIROHA_NUM_TX_IRQ];

drivers/net/ethernet/airoha/airoha_ppe.c

View file

diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c
index 329e7c2..42f4b0f 100644
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
@@ -1601,7 +1601,8 @@ int airoha_ppe_init(struct airoha_eth *eth)
 			return -ENOMEM;
 	}
 
-	ppe->foe_check_time = devm_kzalloc(eth->dev, ppe_num_entries,
+	ppe->foe_check_time = devm_kzalloc(eth->dev,
+					   ppe_num_entries * sizeof(*ppe->foe_check_time),
 					   GFP_KERNEL);
 	if (!ppe->foe_check_time)
 		return -ENOMEM;

drivers/net/ethernet/amazon/ena/ena_netdev.c

View file

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 92d149d..5d05020 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c

This diff is incomplete. Download the complete patch.