--- ...rm64-0004-net-xgbe-Add-A0-silicon-support.patch | 97 ++++++++++------------ 1 file changed, 43 insertions(+), 54 deletions(-) diff --git a/patches.arch/arm64-0004-net-xgbe-Add-A0-silicon-support.patch b/patches.arch/arm64-0004-net-xgbe-Add-A0-silicon-support.patch index b903e28..0322a57 100644 --- a/patches.arch/arm64-0004-net-xgbe-Add-A0-silicon-support.patch +++ b/patches.arch/arm64-0004-net-xgbe-Add-A0-silicon-support.patch @@ -12,19 +12,33 @@ Signed-off-by: Tom Lendacky Signed-off-by: Alexander Graf Signed-off-by: Dirk Mueller -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/Makefile -=================================================================== ---- linux-4.0-rc6-master.orig/drivers/net/ethernet/amd/Makefile -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/Makefile +--- + 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 | 643 +++++ + drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c | 312 ++ + drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c | 279 ++ + drivers/net/ethernet/amd/xgbe-a0/xgbe.h | 868 +++++++ + drivers/net/phy/Makefile | 1 + drivers/net/phy/amd-xgbe-phy-a0.c | 1800 ++++++++++++++ + 15 files changed, 12096 insertions(+) + +--- a/drivers/net/ethernet/amd/Makefile ++++ b/drivers/net/ethernet/amd/Makefile @@ -18,3 +18,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o obj-$(CONFIG_SUN3LANCE) += sun3lance.o obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_AMD_XGBE) += xgbe/ +obj-$(CONFIG_AMD_XGBE) += xgbe-a0/ -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/Makefile -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/Makefile ++++ b/drivers/net/ethernet/amd/xgbe-a0/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_AMD_XGBE) += amd-xgbe-a0.o + @@ -34,10 +48,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/Makefile + +amd-xgbe-a0-$(CONFIG_AMD_XGBE_DCB) += xgbe-dcb.o +amd-xgbe-a0-$(CONFIG_DEBUG_FS) += xgbe-debugfs.o -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h @@ -0,0 +1,1142 @@ +/* + * AMD 10Gb Ethernet driver @@ -1181,10 +1193,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h +} while (0) + +#endif -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c @@ -0,0 +1,269 @@ +/* + * AMD 10Gb Ethernet driver @@ -1455,10 +1465,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c +{ + return &xgbe_dcbnl_ops; +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c @@ -0,0 +1,373 @@ +/* + * AMD 10Gb Ethernet driver @@ -1833,10 +1841,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c + debugfs_remove_recursive(pdata->xgbe_debugfs); + pdata->xgbe_debugfs = NULL; +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c @@ -0,0 +1,636 @@ +/* + * AMD 10Gb Ethernet driver @@ -2474,10 +2480,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c + + DBGPR("<--xgbe_a0_init_function_ptrs_desc\n"); +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c @@ -0,0 +1,2930 @@ +/* + * AMD 10Gb Ethernet driver @@ -5409,10 +5413,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c + + DBGPR("<--xgbe_a0_init_function_ptrs\n"); +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c @@ -0,0 +1,2218 @@ +/* + * AMD 10Gb Ethernet driver @@ -7632,10 +7634,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c + + netdev_alert(netdev, "\n************** SKB dump ****************\n"); +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c @@ -0,0 +1,616 @@ +/* + * AMD 10Gb Ethernet driver @@ -8253,10 +8253,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c +{ + return (struct ethtool_ops *)&xgbe_ethtool_ops; +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c @@ -0,0 +1,643 @@ +/* + * AMD 10Gb Ethernet driver @@ -8901,10 +8899,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c +}; + +module_platform_driver(xgbe_a0_driver); -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c @@ -0,0 +1,312 @@ +/* + * AMD 10Gb Ethernet driver @@ -9218,11 +9214,9 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c + + DBGPR("<--xgbe_a0_mdio_unregister\n"); +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c -@@ -0,0 +1,278 @@ ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c +@@ -0,0 +1,279 @@ +/* + * AMD 10Gb Ethernet driver + * @@ -9404,7 +9398,7 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c + return 0; +} + -+static int xgbe_gettime(struct ptp_clock_info *info, struct timespec *ts) ++static int xgbe_gettime(struct ptp_clock_info *info, struct timespec64 *ts) +{ + struct xgbe_prv_data *pdata = container_of(info, + struct xgbe_prv_data, @@ -9418,12 +9412,13 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c + + spin_unlock_irqrestore(&pdata->tstamp_lock, flags); + -+ *ts = ns_to_timespec(nsec); ++ *ts = ns_to_timespec64(nsec); + + return 0; +} + -+static int xgbe_settime(struct ptp_clock_info *info, const struct timespec *ts) ++static int xgbe_settime(struct ptp_clock_info *info, ++ const struct timespec64 *ts) +{ + struct xgbe_prv_data *pdata = container_of(info, + struct xgbe_prv_data, @@ -9431,7 +9426,7 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c + unsigned long flags; + u64 nsec; + -+ nsec = timespec_to_ns(ts); ++ nsec = timespec64_to_ns(ts); + + spin_lock_irqsave(&pdata->tstamp_lock, flags); + @@ -9461,8 +9456,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c + info->max_adj = pdata->ptpclk_rate; + info->adjfreq = xgbe_adjfreq; + info->adjtime = xgbe_adjtime; -+ info->gettime = xgbe_gettime; -+ info->settime = xgbe_settime; ++ info->gettime64 = xgbe_gettime; ++ info->settime64 = xgbe_settime; + info->enable = xgbe_enable; + + clock = ptp_clock_register(info, pdata->dev); @@ -9501,10 +9496,8 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c + if (pdata->ptp_clock) + ptp_clock_unregister(pdata->ptp_clock); +} -Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe.h -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe.h ++++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h @@ -0,0 +1,868 @@ +/* + * AMD 10Gb Ethernet driver @@ -10374,20 +10367,16 @@ Index: linux-4.0-rc6-master/drivers/net/ethernet/amd/xgbe-a0/xgbe.h +#endif + +#endif -Index: linux-4.0-rc6-master/drivers/net/phy/Makefile -=================================================================== ---- linux-4.0-rc6-master.orig/drivers/net/phy/Makefile -+++ linux-4.0-rc6-master/drivers/net/phy/Makefile +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile @@ -34,4 +34,5 @@ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += md obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy.o +obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy-a0.o obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o -Index: linux-4.0-rc6-master/drivers/net/phy/amd-xgbe-phy-a0.c -=================================================================== --- /dev/null -+++ linux-4.0-rc6-master/drivers/net/phy/amd-xgbe-phy-a0.c ++++ b/drivers/net/phy/amd-xgbe-phy-a0.c @@ -0,0 +1,1800 @@ +/* + * AMD 10Gb Ethernet PHY driver -- 2.3.7 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org