hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dsa-bcm_sf2-do-not-rely-on-kexec_in_progress' 

Florian Fainelli says:

====================
net: dsa: bcm_sf2: Do not rely on kexec_in_progress

These are the two patches following the discussing we had on kexec_in_progress.

Feel free to apply or discard them, thanks!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-10-22 16:17:54 -04:00
parent 2a73306b60 4a2947e32e
commit 860e0217fc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/dsa/bcm_sf2.c
View File

@ -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

1
kernel/kexec_core.c
View File

@ -59,7 +59,6 @@ size_t vmcoreinfo_max_size = sizeof(vmcoreinfo_data);
/* Flag to indicate we are going to kexec a new kernel */ /* Flag to indicate we are going to kexec a new kernel */
bool kexec_in_progress = false; bool kexec_in_progress = false;
EXPORT_SYMBOL_GPL(kexec_in_progress);
/* Location of the reserved area for the crash kernel */ /* Location of the reserved area for the crash kernel */