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

4e04e751 · Linus Torvalds <[email protected]> · 2021-04-09 15:26:51 -07:00

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.12-rc7, including fixes from can, ipsec,
  mac80211, wireless, and bpf trees.

  No scary regressions here or in the works, but small fixes for 5.12
  changes keep coming.

  Current release - regressions:

   - virtio: do not pull payload in skb->head

   - virtio: ensure mac header is set in virtio_net_hdr_to_skb()

   - Revert "net: correct sk_acceptq_is_full()"

   - mptcp: revert "mptcp: provide subflow aware release function"

   - ethernet: lan743x: fix ethernet frame cutoff issue

   - dsa: fix type was not set for devlink port

   - ethtool: remove link_mode param and derive link params from driver

   - sched: htb: fix null pointer dereference on a null new_q

   - wireless: iwlwifi: Fix softirq/hardirq disabling in
     iwl_pcie_enqueue_hcmd()

   - wireless: iwlwifi: fw: fix notification wait locking

   - wireless: brcmfmac: p2p: Fix deadlock introduced by avoiding the
     rtnl dependency

  Current release - new code bugs:

   - napi: fix hangup on napi_disable for threaded napi

   - bpf: take module reference for trampoline in module

   - wireless: mt76: mt7921: fix airtime reporting and related tx hangs

   - wireless: iwlwifi: mvm: rfi: don't lock mvm->mutex when sending
     config command

  Previous releases - regressions:

   - rfkill: revert back to old userspace API by default

   - nfc: fix infinite loop, refcount & memory leaks in LLCP sockets

   - let skb_orphan_partial wake-up waiters

   - xfrm/compat: Cleanup WARN()s that can be user-triggered

   - vxlan, geneve: do not modify the shared tunnel info when PMTU
     triggers an ICMP reply

   - can: fix msg_namelen values depending on CAN_REQUIRED_SIZE

   - can: uapi: mark union inside struct can_frame packed

   - sched: cls: fix action overwrite reference counting

   - sched: cls: fix err handler in tcf_action_init()

   - ethernet: mlxsw: fix ECN marking in tunnel decapsulation

   - ethernet: nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx

   - ethernet: i40e: fix receiving of single packets in xsk zero-copy
     mode

   - ethernet: cxgb4: avoid collecting SGE_QBASE regs during traffic

  Previous releases - always broken:

   - bpf: Refuse non-O_RDWR flags in BPF_OBJ_GET

   - bpf: Refcount task stack in bpf_get_task_stack

   - bpf, x86: Validate computation of branch displacements

   - ieee802154: fix many similar syzbot-found bugs
       - fix NULL dereferences in netlink attribute handling
       - reject unsupported operations on monitor interfaces
       - fix error handling in llsec_key_alloc()

   - xfrm: make ipv4 pmtu check honor ip header df

   - xfrm: make hash generation lock per network namespace

   - xfrm: esp: delete NETIF_F_SCTP_CRC bit from features for esp
     offload

   - ethtool: fix incorrect datatype in set_eee ops

   - xdp: fix xdp_return_frame() kernel BUG throw for page_pool memory
     model

   - openvswitch: fix send of uninitialized stack memory in ct limit
     reply

  Misc:

   - udp: add get handling for UDP_GRO sockopt"

* tag 'net-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (182 commits)
  net: fix hangup on napi_disable for threaded napi
  net: hns3: Trivial spell fix in hns3 driver
  lan743x: fix ethernet frame cutoff issue
  net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh
  net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits
  net: dsa: lantiq_gswip: Don't use PHY auto polling
  net: sched: sch_teql: fix null-pointer dereference
  ipv6: report errors for iftoken via netlink extack
  net: sched: fix err handler in tcf_action_init()
  net: sched: fix action overwrite reference counting
  Revert "net: sched: bump refcount for new action in ACT replace mode"
  ice: fix memory leak of aRFS after resuming from suspend
  i40e: Fix sparse warning: missing error code 'err'
  i40e: Fix sparse error: 'vsi->netdev' could be null
  i40e: Fix sparse error: uninitialized symbol 'ring'
  i40e: Fix sparse errors in i40e_txrx.c
  i40e: Fix parameters in aq_get_phy_register()
  nl80211: fix beacon head validation
  bpf, x86: Validate computation of branch displacements for x86-32
  bpf, x86: Validate computation of branch displacements for x86-64
  ...

Commit: 4e04e7513b0fa2fe8966a1c83fb473f1667e2810
Parents: 3b978435 · 27f0ad71

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

Changes

179 files changed · +1872 −715

