Commit 4784dc99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Fix type of bind option flag in af_xdp, from Baruch Siach.

 2) Fix use after free in bpf_xdp_link_release(), from Xuan Zhao.

 3) PM refcnt imbakance in r8152, from Takashi Iwai.

 4) Sign extension ug in liquidio, from Colin Ian King.

 5) Mising range check in s390 bpf jit, from Colin Ian King.

 6) Uninit value in caif_seqpkt_sendmsg(), from Ziyong Xuan.

 7) Fix skb page recycling race, from Ilias Apalodimas.

 8) Fix memory leak in tcindex_partial_destroy_work, from Pave Skripkin.

 9) netrom timer sk refcnt issues, from Nguyen Dinh Phi.

10) Fix data races aroun tcp's tfo_active_disable_stamp, from Eric
    Dumazet.

11) act_skbmod should only operate on ethernet packets, from Peilin Ye.

12) Fix slab out-of-bpunds in fib6_nh_flush_exceptions(),, from Psolo
    Abeni.

13) Fix sparx5 dependencies, from Yajun Deng.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (74 commits)
  dpaa2-switch: seed the buffer pool after allocating the swp
  net: sched: cls_api: Fix the the wrong parameter
  net: sparx5: fix unmet dependencies warning
  net: dsa: tag_ksz: dont let the hardware process the layer 4 checksum
  net: dsa: ensure linearized SKBs in case of tail taggers
  ravb: Remove extra TAB
  ravb: Fix a typo in comment
  net: dsa: sja1105: make VID 4095 a bridge VLAN too
  tcp: disable TFO blackhole logic by default
  sctp: do not update transport pathmtu if SPP_PMTUD_ENABLE is not set
  net: ixp46x: fix ptp build failure
  ibmvnic: Remove the proper scrq flush
  selftests: net: add ESP-in-UDP PMTU test
  udp: check encap socket in __udp_lib_err
  sctp: update active_key for asoc when old key is being replaced
  r8169: Avoid duplicate sysfs entry creation error
  ixgbe: Fix packet corruption due to missing DMA sync
  Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()"
  ipv6: fix another slab-out-of-bounds in fib6_nh_flush_exceptions
  fsl/fman: Add fibre support
  ...
parents 5e09e197 7aaa0f31

Documentation/devicetree/bindings/net/imx-dwmac.txt

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
IMX8 glue layer controller, NXP imx8 families support Synopsys MAC 5.10a IP.



This file documents platform glue layer for IMX.

Please see stmmac.txt for the other unchanged properties.



The device node has following properties.



Required properties:

- compatible:  Should be "nxp,imx8mp-dwmac-eqos" to select glue layer

	       and "snps,dwmac-5.10a" to select IP version.

- clocks: Must contain a phandle for each entry in clock-names.

- clock-names: Should be "stmmaceth" for the host clock.

	       Should be "pclk" for the MAC apb clock.

	       Should be "ptp_ref" for the MAC timer clock.

	       Should be "tx" for the MAC RGMII TX clock:

	       Should be "mem" for EQOS MEM clock.

		- "mem" clock is required for imx8dxl platform.

		- "mem" clock is not required for imx8mp platform.

- interrupt-names: Should contain a list of interrupt names corresponding to

		   the interrupts in the interrupts property, if available.

		   Should be "macirq" for the main MAC IRQ

		   Should be "eth_wake_irq" for the IT which wake up system

- intf_mode: Should be phandle/offset pair. The phandle to the syscon node which

	     encompases the GPR register, and the offset of the GPR register.

		- required for imx8mp platform.

		- is optional for imx8dxl platform.



Optional properties:

- intf_mode: is optional for imx8dxl platform.

- snps,rmii_refclk_ext: to select RMII reference clock from external.



Example:

	eqos: ethernet@30bf0000 {

		compatible = "nxp,imx8mp-dwmac-eqos", "snps,dwmac-5.10a";

		reg = <0x30bf0000 0x10000>;

		interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "eth_wake_irq", "macirq";

		clocks = <&clk IMX8MP_CLK_ENET_QOS_ROOT>,

			 <&clk IMX8MP_CLK_QOS_ENET_ROOT>,

			 <&clk IMX8MP_CLK_ENET_QOS_TIMER>,

			 <&clk IMX8MP_CLK_ENET_QOS>;

		clock-names = "stmmaceth", "pclk", "ptp_ref", "tx";

		assigned-clocks = <&clk IMX8MP_CLK_ENET_AXI>,

				  <&clk IMX8MP_CLK_ENET_QOS_TIMER>,

				  <&clk IMX8MP_CLK_ENET_QOS>;

		assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>,

					 <&clk IMX8MP_SYS_PLL2_100M>,

					 <&clk IMX8MP_SYS_PLL2_125M>;

		assigned-clock-rates = <0>, <100000000>, <125000000>;

		nvmem-cells = <&eth_mac0>;

		nvmem-cell-names = "mac-address";

		nvmem_macaddr_swap;

		intf_mode = <&gpr 0x4>;

		status = "disabled";

	};

Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

