aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-27 14:32:10 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-04 20:28:14 +0100
commitf791fb4af45032a653ba7c850f4564923871cb16 (patch)
treec1fc4e564c8e27faad582e5b55a9ce91816a241c /target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch
parent7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c (diff)
downloadupstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.gz
upstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.bz2
upstream-f791fb4af45032a653ba7c850f4564923871cb16.zip
kernel: add linux 4.9 support
Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Tim Harvey <tharvey@gateworks.com> [fixes]
Diffstat (limited to 'target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch')
-rw-r--r--target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch87
1 files changed, 87 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch b/target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch
new file mode 100644
index 0000000000..96fb3da5b0
--- /dev/null
+++ b/target/linux/generic/patches-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch
@@ -0,0 +1,87 @@
+From: Florian Fainelli <f.fainelli@gmail.com>
+Date: Tue, 22 Nov 2016 11:40:56 -0800
+Subject: [PATCH] net: phy: broadcom: Allow enabling or disabling of EEE
+
+In preparation for adding support for Wirespeed/downshift, we need to
+change bcm_phy_eee_enable() to allow enabling or disabling EEE, so make
+the function take an extra enable/disable boolean parameter and rename
+it to illustrate it sets EEE, not necessarily just enables it.
+
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+
+--- a/drivers/net/phy/bcm7xxx.c
++++ b/drivers/net/phy/bcm7xxx.c
+@@ -199,7 +199,7 @@ static int bcm7xxx_28nm_config_init(stru
+ if (ret)
+ return ret;
+
+- ret = bcm_phy_enable_eee(phydev);
++ ret = bcm_phy_set_eee(phydev, true);
+ if (ret)
+ return ret;
+
+--- a/drivers/net/phy/bcm-cygnus.c
++++ b/drivers/net/phy/bcm-cygnus.c
+@@ -104,7 +104,7 @@ static int bcm_cygnus_config_init(struct
+ return rc;
+
+ /* Advertise EEE */
+- rc = bcm_phy_enable_eee(phydev);
++ rc = bcm_phy_set_eee(phydev, true);
+ if (rc)
+ return rc;
+
+--- a/drivers/net/phy/bcm-phy-lib.c
++++ b/drivers/net/phy/bcm-phy-lib.c
+@@ -195,7 +195,7 @@ int bcm_phy_enable_apd(struct phy_device
+ }
+ EXPORT_SYMBOL_GPL(bcm_phy_enable_apd);
+
+-int bcm_phy_enable_eee(struct phy_device *phydev)
++int bcm_phy_set_eee(struct phy_device *phydev, bool enable)
+ {
+ int val;
+
+@@ -205,7 +205,10 @@ int bcm_phy_enable_eee(struct phy_device
+ if (val < 0)
+ return val;
+
+- val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
++ if (enable)
++ val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
++ else
++ val &= ~(LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X);
+
+ phy_write_mmd_indirect(phydev, BRCM_CL45VEN_EEE_CONTROL,
+ MDIO_MMD_AN, (u32)val);
+@@ -216,14 +219,17 @@ int bcm_phy_enable_eee(struct phy_device
+ if (val < 0)
+ return val;
+
+- val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
++ if (enable)
++ val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
++ else
++ val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
+
+ phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV,
+ MDIO_MMD_AN, (u32)val);
+
+ return 0;
+ }
+-EXPORT_SYMBOL_GPL(bcm_phy_enable_eee);
++EXPORT_SYMBOL_GPL(bcm_phy_set_eee);
+
+ MODULE_DESCRIPTION("Broadcom PHY Library");
+ MODULE_LICENSE("GPL v2");
+--- a/drivers/net/phy/bcm-phy-lib.h
++++ b/drivers/net/phy/bcm-phy-lib.h
+@@ -36,5 +36,5 @@ int bcm_phy_config_intr(struct phy_devic
+
+ int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down);
+
+-int bcm_phy_enable_eee(struct phy_device *phydev);
++int bcm_phy_set_eee(struct phy_device *phydev, bool enable);
+ #endif /* _LINUX_BCM_PHY_LIB_H */