File	Status	Add	Del	Content
Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/net/ethernet-controller.yaml	modified	+1	−1	View file
Documentation/devicetree/bindings/net/micrel-ksz90x1.txt	modified	+94	−2	View file
Documentation/networking/ethtool-netlink.rst	modified	+5	−5	View file
MAINTAINERS	modified	+8	−0	View file
arch/x86/net/bpf_jit_comp.c	modified	+10	−1	View file
arch/x86/net/bpf_jit_comp32.c	modified	+10	−1	View file
drivers/net/can/spi/mcp251x.c	modified	+18	−6	View file
drivers/net/can/usb/peak_usb/pcan_usb_core.c	modified	+5	−1	View file
drivers/net/dsa/lantiq_gswip.c	modified	+173	−22	View file
drivers/net/ethernet/amd/pcnet32.c	modified	+3	−2	View file
drivers/net/ethernet/amd/xgbe/xgbe.h	modified	+3	−3	View file
drivers/net/ethernet/broadcom/bcm4908_enet.c	modified	+1	−0	View file
drivers/net/ethernet/cadence/macb_main.c	modified	+7	−0	View file
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c	modified	+19	−4	View file
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c	modified	+2	−1	View file
drivers/net/ethernet/freescale/gianfar.c	modified	+5	−1	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	modified	+4	−5	View file
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	modified	+4	−4	View file
drivers/net/ethernet/intel/i40e/i40e.h	modified	+1	−0	View file
drivers/net/ethernet/intel/i40e/i40e_debugfs.c	modified	+3	−0	View file
drivers/net/ethernet/intel/i40e/i40e_ethtool.c	modified	+48	−7	View file
drivers/net/ethernet/intel/i40e/i40e_main.c	modified	+16	−14	View file
drivers/net/ethernet/intel/i40e/i40e_txrx.c	modified	+5	−7	View file
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	modified	+9	−0	View file
drivers/net/ethernet/intel/i40e/i40e_xsk.c	modified	+2	−2	View file
drivers/net/ethernet/intel/ice/ice.h	modified	+2	−2	View file
drivers/net/ethernet/intel/ice/ice_common.c	modified	+1	−1	View file
drivers/net/ethernet/intel/ice/ice_controlq.h	modified	+2	−2	View file
drivers/net/ethernet/intel/ice/ice_dcb.c	modified	+29	−9	View file
drivers/net/ethernet/intel/ice/ice_dcb_nl.c	modified	+0	−2	View file
drivers/net/ethernet/intel/ice/ice_ethtool.c	modified	+2	−2	View file
drivers/net/ethernet/intel/ice/ice_lib.c	modified	+2	−3	View file
drivers/net/ethernet/intel/ice/ice_main.c	modified	+39	−14	View file
drivers/net/ethernet/intel/ice/ice_switch.c	modified	+9	−6	View file
drivers/net/ethernet/intel/ice/ice_type.h	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/dev.c	modified	+2	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/en.h	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c	modified	+29	−7	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h	modified	+10	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c	modified	+9	−14	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c	modified	+29	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h	modified	+6	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c	modified	+19	−21	View file
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c	modified	+4	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h	modified	+3	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c	modified	+30	−19	View file
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	modified	+11	−11	View file
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	modified	+20	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	modified	+3	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	modified	+0	−10	View file
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	modified	+0	−6	View file
drivers/net/ethernet/mellanox/mlx5/core/eq.c	modified	+12	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c	modified	+5	−5	View file
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	modified	+39	−29	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum.h	modified	+15	−0	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c	modified	+14	−5	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c	modified	+3	−4	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c	modified	+3	−4	View file
drivers/net/ethernet/microchip/lan743x_main.c	modified	+4	−4	View file
drivers/net/ethernet/myricom/myri10ge/myri10ge.c	modified	+1	−1	View file
drivers/net/ethernet/netronome/nfp/bpf/cmsg.c	modified	+1	−0	View file
drivers/net/ethernet/netronome/nfp/flower/main.h	modified	+8	−0	View file
drivers/net/ethernet/netronome/nfp/flower/metadata.c	modified	+15	−1	View file
drivers/net/ethernet/netronome/nfp/flower/offload.c	modified	+46	−2	View file
drivers/net/ethernet/xilinx/xilinx_axienet.h	modified	+12	−0	View file
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	modified	+6	−6	View file
drivers/net/geneve.c	modified	+20	−4	View file
drivers/net/ieee802154/atusb.c	modified	+1	−0	View file
drivers/net/phy/bcm-phy-lib.c	modified	+10	−3	View file
drivers/net/tun.c	modified	+48	−0	View file
drivers/net/usb/hso.c	modified	+12	−21	View file
drivers/net/virtio_net.c	modified	+7	−3	View file
drivers/net/vxlan.c	modified	+14	−4	View file
drivers/net/wan/hdlc_fr.c	modified	+3	−2	View file
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c	modified	+1	−1	View file
drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c	modified	+5	−5	View file
drivers/net/wireless/intel/iwlwifi/iwl-config.h	modified	+1	−0	View file
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c	modified	+1	−1	View file
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c	modified	+5	−2	View file
drivers/net/wireless/intel/iwlwifi/mvm/rfi.c	modified	+3	−3	View file
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	modified	+12	−5	View file
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c	modified	+1	−30	View file
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c	modified	+1	−2	View file
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	modified	+26	−1	View file
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c	modified	+35	−0	View file
drivers/net/wireless/intel/iwlwifi/pcie/tx.c	modified	+4	−3	View file
drivers/net/wireless/mediatek/mt76/mt7921/regs.h	modified	+2	−2	View file
drivers/net/wireless/virt_wifi.c	modified	+3	−2	View file
include/linux/avf/virtchnl.h	modified	+0	−2	View file
include/linux/bpf.h	modified	+2	−0	View file
include/linux/ethtool.h	modified	+16	−6	View file
include/linux/mlx5/mlx5_ifc.h	modified	+6	−4	View file
include/linux/skmsg.h	modified	+6	−1	View file
include/linux/virtio_net.h	modified	+11	−5	View file
include/net/act_api.h	modified	+4	−8	View file
include/net/netns/xfrm.h	modified	+3	−1	View file
include/net/red.h	modified	+2	−2	View file
include/net/rtnetlink.h	modified	+2	−2	View file
include/net/sock.h	modified	+14	−1	View file
include/net/xfrm.h	modified	+2	−2	View file
include/uapi/linux/can.h	modified	+1	−1	View file
include/uapi/linux/ethtool.h	modified	+33	−21	View file
include/uapi/linux/rfkill.h	modified	+68	−12	View file
kernel/bpf/disasm.c	modified	+1	−1	View file
kernel/bpf/inode.c	modified	+2	−2	View file
kernel/bpf/stackmap.c	modified	+10	−2	View file
kernel/bpf/trampoline.c	modified	+30	−0	View file
kernel/bpf/verifier.c	modified	+5	−0	View file
net/batman-adv/translation-table.c	modified	+2	−0	View file
net/can/bcm.c	modified	+6	−4	View file
net/can/isotp.c	modified	+7	−4	View file
net/can/raw.c	modified	+8	−6	View file
net/core/dev.c	modified	+2	−1	View file
net/core/neighbour.c	modified	+1	−1	View file
net/core/rtnetlink.c	modified	+1	−1	View file
net/core/skmsg.c	modified	+5	−7	View file
net/core/sock.c	modified	+3	−9	View file
net/core/xdp.c	modified	+2	−1	View file
net/dsa/dsa2.c	modified	+7	−1	View file
net/dsa/switch.c	modified	+9	−6	View file
net/ethtool/common.c	modified	+17	−0	View file
net/ethtool/eee.c	modified	+2	−2	View file
net/ethtool/ioctl.c	modified	+1	−17	View file
net/hsr/hsr_device.c	modified	+1	−0	View file
net/hsr/hsr_forward.c	modified	+0	−6	View file
net/ieee802154/nl-mac.c	modified	+4	−3	View file
net/ieee802154/nl802154.c	modified	+60	−8	View file
net/ipv4/ah4.c	modified	+1	−1	View file
net/ipv4/devinet.c	modified	+2	−1	View file
net/ipv4/esp4.c	modified	+1	−1	View file
net/ipv4/esp4_offload.c	modified	+14	−3	View file
net/ipv4/ip_vti.c	modified	+4	−2	View file
net/ipv4/udp.c	modified	+4	−0	View file
net/ipv6/addrconf.c	modified	+26	−6	View file
net/ipv6/ah6.c	modified	+1	−1	View file
net/ipv6/esp6.c	modified	+1	−1	View file
net/ipv6/esp6_offload.c	modified	+14	−3	View file
net/ipv6/ip6_vti.c	modified	+4	−2	View file
net/ipv6/raw.c	modified	+1	−1	View file
net/ipv6/route.c	modified	+5	−3	View file
net/mac80211/cfg.c	modified	+3	−1	View file
net/mac80211/mlme.c	modified	+4	−1	View file
net/mac80211/tx.c	modified	+1	−1	View file
net/mac802154/llsec.c	modified	+1	−1	View file
net/mptcp/protocol.c	modified	+47	−53	View file
net/ncsi/ncsi-manage.c	modified	+13	−7	View file
net/nfc/llcp_sock.c	modified	+10	−0	View file
net/openvswitch/conntrack.c	modified	+4	−4	View file
net/qrtr/qrtr.c	modified	+4	−1	View file
net/rds/message.c	modified	+3	−1	View file
net/rds/send.c	modified	+1	−1	View file
net/rfkill/core.c	modified	+4	−3	View file
net/sched/act_api.c	modified	+31	−17	View file
net/sched/cls_api.c	modified	+8	−8	View file
net/sched/sch_htb.c	modified	+3	−2	View file
net/sched/sch_teql.c	modified	+3	−0	View file
net/sctp/ipv6.c	modified	+3	−4	View file
net/tipc/bearer.h	modified	+3	−3	View file
net/tipc/crypto.c	modified	+2	−1	View file
net/tipc/net.c	modified	+1	−1	View file
net/tipc/node.c	modified	+1	−1	View file
net/tipc/socket.c	modified	+1	−1	View file
net/wireless/nl80211.c	modified	+7	−3	View file
net/wireless/scan.c	modified	+8	−6	View file
net/wireless/sme.c	modified	+1	−1	View file
net/xfrm/xfrm_compat.c	modified	+9	−3	View file
net/xfrm/xfrm_device.c	modified	+0	−2	View file
net/xfrm/xfrm_interface.c	modified	+3	−0	View file
net/xfrm/xfrm_output.c	modified	+18	−5	View file
net/xfrm/xfrm_state.c	modified	+6	−5	View file
tools/lib/bpf/ringbuf.c	modified	+1	−1	View file
tools/lib/bpf/xsk.c	modified	+37	−20	View file
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c	modified	+44	−0	View file
tools/testing/selftests/bpf/progs/bpf_tcp_nogpl.c	added	+19	−0	View file
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh	modified	+12	−1	View file

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

Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml

