Update AMD xgbe driver for 4.4

3 files changed, 33 insertions, 68 deletions

diff --git a/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch b/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
index 6b9d07dc7..dad98026a 100644
--- a/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
+++ b/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
@@ -1,42 +1,12 @@
-From b634bc924371a7df6459af04f37c91f65ac59df2 Mon Sep 17 00:00:00 2001
+From a57bb48be552eb00f420266769723ab7a287a2d9 Mon Sep 17 00:00:00 2001
 From: Tom Lendacky <thomas.lendacky@amd.com>
-Date: Thu, 28 May 2015 16:38:57 -0400
-Subject: [PATCH 1/2] amd-xgbe-a0: Add support for XGBE on A0
+Date: Tue, 17 Mar 2015 15:58:32 +0000
+Subject: amd-xgbe-a0: Add support for XGBE on A0
 
 Add XGBE driver support for A0 hardware.
 
 Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-[fixup timespec -> timespec64]
-[use device_dma_is_coherent]
-Signed-off-by: Mark Salter <msalter@redhat.com>
 ---
- drivers/net/ethernet/amd/Makefile               |    1 +
- drivers/net/ethernet/amd/xgbe-a0/Makefile       |    8 +
- drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h  | 1142 +++++++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c     |  269 +++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c |  373 +++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c    |  636 +++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c     | 2930 +++++++++++++++++++++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c     | 2218 +++++++++++++++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c |  616 +++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c    |  618 +++++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c    |  312 +++
- drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c     |  278 +++
- drivers/net/ethernet/amd/xgbe-a0/xgbe.h         |  868 +++++++
- 13 files changed, 10269 insertions(+)
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/Makefile
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
- create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe.h
-
 diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
 index a38a2dc..bf0cf2f 100644
 --- a/drivers/net/ethernet/amd/Makefile
@@ -8288,10 +8258,10 @@ index 0000000..165ff1c
 +}
 diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
 new file mode 100644
-index 0000000..deb8551
+index 0000000..c06013e
 --- /dev/null
 +++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
-@@ -0,0 +1,618 @@
+@@ -0,0 +1,620 @@
 +/*
 + * AMD 10Gb Ethernet driver
 + *
@@ -8648,7 +8618,9 @@ index 0000000..deb8551
 +		goto err_io;
 +
 +	/* Set the DMA coherency values */
-+	pdata->coherent = device_dma_is_coherent(pdata->dev);
++	// FIXME: what replaced device_dma_is_coherent?
++	//pdata->coherent = device_dma_is_coherent(pdata->dev);
++	pdata->coherent = true;
 +	if (pdata->coherent) {
 +		pdata->axdomain = XGBE_DMA_OS_AXDOMAIN;
 +		pdata->arcache = XGBE_DMA_OS_ARCACHE;
@@ -10386,6 +10358,5 @@ index 0000000..04c00d2
 +#endif
 +
 +#endif
--- 
-2.4.5
-
+--
+cgit v0.9.2
diff --git a/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch b/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
index c24edad0a..cd4329348 100644
--- a/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
+++ b/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
@@ -1,50 +1,42 @@
-From a3e660ae9fdeb53000eceeaf393e03cd087e37f7 Mon Sep 17 00:00:00 2001
+From 94c958a307f70c5d6c7103b4d2342b54077c7a23 Mon Sep 17 00:00:00 2001
 From: Tom Lendacky <thomas.lendacky@amd.com>
-Date: Tue, 17 Mar 2015 10:58:38 -0500
-Subject: [PATCH 2/2] amd-xgbe-phy-a0: Add support for XGBE PHY on A0
+Date: Tue, 17 Mar 2015 15:58:38 +0000
+Subject: amd-xgbe-phy-a0: Add support for XGBE PHY on A0
 
 Add XGBE phy driver support for A0 hardware.
 
 Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-[Add back AMD_XGBE_PHY removed upstream for B0 driver]
-Signed-off-by: Mark Salter <msalter@redhat.com>
 ---
- drivers/net/phy/Kconfig           |    7 +
- drivers/net/phy/Makefile          |    1 +
- drivers/net/phy/amd-xgbe-phy-a0.c | 1814 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 1822 insertions(+)
- create mode 100644 drivers/net/phy/amd-xgbe-phy-a0.c
-
 diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
-index cb86d7a..a3138b1 100644
+index 60994a8..ca52987 100644
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -24,6 +24,13 @@ config AMD_PHY
+@@ -29,6 +29,13 @@ config AMD_PHY
  	---help---
  	  Currently supports the am79c874
  
 +config AMD_XGBE_PHY
-+       tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs"
-+       depends on (OF || ACPI) && HAS_IOMEM
-+       depends on ARM64 || COMPILE_TEST
-+       ---help---
-+         Currently supports the AMD 10GbE PHY
++	tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs"
++	depends on (OF || ACPI) && HAS_IOMEM
++	depends on ARM64 || COMPILE_TEST
++	---help---
++	  Currently supports the AMD 10GbE PHY
 +
  config MARVELL_PHY
  	tristate "Drivers for Marvell PHYs"
  	---help---
 diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
-index fcc25a0..6ebb9ba 100644
+index f31a4e2..c2336b9 100644
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MDIO_OCTEON)	+= mdio-octeon.o
- obj-$(CONFIG_MICREL_KS8995MA)	+= spi_ks8995.o
- obj-$(CONFIG_AT803X_PHY)	+= at803x.o
- obj-$(CONFIG_AMD_PHY)		+= amd.o
-+obj-$(CONFIG_AMD_XGBE_PHY)	+= amd-xgbe-phy-a0.o
- obj-$(CONFIG_MDIO_BUS_MUX)	+= mdio-mux.o
- obj-$(CONFIG_MDIO_BUS_MUX_GPIO)	+= mdio-mux-gpio.o
+@@ -39,6 +39,7 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO)	+= mdio-mux-gpio.o
  obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
+ obj-$(CONFIG_MDIO_SUN4I)	+= mdio-sun4i.o
+ obj-$(CONFIG_MDIO_MOXART)	+= mdio-moxart.o
++obj-$(CONFIG_AMD_XGBE_PHY)	+= amd-xgbe-phy-a0.o
+ obj-$(CONFIG_MDIO_BCM_UNIMAC)	+= mdio-bcm-unimac.o
+ obj-$(CONFIG_MICROCHIP_PHY)	+= microchip.o
+ obj-$(CONFIG_MDIO_BCM_IPROC)	+= mdio-bcm-iproc.o
 diff --git a/drivers/net/phy/amd-xgbe-phy-a0.c b/drivers/net/phy/amd-xgbe-phy-a0.c
 new file mode 100644
 index 0000000..c352d5c
@@ -1865,6 +1857,5 @@ index 0000000..c352d5c
 +	{ }
 +};
 +MODULE_DEVICE_TABLE(mdio, amd_xgbe_phy_a0_ids);
--- 
-2.4.5
-
+--
+cgit v0.9.2
diff --git a/kernel.spec b/kernel.spec
index 654279350..51a649360 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2033,6 +2033,9 @@ fi
 #
 # 
 %changelog
+* Mon Nov 23 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update AMD xgbe driver for 4.4
+
 * Mon Nov 23 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc2.git0.1
 - Linux v4.4-rc2
 - Disable debugging options.