Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae3dbb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 

Pull networking updates from David Miller:

 1) Support ipv6 checksum offload in sunvnet driver, from Shannon
    Nelson.

 2) Move to RB-tree instead of custom AVL code in inetpeer, from Eric
    Dumazet.

 3) Allow generic XDP to work on virtual devices, from John Fastabend.

 4) Add bpf device maps and XDP_REDIRECT, which can be used to build
    arbitrary switching frameworks using XDP. From John Fastabend.

 5) Remove UFO offloads from the tree, gave us little other than bugs.

 6) Remove the IPSEC flow cache, from Florian Westphal.

 7) Support ipv6 route offload in mlxsw driver.

 8) Support VF representors in bnxt_en, from Sathya Perla.

 9) Add support for forward error correction modes to ethtool, from
    Vidya Sagar Ravipati.

10) Add time filter for packet scheduler action dumping, from Jamal Hadi
    Salim.

11) Extend the zerocopy sendmsg() used by virtio and tap to regular
    sockets via MSG_ZEROCOPY. From Willem de Bruijn.

12) Significantly rework value tracking in the BPF verifier, from Edward
    Cree.

13) Add new jump instructions to eBPF, from Daniel Borkmann.

14) Rework rtnetlink plumbing so that operations can be run without
    taking the RTNL semaphore. From Florian Westphal.

15) Support XDP in tap driver, from Jason Wang.

16) Add 32-bit eBPF JIT for ARM, from Shubham Bansal.

17) Add Huawei hinic ethernet driver.

18) Allow to report MD5 keys in TCP inet_diag dumps, from Ivan
    Delalande.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1780 commits)
  i40e: point wb_desc at the nvm_wb_desc during i40e_read_nvm_aq
  i40e: avoid NVM acquire deadlock during NVM update
  drivers: net: xgene: Remove return statement from void function
  drivers: net: xgene: Configure tx/rx delay for ACPI
  drivers: net: xgene: Read tx/rx delay for ACPI
  rocker: fix kcalloc parameter order
  rds: Fix non-atomic operation on shared flag variable
  net: sched: don't use GFP_KERNEL under spin lock
  vhost_net: correctly check tx avail during rx busy polling
  net: mdio-mux: add mdio_mux parameter to mdio_mux_init()
  rxrpc: Make service connection lookup always check for retry
  net: stmmac: Delete dead code for MDIO registration
  gianfar: Fix Tx flow control deactivation
  cxgb4: Ignore MPS_TX_INT_CAUSE[Bubble] for T6
  cxgb4: Fix pause frame count in t4_get_port_stats
  cxgb4: fix memory leak
  tun: rename generic_xdp to skb_xdp
  tun: reserve extra headroom only when XDP is set
  net: dsa: bcm_sf2: Configure IMP port TC2QOS mapping
  net: dsa: bcm_sf2: Advertise number of egress queues
  ...
parents ec3604c7 66bed846

Documentation/devicetree/bindings/net/anarion-gmac.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
*  Adaptrum Anarion ethernet controller



This device is a platform glue layer for stmmac.

Please see stmmac.txt for the other unchanged properties.



Required properties:

 - compatible:  Should be "adaptrum,anarion-gmac", "snps,dwmac"

 - phy-mode:    Should be "rgmii". Other modes are not currently supported.





Examples:



	gmac1: ethernet@f2014000 {

		compatible = "adaptrum,anarion-gmac", "snps,dwmac";

		reg = <0xf2014000 0x4000>, <0xf2018100 8>;



		interrupt-parent = <&core_intc>;

		interrupts = <21>;

		interrupt-names = "macirq";



		clocks = <&core_clk>;

		clock-names = "stmmaceth";



		phy-mode = "rgmii";

	};

Documentation/devicetree/bindings/net/broadcom-bluetooth.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Broadcom Bluetooth Chips

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



This documents the binding structure and common properties for serial

attached Broadcom devices.