View file

diff --git a/Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml b/Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
index 79c38ea..13c26f2 100644
--- a/Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
+++ b/Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@ -32,7 +32,7 @@ required:
   - interrupts
   - interrupt-names
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |

Documentation/devicetree/bindings/net/ethernet-controller.yaml

View file

diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index 4b7d1e5..e8f0468 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -49,7 +49,7 @@ properties:
     description:
       Reference to an nvmem node for the MAC address
 
-  nvmem-cells-names:
+  nvmem-cell-names:
     const: mac-address
 
   phy-connection-type:

Documentation/devicetree/bindings/net/micrel-ksz90x1.txt

View file

diff --git a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
index b921731..df9e844 100644
--- a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
+++ b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
@@ -65,6 +65,71 @@ KSZ9031:
   step is 60ps. The default value is the neutral setting, so setting
   rxc-skew-ps=<0> actually results in -900 picoseconds adjustment.
 
+  The KSZ9031 hardware supports a range of skew values from negative to
+  positive, where the specific range is property dependent. All values
+  specified in the devicetree are offset by the minimum value so they
+  can be represented as positive integers in the devicetree since it's
+  difficult to represent a negative number in the devictree.
+
+  The following 5-bit values table apply to rxc-skew-ps and txc-skew-ps.
+
+  Pad Skew Value	Delay (ps)	Devicetree Value
+  ------------------------------------------------------
+  0_0000		-900ps		0
+  0_0001		-840ps		60
+  0_0010		-780ps		120
+  0_0011		-720ps		180
+  0_0100		-660ps		240
+  0_0101		-600ps		300
+  0_0110		-540ps		360
+  0_0111		-480ps		420
+  0_1000		-420ps		480
+  0_1001		-360ps		540
+  0_1010		-300ps		600
+  0_1011		-240ps		660
+  0_1100		-180ps		720
+  0_1101		-120ps		780
+  0_1110		-60ps		840
+  0_1111		0ps		900
+  1_0000		60ps		960
+  1_0001		120ps		1020
+  1_0010		180ps		1080
+  1_0011		240ps		1140
+  1_0100		300ps		1200
+  1_0101		360ps		1260
+  1_0110		420ps		1320
+  1_0111		480ps		1380
+  1_1000		540ps		1440
+  1_1001		600ps		1500
+  1_1010		660ps		1560
+  1_1011		720ps		1620
+  1_1100		780ps		1680
+  1_1101		840ps		1740
+  1_1110		900ps		1800
+  1_1111		960ps		1860
+
+  The following 4-bit values table apply to the txdX-skew-ps, rxdX-skew-ps
+  data pads, and the rxdv-skew-ps, txen-skew-ps control pads.
+
+  Pad Skew Value	Delay (ps)	Devicetree Value
+  ------------------------------------------------------
+  0000			-420ps		0
+  0001			-360ps		60
+  0010			-300ps		120
+  0011			-240ps		180
+  0100			-180ps		240
+  0101			-120ps		300
+  0110			-60ps		360
+  0111			0ps		420
+  1000			60ps		480
+  1001			120ps		540
+  1010			180ps		600
+  1011			240ps		660
+  1100			300ps		720
+  1101			360ps		780
+  1110			420ps		840
+  1111			480ps		900
+
   Optional properties:
 
     Maximum value of 1860, default value 900:
