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

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

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

Pull networking fixes from David Miller:
 "Several networking final fixes and tidies for the merge window:

   1) Changes during the merge window unintentionally took away the
      ability to build bluetooth modular, fix from Geert Uytterhoeven.

   2) Several phy_node reference count bug fixes from Uwe Kleine-König.

   3) Fix ucc_geth build failures, also from Uwe Kleine-König.

   4) Fix klog false positivies when netlink messages go to network
      taps, by properly resetting the network header.  Fix from Daniel
      Borkmann.

   5) Sizing estimate of VF netlink messages is too small, from Jiri
      Benc.

   6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian.

   7) VLAN untagging is erroneously dependent upon whether the VLAN
      module is loaded or not, but there are generic dependencies that
      matter wrt what can be expected as the SKB enters the stack.
      Make the basic untagging generic code, and do it unconditionally.
      From Vlad Yasevich.

   8) xen-netfront only has so many slots in it's transmit queue so
      linearize packets that have too many frags.  From Zoltan Kiss.

   9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian
      Fainelli"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits)
  net: bcmgenet: correctly resume adapter from Wake-on-LAN
  net: bcmgenet: update UMAC_CMD only when link is detected
  net: bcmgenet: correctly suspend and resume PHY device
  net: bcmgenet: request and enable main clock earlier
  net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call
  xen-netfront: Fix handling packets on compound pages with skb_linearize
  net: fec: Support phys probed from devicetree and fixed-link
  smsc: replace WARN_ON() with WARN_ON_SMP()
  xen-netback: Don't deschedule NAPI when carrier off
  net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
  wan: wanxl: Remove typedefs from struct names
  m68k/atari: EtherNEC - ethernet support (ne)
  net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call
  hdlc: Remove typedefs from struct names
  airo_cs: Remove typedef local_info_t
  atmel: Remove typedef atmel_priv_ioctl
  com20020_cs: Remove typedef com20020_dev_t
  ethernet: amd: Remove typedef local_info_t
  net: Always untag vlan-tagged traffic on input.
  drivers: net: Add APM X-Gene SoC ethernet driver support.
  ...
parents 13b102bf 61dac43e

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

0 → 100644
+66 −0
Original line number Diff line number Diff line 
APM X-Gene SoC Ethernet nodes



Ethernet nodes are defined to describe on-chip ethernet interfaces in

APM X-Gene SoC.



Required properties:

- compatible: Should be "apm,xgene-enet"

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

  information of registers in the same order as described by reg-names

- reg-names: Should contain the register set names

  - "enet_csr": Ethernet control and status register address space

  - "ring_csr": Descriptor ring control and status register address space

  - "ring_cmd": Descriptor ring command register address space

- interrupts: Ethernet main interrupt

- clocks: Reference to the clock entry.

- local-mac-address: MAC address assigned to this device

- phy-connection-type: Interface type between ethernet device and PHY device

- phy-handle: Reference to a PHY node connected to this device



- mdio: Device tree subnode with the following required properties:

  - compatible: Must be "apm,xgene-mdio".

  - #address-cells: Must be <1>.

  - #size-cells: Must be <0>.



  For the phy on the mdio bus, there must be a node with the following fields:

  - compatible: PHY identifier.  Please refer ./phy.txt for the format.

  - reg: The ID number for the phy.



Optional properties:

- status: Should be "ok" or "disabled" for enabled/disabled. Default is "ok".



Example:

	menetclk: menetclk {

		compatible = "apm,xgene-device-clock";

		clock-output-names = "menetclk";

		status = "ok";

	};



	menet: ethernet@17020000 {

		compatible = "apm,xgene-enet";

		status = "disabled";

		reg = <0x0 0x17020000 0x0 0xd100>,

		      <0x0 0X17030000 0x0 0X400>,

		      <0x0 0X10000000 0x0 0X200>;

		reg-names = "enet_csr", "ring_csr", "ring_cmd";

		interrupts = <0x0 0x3c 0x4>;

		clocks = <&menetclk 0>;

		local-mac-address = [00 01 73 00 00 01];

		phy-connection-type = "rgmii";

		phy-handle = <&menetphy>;

		mdio {

			compatible = "apm,xgene-mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			menetphy: menetphy@3 {

				compatible = "ethernet-phy-id001c.c915";

				reg = <0x3>;

			};



		};

	};



/* Board-specific peripheral configurations */

&menet {

        status = "ok";

};

Documentation/devicetree/bindings/net/fsl-fec.txt

+28 −1
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ Optional properties: 
  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

  Use instead of phy-handle.



Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

  according to phy.txt in the same directory



Example:
@@ -25,3 +32,23 @@ ethernet@83fec000 { 
	local-mac-address = [00 04 9F 01 1B B9];

	phy-supply = <&reg_fec_supply>;

};



Example with phy specified:



ethernet@83fec000 {

	compatible = "fsl,imx51-fec", "fsl,imx27-fec";

	reg = <0x83fec000 0x4000>;

	interrupts = <87>;

	phy-mode = "mii";

	phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */

	local-mac-address = [00 04 9F 01 1B B9];

	phy-supply = <&reg_fec_supply>;

	phy-handle = <&ethphy>;

	mdio {

		ethphy: ethernet-phy@6 {

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <6>;

			max-speed = <100>;

		};

	};

};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -719,6 +719,14 @@ S: Maintained 
F:	drivers/net/appletalk/

F:	net/appletalk/



APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Ravi Patel <rapatel@apm.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene/

F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt



APTINA CAMERA SENSOR PLL

M:	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>

L:	linux-media@vger.kernel.org

arch/arm64/boot/dts/apm-mustang.dts

+4 −0
Original line number Diff line number Diff line
@@ -28,3 +28,7 @@ 
&serial0 {

	status = "ok";

};



&menet {

	status = "ok";

};

arch/arm64/boot/dts/apm-storm.dtsi

+27 −3
Original line number Diff line number Diff line
@@ -167,14 +167,13 @@ 
				clock-output-names = "ethclk";

			};



			eth8clk: eth8clk {

			menetclk: menetclk {

				compatible = "apm,xgene-device-clock";

				#clock-cells = <1>;

				clocks = <&ethclk 0>;

				clock-names = "eth8clk";

				reg = <0x0 0x1702C000 0x0 0x1000>;

				reg-names = "csr-reg";

				clock-output-names = "eth8clk";

				clock-output-names = "menetclk";

			};



			sataphy1clk: sataphy1clk@1f21c000 {
@@ -397,5 +396,30 @@ 
			#clock-cells = <1>;

			clocks = <&rtcclk 0>;

		};



		menet: ethernet@17020000 {

			compatible = "apm,xgene-enet";

			status = "disabled";

			reg = <0x0 0x17020000 0x0 0xd100>,

			      <0x0 0X17030000 0x0 0X400>,

			      <0x0 0X10000000 0x0 0X200>;

			reg-names = "enet_csr", "ring_csr", "ring_cmd";

			interrupts = <0x0 0x3c 0x4>;

			dma-coherent;

			clocks = <&menetclk 0>;

			local-mac-address = [00 01 73 00 00 01];

			phy-connection-type = "rgmii";

			phy-handle = <&menetphy>;

			mdio {

				compatible = "apm,xgene-mdio";

				#address-cells = <1>;

				#size-cells = <0>;

				menetphy: menetphy@3 {

					compatible = "ethernet-phy-id001c.c915";

					reg = <0x3>;

				};



			};

		};

	};

};