Serial attached Broadcom devices shall be a child node of the host UART

device the slave device is attached to.



Required properties:



 - compatible: should contain one of the following:

   * "brcm,bcm43438-bt"



Optional properties:



 - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt

 - shutdown-gpios: GPIO specifier, used to enable the BT module

 - device-wakeup-gpios: GPIO specifier, used to wakeup the controller

 - host-wakeup-gpios: GPIO specifier, used to wakeup the host processor

 - clocks: clock specifier if external clock provided to the controller

 - clock-names: should be "extclk"





Example:



&uart2 {

       pinctrl-names = "default";

       pinctrl-0 = <&uart2_pins>;



       bluetooth {

               compatible = "brcm,bcm43438-bt";

               max-speed = <921600>;

       };

};

Documentation/devicetree/bindings/net/marvell-pp2.txt

+26 −3
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ Optional properties (port): 
- marvell,loopback: port is loopback mode

- phy: a phandle to a phy node defining the PHY address (as the reg

  property, a single integer).

- interrupt-names: if more than a single interrupt for rx is given, must

                   be the name associated to the interrupts listed. Valid

                   names are: "tx-cpu0", "tx-cpu1", "tx-cpu2", "tx-cpu3",

		   "rx-shared", "link".

- marvell,system-controller: a phandle to the system controller.



Example for marvell,armada-375-pp2:
@@ -80,19 +85,37 @@ cpm_ethernet: ethernet@0 { 
	clock-names = "pp_clk", "gop_clk", "gp_clk";



	eth0: eth0 {

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <0>;

		gop-port-id = <0>;

	};



	eth1: eth1 {

		interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <1>;

		gop-port-id = <2>;

	};



	eth2: eth2 {

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <2>;

		gop-port-id = <3>;

	};

Documentation/devicetree/bindings/net/mediatek-net.txt

+9 −3
Original line number Diff line number Diff line
@@ -7,24 +7,30 @@ have dual GMAC each represented by a child node.. 
* Ethernet controller node



Required properties:

- compatible: Should be "mediatek,mt2701-eth"

- compatible: Should be

		"mediatek,mt2701-eth": for MT2701 SoC

		"mediatek,mt7623-eth", "mediatek,mt2701-eth": for MT7623 SoC

		"mediatek,mt7622-eth": for MT7622 SoC

- reg: Address and length of the register set for the device

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

- clocks: the clock used by the core

- clock-names: the names of the clock listed in the clocks property. These are

	"ethif", "esw", "gp2", "gp1"

	"ethif", "esw", "gp2", "gp1" : For MT2701 and MT7623 SoC

        "ethif", "esw", "gp0", "gp1", "gp2", "sgmii_tx250m", "sgmii_rx250m",

	"sgmii_cdr_ref", "sgmii_cdr_fb", "sgmii_ck", "eth2pll" : For MT7622 SoC

- power-domains: phandle to the power domain that the ethernet is part of

- resets: Should contain a phandle to the ethsys reset signal

- reset-names: Should contain the reset signal name "eth"

- mediatek,ethsys: phandle to the syscon node that handles the port setup

- mediatek,sgmiisys: phandle to the syscon node that handles the SGMII setup

	which is required for those SoCs equipped with SGMII such as MT7622 SoC.

- mediatek,pctl: phandle to the syscon node that handles the ports slew rate

	and driver current



Optional properties:

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device



* Ethernet MAC node



Required properties:

Documentation/devicetree/bindings/net/phy.txt

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ Optional Properties: 
  Mark the corresponding energy efficient ethernet mode as broken and

  request the ethernet to stop advertising it.



- phy-is-integrated: If set, indicates that the PHY is integrated into the same

  physical package as the Ethernet MAC. If needed, muxers should be configured

  to ensure the integrated PHY is used. The absence of this property indicates

  the muxers should be configured so that the external PHY is used.



Example:



ethernet-phy@0 {