@@ -120,11 +185,21 @@ KSZ9131:
 
 Examples:
 
+	/* Attach to an Ethernet device with autodetected PHY */
+	&enet {
+		rxc-skew-ps = <1800>;
+		rxdv-skew-ps = <0>;
+		txc-skew-ps = <1800>;
+		txen-skew-ps = <0>;
+		status = "okay";
+	};
+
+	/* Attach to an explicitly-specified PHY */
 	mdio {
 		phy0: ethernet-phy@0 {
-			rxc-skew-ps = <3000>;
+			rxc-skew-ps = <1800>;
 			rxdv-skew-ps = <0>;
-			txc-skew-ps = <3000>;
+			txc-skew-ps = <1800>;
 			txen-skew-ps = <0>;
 			reg = <0>;
 		};
@@ -133,3 +208,20 @@ Examples:
 		phy = <&phy0>;
 		phy-mode = "rgmii-id";
 	};
+
+References
+
+  Micrel ksz9021rl/rn Data Sheet, Revision 1.2. Dated 2/13/2014.
+  http://www.micrel.com/_PDF/Ethernet/datasheets/ksz9021rl-rn_ds.pdf
+
+  Micrel ksz9031rnx Data Sheet, Revision 2.1. Dated 11/20/2014.
+  http://www.micrel.com/_PDF/Ethernet/datasheets/KSZ9031RNX.pdf
+
+Notes:
+
+  Note that a previous version of the Micrel ksz9021rl/rn Data Sheet
+  was missing extended register 106 (transmit data pad skews), and
+  incorrectly specified the ps per step as 200ps/step instead of
+  120ps/step. The latest update to this document reflects the latest
+  revision of the Micrel specification even though usage in the kernel
+  still reflects that incorrect document.

