Commit 4e04e751 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
  ...
parents 3b978435 27f0ad71

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ required: 
  - interrupts

  - interrupt-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+94 −2
Original line number Diff line number Diff line
@@ -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

+5 −5
Original line number Diff line number Diff line
@@ -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

+8 −0
Original line number Diff line number Diff line
@@ -14850,6 +14850,14 @@ L: linux-arm-msm@vger.kernel.org 
S:	Maintained

F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c









QUALCOMM IPC ROUTER (QRTR) DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	include/trace/events/qrtr.h









F:	include/uapi/linux/qrtr.h









F:	net/qrtr/

















QUALCOMM IPCC MAILBOX DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









L:	linux-arm-msm@vger.kernel.org