diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2016-10-21 14:21:56 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-10-22 16:17:53 -0400 |
| commit | 4a2947e32ea9ca2bc36d68022b7d7b1014dca18f (patch) | |
| tree | 46054ef8f49526b1744873ae61ce82e31eb6ba37 /drivers/net/dsa/bcm_sf2.c | |
| parent | Revert "kexec: Export kexec_in_progress to modules" (diff) | |
| download | linux-dev-4a2947e32ea9ca2bc36d68022b7d7b1014dca18f.tar.xz linux-dev-4a2947e32ea9ca2bc36d68022b7d7b1014dca18f.zip | |
net: dsa: bcm_sf2: Do not rely on kexec_in_progress
After discussing with Eric, it turns out that, while using
kexec_in_progress is a nice optimization, which prevents us from always
powering on the integrated PHY, let's just turn it on in the shutdown
path.
This removes a dependency on kexec_in_progress which, according to Eric
should not be used by modules
Fixes: 2399d6143f85 ("net: dsa: bcm_sf2: Prevent GPHY shutdown for kexec'd kernels")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 077a24541584..e3ee27ce13dd 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -30,7 +30,6 @@ #include <linux/etherdevice.h> #include <net/switchdev.h> #include <linux/platform_data/b53.h> -#include <linux/kexec.h> #include "bcm_sf2.h" #include "bcm_sf2_regs.h" @@ -1141,9 +1140,11 @@ static void bcm_sf2_sw_shutdown(struct platform_device *pdev) /* For a kernel about to be kexec'd we want to keep the GPHY on for a * successful MDIO bus scan to occur. If we did turn off the GPHY * before (e.g: port_disable), this will also power it back on. + * + * Do not rely on kexec_in_progress, just power the PHY on. */ if (priv->hw_params.num_gphy == 1) - bcm_sf2_gphy_enable_set(priv->dev->ds, kexec_in_progress); + bcm_sf2_gphy_enable_set(priv->dev->ds, true); } #ifdef CONFIG_PM_SLEEP |