Documentation/networking/ethtool-netlink.rst

View file

diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index 0507348..dc03ff8 100644
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -976,9 +976,9 @@ constraints on coalescing parameters and their values.
 
 
 PAUSE_GET
-============
+=========
 
-Gets channel counts like ``ETHTOOL_GPAUSE`` ioctl request.
+Gets pause frame settings like ``ETHTOOL_GPAUSEPARAM`` ioctl request.
 
 Request contents:
 
@@ -1007,7 +1007,7 @@ the statistics in the following structure:
 Each member has a corresponding attribute defined.
 
 PAUSE_SET
-============
+=========
 
 Sets pause parameters like ``ETHTOOL_GPAUSEPARAM`` ioctl request.
 
@@ -1024,7 +1024,7 @@ Request contents:
 EEE_GET
 =======
 
-Gets channel counts like ``ETHTOOL_GEEE`` ioctl request.
+Gets Energy Efficient Ethernet settings like ``ETHTOOL_GEEE`` ioctl request.
 
 Request contents:
 
@@ -1054,7 +1054,7 @@ first 32 are provided by the ``ethtool_ops`` callback.
 EEE_SET
 =======
 
-Sets pause parameters like ``ETHTOOL_GEEEPARAM`` ioctl request.
+Sets Energy Efficient Ethernet parameters like ``ETHTOOL_SEEE`` ioctl request.
 
 Request contents:
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index d5dfb71..ccd9228 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14850,6 +14850,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c
 
+QUALCOMM IPC ROUTER (QRTR) DRIVER
+M:	Manivannan Sadhasivam <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	include/trace/events/qrtr.h
+F:	include/uapi/linux/qrtr.h
+F:	net/qrtr/
+
 QUALCOMM IPCC MAILBOX DRIVER
 M:	Manivannan Sadhasivam <[email protected]>
 L:	[email protected]

arch/x86/net/bpf_jit_comp.c

View file

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index b35fc80..7f1b3a8 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -1689,7 +1689,16 @@ emit_jmp:
 		}
 
 		if (image) {
-			if (unlikely(proglen + ilen > oldproglen)) {
+			/*
+			 * When populating the image, assert that:
+			 *
+			 *  i) We do not write beyond the allocated space, and
+			 * ii) addrs[i] did not change from the prior run, in order
+			 *     to validate assumptions made for computing branch
+			 *     displacements.
+			 */
+			if (unlikely(proglen + ilen > oldproglen ||
+				     proglen + ilen != addrs[i])) {
 				pr_err("bpf_jit: fatal error\n");
 				return -EFAULT;
 			}

arch/x86/net/bpf_jit_comp32.c

View file

diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
index d17b67c..6a99def 100644
--- a/arch/x86/net/bpf_jit_comp32.c
+++ b/arch/x86/net/bpf_jit_comp32.c
@@ -2276,7 +2276,16 @@ notyet:
 		}
 
 		if (image) {
-			if (unlikely(proglen + ilen > oldproglen)) {
+			/*
+			 * When populating the image, assert that:
+			 *
+			 *  i) We do not write beyond the allocated space, and
+			 * ii) addrs[i] did not change from the prior run, in order
+			 *     to validate assumptions made for computing branch
+			 *     displacements.
+			 */
+			if (unlikely(proglen + ilen > oldproglen ||
+				     proglen + ilen != addrs[i])) {
 				pr_err("bpf_jit: fatal error\n");
 				return -EFAULT;
 			}

drivers/net/can/spi/mcp251x.c

View file

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index f69fb42..a57da43 100644
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -314,6 +314,18 @@ static int mcp251x_spi_trans(struct spi_device *spi, int len)
 	return ret;
 }
 
+static int mcp251x_spi_write(struct spi_device *spi, int len)
+{
+	struct mcp251x_priv *priv = spi_get_drvdata(spi);
+	int ret;
+
+	ret = spi_write(spi, priv->spi_tx_buf, len);
+	if (ret)
+		dev_err(&spi->dev, "spi write failed: ret = %d\n", ret);
+
+	return ret;
+}
+
 static u8 mcp251x_read_reg(struct spi_device *spi, u8 reg)
 {
 	struct mcp251x_priv *priv = spi_get_drvdata(spi);
@@ -361,7 +373,7 @@ static void mcp251x_write_reg(struct spi_device *spi, u8 reg, u8 val)
 	priv->spi_tx_buf[1] = reg;
 	priv->spi_tx_buf[2] = val;
 
-	mcp251x_spi_trans(spi, 3);
+	mcp251x_spi_write(spi, 3);
 }
 
 static void mcp251x_write_2regs(struct spi_device *spi, u8 reg, u8 v1, u8 v2)
@@ -373,7 +385,7 @@ static void mcp251x_write_2regs(struct spi_device *spi, u8 reg, u8 v1, u8 v2)
 	priv->spi_tx_buf[2] = v1;
 	priv->spi_tx_buf[3] = v2;
 
-	mcp251x_spi_trans(spi, 4);
+	mcp251x_spi_write(spi, 4);
 }
 
 static void mcp251x_write_bits(struct spi_device *spi, u8 reg,
@@ -386,7 +398,7 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg,
 	priv->spi_tx_buf[2] = mask;
 	priv->spi_tx_buf[3] = val;
 
-	mcp251x_spi_trans(spi, 4);
+	mcp251x_spi_write(spi, 4);
 }
 
 static u8 mcp251x_read_stat(struct spi_device *spi)
@@ -618,7 +630,7 @@ static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,
 					  buf[i]);
 	} else {
 		memcpy(priv->spi_tx_buf, buf, TXBDAT_OFF + len);
-		mcp251x_spi_trans(spi, TXBDAT_OFF + len);
+		mcp251x_spi_write(spi, TXBDAT_OFF + len);
 	}
 }
 
