shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

ethernet: resume/suspend NULL pointer [1/1]

Browse Source 
PD#SWPL-3000

Problem:
repeat resume/suspend will NULL pointer

Solution:
use globle var

Verify:
verify in u200

Change-Id: If44e52a5907c85fb181a450af92b18fe37e09d4f
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
This commit is contained in:
Zhuo Wang
2018-12-07 18:13:56 +08:00
committed by Dongjin Kim
parent 8d222fd575
commit b7fda3654f
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
View File

@@ -286,6 +286,7 @@ static int dwmac_meson_cfg_analog(void __iomem *base_addr,
}
/*for newer then g12a use this dts architecture for dts*/
void __iomem *phy_analog_config_addr;
static void __iomem *g12a_network_interface_setup(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
@@ -330,7 +331,7 @@ static void __iomem *g12a_network_interface_setup(struct platform_device *pdev)
}
ETH_PHY_config_addr = addr;
phy_analog_config_addr = addr;
/*PRG_ETH_REG0*/
if (of_property_read_u32(np, "mc_val", &mc_val))
pr_info("Miss mc_val for REG0\n");
@@ -384,17 +385,8 @@ static void __iomem *g12a_network_interface_setup(struct platform_device *pdev)
return REG_ETH_reg0_addr;
}
void __iomem *phy_analog_config_addr;
static int dwmac_meson_disable_analog(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
void __iomem *phy_analog_config_addr = NULL;
/*map ETH_PLL address*/
phy_analog_config_addr = devm_ioremap_nocache
(&pdev->dev,
(resource_size_t)0xff64c000, 4);
writel(0x00000000, phy_analog_config_addr + 0x0);
writel(0x003e0000, phy_analog_config_addr + 0x4);
writel(0x12844008, phy_analog_config_addr + 0x8);
@@ -408,13 +400,6 @@ static int dwmac_meson_disable_analog(struct device *dev)
static int dwmac_meson_recover_analog(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
void __iomem *phy_analog_config_addr = NULL;
/*map ETH_PLL address*/
phy_analog_config_addr = devm_ioremap_nocache
(&pdev->dev,
(resource_size_t)0xff64c000, 4);
pr_info("recover %p\n", phy_analog_config_addr);
writel(0x19c0040a, phy_analog_config_addr + 0x44);