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: 2399d6143f
("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>
This commit is contained in:
Родитель
0ce66d4f70
Коммит
4a2947e32e
|
@ -30,7 +30,6 @@
|
||||||
#include <linux/etherdevice.h>
|
#include <linux/etherdevice.h>
|
||||||
#include <net/switchdev.h>
|
#include <net/switchdev.h>
|
||||||
#include <linux/platform_data/b53.h>
|
#include <linux/platform_data/b53.h>
|
||||||
#include <linux/kexec.h>
|
|
||||||
|
|
||||||
#include "bcm_sf2.h"
|
#include "bcm_sf2.h"
|
||||||
#include "bcm_sf2_regs.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
|
/* 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
|
* 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.
|
* 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)
|
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
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
|
Загрузка…
Ссылка в новой задаче