@@ -650,7 +662,7 @@ static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame,
 
 	/* use INSTRUCTION_RTS, to avoid "repeated frame problem" */
 	priv->spi_tx_buf[0] = INSTRUCTION_RTS(1 << tx_buf_idx);
-	mcp251x_spi_trans(priv->spi, 1);
+	mcp251x_spi_write(priv->spi, 1);
 }
 
 static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
@@ -888,7 +900,7 @@ static int mcp251x_hw_reset(struct spi_device *spi)
 	mdelay(MCP251X_OST_DELAY_MS);
 
 	priv->spi_tx_buf[0] = INSTRUCTION_RESET;
-	ret = mcp251x_spi_trans(spi, 1);
+	ret = mcp251x_spi_write(spi, 1);
 	if (ret)
 		return ret;
 

drivers/net/can/usb/peak_usb/pcan_usb_core.c

View file

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 573b115..28e916a 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -857,7 +857,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
 	if (dev->adapter->dev_set_bus) {
 		err = dev->adapter->dev_set_bus(dev, 0);
 		if (err)
-			goto lbl_unregister_candev;
+			goto adap_dev_free;
 	}
 
 	/* get device number early */
@@ -869,6 +869,10 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
 
 	return 0;
 
+adap_dev_free:
+	if (dev->adapter->dev_free)
+		dev->adapter->dev_free(dev);
+
 lbl_unregister_candev:
 	unregister_candev(netdev);
 

drivers/net/dsa/lantiq_gswip.c

View file

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index 52e865a..bf5c62e 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -93,8 +93,12 @@
 
 /* GSWIP MII Registers */
 #define GSWIP_MII_CFGp(p)		(0x2 * (p))
+#define  GSWIP_MII_CFG_RESET		BIT(15)
 #define  GSWIP_MII_CFG_EN		BIT(14)
+#define  GSWIP_MII_CFG_ISOLATE		BIT(13)
 #define  GSWIP_MII_CFG_LDCLKDIS		BIT(12)
+#define  GSWIP_MII_CFG_RGMII_IBS	BIT(8)
+#define  GSWIP_MII_CFG_RMII_CLK		BIT(7)
 #define  GSWIP_MII_CFG_MODE_MIIP	0x0
 #define  GSWIP_MII_CFG_MODE_MIIM	0x1
 #define  GSWIP_MII_CFG_MODE_RMIIP	0x2
@@ -190,6 +194,23 @@
 #define GSWIP_PCE_DEFPVID(p)		(0x486 + ((p) * 0xA))
 
 #define GSWIP_MAC_FLEN			0x8C5
