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

Commit 54a4ca8e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'amd-xgbe' 



Tom Lendacky says:

====================
amd-xgbe: AMD 10Gb Ethernet driver

The following series implements support for the new AMD 10Gb Ethernet
driver (amd-xgbe).  It includes the 10Gb Ethernet driver as well as
a 10Gb Ethernet PHY driver.

This patch series is based on net-next.

Changes in V3:
  - Add OF dependency to the phylib driver configuration
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e0a47d1f 45198c7b

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* AMD 10GbE PHY driver (amd-xgbe-phy)



Required properties:

- compatible: Should be "amd,xgbe-phy-seattle-v1a" and

  "ethernet-phy-ieee802.3-c45"

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

   - SerDes Rx/Tx registers

   - SerDes integration registers (1/2)

   - SerDes integration registers (2/2)



Example:

	xgbe_phy@e1240800 {

		compatible = "amd,xgbe-phy-seattle-v1a", "ethernet-phy-ieee802.3-c45";

		reg = <0 0xe1240800 0 0x00400>,

		      <0 0xe1250000 0 0x00060>,

		      <0 0xe1250080 0 0x00004>;

	};

Documentation/devicetree/bindings/net/amd-xgbe.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* AMD 10GbE driver (amd-xgbe)



Required properties:

- compatible: Should be "amd,xgbe-seattle-v1a"

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

   - MAC registers

   - PCS registers

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

  that services interrupts for this device

- interrupts: Should contain the amd-xgbe interrupt

- clocks: Should be the DMA clock for the amd-xgbe device (used for

  calculating the correct Rx interrupt watchdog timer value on a DMA

  channel for coalescing)

- clock-names: Should be the name of the DMA clock, "dma_clk"

- phy-handle: See ethernet.txt file in the same directory

- phy-mode: See ethernet.txt file in the same directory



Optional properties:

- mac-address: mac address to be assigned to the device. Can be overridden

  by UEFI.



Example:

	xgbe@e0700000 {

		compatible = "amd,xgbe-seattle-v1a";

		reg = <0 0xe0700000 0 0x80000>,

		      <0 0xe0780000 0 0x80000>;

		interrupt-parent = <&gic>;

		interrupts = <0 325 4>;

		clocks = <&xgbe_clk>;

		clock-names = "dma_clk";

		phy-handle = <&phy>;

		phy-mode = "xgmii";

		mac-address = [ 02 a1 a2 a3 a4 a5 ];

	};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -597,6 +597,13 @@ L: amd64-microcode@amd64.org 
S:	Maintained

F:	arch/x86/kernel/microcode_amd.c



AMD XGBE DRIVER

M:	Tom Lendacky <thomas.lendacky@amd.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/amd/xgbe/

F:	drivers/net/phy/amd-xgbe-phy.c



AMS (Apple Motion Sensor) DRIVER

M:	Michael Hanselmann <linux-kernel@hansmi.ch>

S:	Supported

drivers/net/ethernet/amd/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config NET_VENDOR_AMD 
	default y

	depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \

		   SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \

		   (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA

		   (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA || ARM64

	---help---

	  If you have a network (Ethernet) chipset belonging to this class,

	  say Y.
@@ -177,4 +177,16 @@ config SUNLANCE 
	  To compile this driver as a module, choose M here: the module

	  will be called sunlance.



config AMD_XGBE

	tristate "AMD 10GbE Ethernet driver"

	depends on OF_NET

	select PHYLIB

	select AMD_XGBE_PHY

	---help---

	  This driver supports the AMD 10GbE Ethernet device found on an

	  AMD SoC.



	  To compile this driver as a module, choose M here: the module

	  will be called amd-xgbe.



endif # NET_VENDOR_AMD

drivers/net/ethernet/amd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ obj-$(CONFIG_NI65) += ni65.o 
obj-$(CONFIG_PCNET32) += pcnet32.o

obj-$(CONFIG_SUN3LANCE) += sun3lance.o

obj-$(CONFIG_SUNLANCE) += sunlance.o

obj-$(CONFIG_AMD_XGBE) += xgbe/