1 files changed, 153 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0618-Revert-net-phy-Move-linkmode-helpers-to-somewhere-pu.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0618-Revert-net-phy-Move-linkmode-helpers-to-somewhere-pu.patch
new file mode 100644
index 00000000..8376ce18
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0618-Revert-net-phy-Move-linkmode-helpers-to-somewhere-pu.patch
@@ -0,0 +1,153 @@
+From 6bc79bc36e92f7b5e3471c35c53ae916e2102601 Mon Sep 17 00:00:00 2001
+From: Sudheesh Mavila <sudheesh.mavila@amd.com>
+Date: Mon, 4 Feb 2019 11:49:52 +0530
+Subject: [PATCH 0618/2940] Revert "net: phy: Move linkmode helpers to
+ somewhere public"
+
+This reverts commit b33b68f0474bbfef1b79f9f95bb63bc2d825e41f.
+---
+ drivers/net/phy/phylink.c | 27 ++++++++++++++++
+ include/linux/linkmode.h  | 67 ---------------------------------------
+ include/linux/mii.h       |  1 -
+ include/linux/phy.h       |  1 -
+ 4 files changed, 27 insertions(+), 69 deletions(-)
+ delete mode 100644 include/linux/linkmode.h
+
+diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
+index 9b8dd0d0ee42..70f3f90c2ed6 100644
+--- a/drivers/net/phy/phylink.c
++++ b/drivers/net/phy/phylink.c
+@@ -68,6 +68,33 @@ struct phylink {
+ 	struct sfp_bus *sfp_bus;
+ };
+ 
++static inline void linkmode_zero(unsigned long *dst)
++{
++	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);
++}
++
++static inline void linkmode_copy(unsigned long *dst, const unsigned long *src)
++{
++	bitmap_copy(dst, src, __ETHTOOL_LINK_MODE_MASK_NBITS);
++}
++
++static inline void linkmode_and(unsigned long *dst, const unsigned long *a,
++				const unsigned long *b)
++{
++	bitmap_and(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
++}
++
++static inline void linkmode_or(unsigned long *dst, const unsigned long *a,
++				const unsigned long *b)
++{
++	bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
++}
++
++static inline bool linkmode_empty(const unsigned long *src)
++{
++	return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);
++}
++
+ /**
+  * phylink_set_port_modes() - set the port type modes in the ethtool mask
+  * @mask: ethtool link mode mask
+diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h
+deleted file mode 100644
+index 014fb86c7114..000000000000
+--- a/include/linux/linkmode.h
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#ifndef __LINKMODE_H
+-#define __LINKMODE_H
+-
+-#include <linux/bitmap.h>
+-#include <linux/ethtool.h>
+-#include <uapi/linux/ethtool.h>
+-
+-static inline void linkmode_zero(unsigned long *dst)
+-{
+-	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline void linkmode_copy(unsigned long *dst, const unsigned long *src)
+-{
+-	bitmap_copy(dst, src, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline void linkmode_and(unsigned long *dst, const unsigned long *a,
+-				const unsigned long *b)
+-{
+-	bitmap_and(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline void linkmode_or(unsigned long *dst, const unsigned long *a,
+-				const unsigned long *b)
+-{
+-	bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline bool linkmode_empty(const unsigned long *src)
+-{
+-	return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline int linkmode_andnot(unsigned long *dst, const unsigned long *src1,
+-				  const unsigned long *src2)
+-{
+-	return bitmap_andnot(dst, src1, src2,  __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-static inline void linkmode_set_bit(int nr, volatile unsigned long *addr)
+-{
+-	__set_bit(nr, addr);
+-}
+-
+-static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr)
+-{
+-	__clear_bit(nr, addr);
+-}
+-
+-static inline void linkmode_change_bit(int nr, volatile unsigned long *addr)
+-{
+-	__change_bit(nr, addr);
+-}
+-
+-static inline int linkmode_test_bit(int nr, volatile unsigned long *addr)
+-{
+-	return test_bit(nr, addr);
+-}
+-
+-static inline int linkmode_equal(const unsigned long *src1,
+-				 const unsigned long *src2)
+-{
+-	return bitmap_equal(src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS);
+-}
+-
+-#endif /* __LINKMODE_H */
+diff --git a/include/linux/mii.h b/include/linux/mii.h
+index f49737c02504..63cd58798e0f 100755
+--- a/include/linux/mii.h
++++ b/include/linux/mii.h
+@@ -10,7 +10,6 @@
+ 
+ 
+ #include <linux/if.h>
+-#include <linux/linkmode.h>
+ #include <uapi/linux/mii.h>
+ 
+ struct ethtool_cmd;
+diff --git a/include/linux/phy.h b/include/linux/phy.h
+index 81532a61e995..cd6f637cbbfb 100644
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -19,7 +19,6 @@
+ #include <linux/compiler.h>
+ #include <linux/spinlock.h>
+ #include <linux/ethtool.h>
+-#include <linux/linkmode.h>
+ #include <linux/mdio.h>
+ #include <linux/mii.h>
+ #include <linux/module.h>
+-- 
+2.17.1
+