+#define GSWIP_MAC_CTRL_0p(p)		(0x903 + ((p) * 0xC))
+#define  GSWIP_MAC_CTRL_0_PADEN		BIT(8)
+#define  GSWIP_MAC_CTRL_0_FCS_EN	BIT(7)
+#define  GSWIP_MAC_CTRL_0_FCON_MASK	0x0070
+#define  GSWIP_MAC_CTRL_0_FCON_AUTO	0x0000
+#define  GSWIP_MAC_CTRL_0_FCON_RX	0x0010
+#define  GSWIP_MAC_CTRL_0_FCON_TX	0x0020
+#define  GSWIP_MAC_CTRL_0_FCON_RXTX	0x0030
+#define  GSWIP_MAC_CTRL_0_FCON_NONE	0x0040
+#define  GSWIP_MAC_CTRL_0_FDUP_MASK	0x000C
+#define  GSWIP_MAC_CTRL_0_FDUP_AUTO	0x0000
+#define  GSWIP_MAC_CTRL_0_FDUP_EN	0x0004
+#define  GSWIP_MAC_CTRL_0_FDUP_DIS	0x000C
+#define  GSWIP_MAC_CTRL_0_GMII_MASK	0x0003
+#define  GSWIP_MAC_CTRL_0_GMII_AUTO	0x0000
+#define  GSWIP_MAC_CTRL_0_GMII_MII	0x0001
+#define  GSWIP_MAC_CTRL_0_GMII_RGMII	0x0002
 #define GSWIP_MAC_CTRL_2p(p)		(0x905 + ((p) * 0xC))
 #define GSWIP_MAC_CTRL_2_MLEN		BIT(3) /* Maximum Untagged Frame Lnegth */
 
@@ -653,16 +674,13 @@ static int gswip_port_enable(struct dsa_switch *ds, int port,
 			  GSWIP_SDMA_PCTRLp(port));
 
 	if (!dsa_is_cpu_port(ds, port)) {
-		u32 macconf = GSWIP_MDIO_PHY_LINK_AUTO |
-			      GSWIP_MDIO_PHY_SPEED_AUTO |
-			      GSWIP_MDIO_PHY_FDUP_AUTO |
-			      GSWIP_MDIO_PHY_FCONTX_AUTO |
-			      GSWIP_MDIO_PHY_FCONRX_AUTO |
-			      (phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK);
-
-		gswip_mdio_w(priv, macconf, GSWIP_MDIO_PHYp(port));
-		/* Activate MDIO auto polling */
-		gswip_mdio_mask(priv, 0, BIT(port), GSWIP_MDIO_MDC_CFG0);
+		u32 mdio_phy = 0;
+
+		if (phydev)
+			mdio_phy = phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK;
+
+		gswip_mdio_mask(priv, GSWIP_MDIO_PHY_ADDR_MASK, mdio_phy,
+				GSWIP_MDIO_PHYp(port));
 	}
 
 	return 0;
@@ -675,14 +693,6 @@ static void gswip_port_disable(struct dsa_switch *ds, int port)
 	if (!dsa_is_user_port(ds, port))
 		return;
 
-	if (!dsa_is_cpu_port(ds, port)) {
-		gswip_mdio_mask(priv, GSWIP_MDIO_PHY_LINK_DOWN,
-				GSWIP_MDIO_PHY_LINK_MASK,
-				GSWIP_MDIO_PHYp(port));
-		/* Deactivate MDIO auto polling */
-		gswip_mdio_mask(priv, BIT(port), 0, GSWIP_MDIO_MDC_CFG0);
-	}
-
 	gswip_switch_mask(priv, GSWIP_FDMA_PCTRL_EN, 0,
 			  GSWIP_FDMA_PCTRLp(port));
 	gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,
@@ -794,14 +804,32 @@ static int gswip_setup(struct dsa_switch *ds)
 	gswip_switch_w(priv, BIT(cpu_port), GSWIP_PCE_PMAP2);
 	gswip_switch_w(priv, BIT(cpu_port), GSWIP_PCE_PMAP3);
 
-	/* disable PHY auto polling */
+	/* Deactivate MDIO PHY auto polling. Some PHYs as the AR8030 have an
+	 * interoperability problem with this auto polling mechanism because
+	 * their status registers think that the link is in a different state
+	 * than it actually is. For the AR8030 it has the BMSR_ESTATEN bit set
+	 * as well as ESTATUS_1000_TFULL and ESTATUS_1000_XFULL. This makes the
+	 * auto polling state machine consider the link being negotiated with
+	 * 1Gbit/s. Since the PHY itself is a Fast Ethernet RMII PHY this leads
+	 * to the switch port being completely dead (RX and TX are both not
+	 * working).
+	 * Also with various other PHY / port combinations (PHY11G GPHY, PHY22F
+	 * GPHY, external RGMII PEF7071/7072) any traffic would stop. Sometimes
+	 * it would work fine for a few minutes to hours and then stop, on
+	 * other device it would no traffic could be sent or received at all.
+	 * Testing shows that when PHY auto polling is disabled these problems
+	 * go away.
+	 */
 	gswip_mdio_w(priv, 0x0, GSWIP_MDIO_MDC_CFG0);
+
 	/* Configure the MDIO Clock 2.5 MHz */
 	gswip_mdio_mask(priv, 0xff, 0x09, GSWIP_MDIO_MDC_CFG1);
 
-	/* Disable the xMII link */
+	/* Disable the xMII interface and clear it's isolation bit */
 	for (i = 0; i < priv->hw_info->max_ports; i++)