0 → 100644
+93 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/nxp,dwmac-imx.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: NXP i.MX8 DWMAC glue layer Device Tree Bindings



maintainers:

  - Joakim Zhang <qiangqing.zhang@nxp.com>



# We need a select here so we don't match all nodes with 'snps,dwmac'

select:

  properties:

    compatible:

      contains:

        enum:

          - nxp,imx8mp-dwmac-eqos

          - nxp,imx8dxl-dwmac-eqos

  required:

    - compatible



allOf:

  - $ref: "snps,dwmac.yaml#"



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - nxp,imx8mp-dwmac-eqos

              - nxp,imx8dxl-dwmac-eqos

          - const: snps,dwmac-5.10a



  clocks:

    minItems: 3

    maxItems: 5

    items:

      - description: MAC host clock

      - description: MAC apb clock

      - description: MAC timer clock

      - description: MAC RGMII TX clock

      - description: EQOS MEM clock



  clock-names:

    minItems: 3

    maxItems: 5

    contains:

      enum:

        - stmmaceth

        - pclk

        - ptp_ref

        - tx

        - mem



  intf_mode:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description:

      Should be phandle/offset pair. The phandle to the syscon node which

      encompases the GPR register, and the offset of the GPR register.



  snps,rmii_refclk_ext:

    $ref: /schemas/types.yaml#/definitions/flag

    description:

      To select RMII reference clock from external.



required:

  - compatible

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/clock/imx8mp-clock.h>



    eqos: ethernet@30bf0000 {

            compatible = "nxp,imx8mp-dwmac-eqos","snps,dwmac-5.10a";

            reg = <0x30bf0000 0x10000>;

            interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;

            interrupt-names = "macirq", "eth_wake_irq";

            clocks = <&clk IMX8MP_CLK_ENET_QOS_ROOT>,

                     <&clk IMX8MP_CLK_QOS_ENET_ROOT>,

                     <&clk IMX8MP_CLK_ENET_QOS_TIMER>,

                     <&clk IMX8MP_CLK_ENET_QOS>;

            clock-names = "stmmaceth", "pclk", "ptp_ref", "tx";

            phy-mode = "rgmii";

            status = "disabled";

    };

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ select: 
          - snps,dwmac-4.00

          - snps,dwmac-4.10a

          - snps,dwmac-4.20a

          - snps,dwmac-5.10a

          - snps,dwxgmac

          - snps,dwxgmac-2.10
@@ -82,6 +83,7 @@ properties: 
        - snps,dwmac-4.00

        - snps,dwmac-4.10a

        - snps,dwmac-4.20a

        - snps,dwmac-5.10a

        - snps,dwxgmac

        - snps,dwxgmac-2.10
@@ -375,6 +377,7 @@ allOf: 
              - snps,dwmac-4.00

              - snps,dwmac-4.10a

              - snps,dwmac-4.20a

              - snps,dwmac-5.10a

              - snps,dwxgmac

              - snps,dwxgmac-2.10

              - st,spear600-gmac

Documentation/networking/af_xdp.rst

+3 −3
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ Configuration Flags and Socket Options 
These are the various configuration flags that can be used to control

and monitor the behavior of AF_XDP sockets.



XDP_COPY and XDP_ZERO_COPY bind flags

-------------------------------------

XDP_COPY and XDP_ZEROCOPY bind flags

------------------------------------



When you bind to a socket, the kernel will first try to use zero-copy

copy. If zero-copy is not supported, it will fall back on using copy
@@ -252,7 +252,7 @@ mode, i.e. copying all packets out to user space. But if you would 
like to force a certain mode, you can use the following flags. If you

pass the XDP_COPY flag to the bind call, the kernel will force the

socket into copy mode. If it cannot use copy mode, the bind call will

fail with an error. Conversely, the XDP_ZERO_COPY flag will force the

fail with an error. Conversely, the XDP_ZEROCOPY flag will force the

socket into zero-copy mode or fail.



XDP_SHARED_UMEM bind flag

Documentation/networking/ip-sysctl.rst

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ tcp_fastopen_blackhole_timeout_sec - INTEGER 
	initial value when the blackhole issue goes away.

	0 to disable the blackhole detection.



	By default, it is set to 1hr.

	By default, it is set to 0 (feature is disabled).



tcp_fastopen_key - list of comma separated 32-digit hexadecimal INTEGERs

	The list consists of a primary key and an optional backup key. The