-		gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, i);
+		gswip_mii_mask_cfg(priv,
+				   GSWIP_MII_CFG_EN | GSWIP_MII_CFG_ISOLATE,
+				   0, i);
 
 	/* enable special tag insertion on cpu port */
 	gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,
@@ -1450,6 +1478,112 @@ unsupported:
 	return;
 }
 
+static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link)
+{
+	u32 mdio_phy;
+
+	if (link)
+		mdio_phy = GSWIP_MDIO_PHY_LINK_UP;
+	else
+		mdio_phy = GSWIP_MDIO_PHY_LINK_DOWN;
+
+	gswip_mdio_mask(priv, GSWIP_MDIO_PHY_LINK_MASK, mdio_phy,
+			GSWIP_MDIO_PHYp(port));
+}
+
+static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed,
+				 phy_interface_t interface)
+{
+	u32 mdio_phy = 0, mii_cfg = 0, mac_ctrl_0 = 0;
+
+	switch (speed) {
+	case SPEED_10:
+		mdio_phy = GSWIP_MDIO_PHY_SPEED_M10;
+
+		if (interface == PHY_INTERFACE_MODE_RMII)
+			mii_cfg = GSWIP_MII_CFG_RATE_M50;
+		else
+			mii_cfg = GSWIP_MII_CFG_RATE_M2P5;
+
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;
+		break;
+
+	case SPEED_100:
+		mdio_phy = GSWIP_MDIO_PHY_SPEED_M100;
+
+		if (interface == PHY_INTERFACE_MODE_RMII)
+			mii_cfg = GSWIP_MII_CFG_RATE_M50;
+		else
+			mii_cfg = GSWIP_MII_CFG_RATE_M25;
+
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;
+		break;
+
+	case SPEED_1000:
+		mdio_phy = GSWIP_MDIO_PHY_SPEED_G1;
+
+		mii_cfg = GSWIP_MII_CFG_RATE_M125;
+
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_RGMII;
+		break;
+	}
+
+	gswip_mdio_mask(priv, GSWIP_MDIO_PHY_SPEED_MASK, mdio_phy,
+			GSWIP_MDIO_PHYp(port));
+	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_RATE_MASK, mii_cfg, port);
+	gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_GMII_MASK, mac_ctrl_0,
+			  GSWIP_MAC_CTRL_0p(port));
+}
+
+static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex)
+{
+	u32 mac_ctrl_0, mdio_phy;
+
+	if (duplex == DUPLEX_FULL) {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_EN;
+		mdio_phy = GSWIP_MDIO_PHY_FDUP_EN;
+	} else {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_DIS;
+		mdio_phy = GSWIP_MDIO_PHY_FDUP_DIS;
+	}
+
+	gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_FDUP_MASK, mac_ctrl_0,
+			  GSWIP_MAC_CTRL_0p(port));
+	gswip_mdio_mask(priv, GSWIP_MDIO_PHY_FDUP_MASK, mdio_phy,
+			GSWIP_MDIO_PHYp(port));
+}
+
+static void gswip_port_set_pause(struct gswip_priv *priv, int port,
+				 bool tx_pause, bool rx_pause)
+{
+	u32 mac_ctrl_0, mdio_phy;
+
+	if (tx_pause && rx_pause) {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RXTX;
+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |
+			   GSWIP_MDIO_PHY_FCONRX_EN;
+	} else if (tx_pause) {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_TX;
+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |
+			   GSWIP_MDIO_PHY_FCONRX_DIS;
+	} else if (rx_pause) {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RX;
+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |
+			   GSWIP_MDIO_PHY_FCONRX_EN;
+	} else {
+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_NONE;
+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |
+			   GSWIP_MDIO_PHY_FCONRX_DIS;
+	}
+
+	gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_FCON_MASK,
+			  mac_ctrl_0, GSWIP_MAC_CTRL_0p(port));
+	gswip_mdio_mask(priv,
+			GSWIP_MDIO_PHY_FCONTX_MASK |
+			GSWIP_MDIO_PHY_FCONRX_MASK,
+			mdio_phy, GSWIP_MDIO_PHYp(port));
+}
+
 static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,
 				     unsigned int mode,
 				     const struct phylink_link_state *state)
@@ -1469,6 +1603,9 @@ static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,
 		break;
 	case PHY_INTERFACE_MODE_RMII:
 		miicfg |= GSWIP_MII_CFG_MODE_RMIIM;
+
+		/* Configure the RMII clock as output: */
+		miicfg |= GSWIP_MII_CFG_RMII_CLK;
 		break;
 	case PHY_INTERFACE_MODE_RGMII:
 	case PHY_INTERFACE_MODE_RGMII_ID:
@@ -1481,7 +1618,11 @@ static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,
 			"Unsupported interface: %d\n", state->interface);
 		return;
 	}
-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_MODE_MASK, miicfg, port);
+
+	gswip_mii_mask_cfg(priv,