nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: fix regression due to early mac_rst

Browse Source 
Issue: Interface is not up after boot

Fix: in ether_open(), MAC reset called before phy is
out of reset, adding steps to take care of it.

Also added put clks in case of probe failure and remove.

Bug 200512422

Change-Id: Id9da0cf77356cc03aaa69f2420028764ba462d47
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2142245
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Rakesh Goyal
2019-06-25 08:31:37 +05:30
committed by Revanth Kumar Uppala
parent 3cb8c90059
commit 7bddaf1e51
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -243,12 +243,6 @@ static int ether_phy_init(struct net_device *dev)
pdata->speed = SPEED_UNKNOWN;
pdata->oldduplex = SPEED_UNKNOWN;
/* Reset the PHY */
if (gpio_is_valid(pdata->phy_reset)) {
gpio_set_value(pdata->phy_reset, 0);
usleep_range(10, 11);
gpio_set_value(pdata->phy_reset, 1);
}
if (pdata->phy_node != NULL) {
phydev = of_phy_connect(dev, pdata->phy_node,
@@ -1148,6 +1142,13 @@ static int ether_open(struct net_device *dev)
struct osi_core_priv_data *osi_core = pdata->osi_core;
int ret = 0;
/* Reset the PHY */
if (gpio_is_valid(pdata->phy_reset)) {
gpio_set_value(pdata->phy_reset, 0);
usleep_range(10, 11);
gpio_set_value(pdata->phy_reset, 1);
}
ret = ether_enable_clks(pdata);
if (ret < 0) {
dev_err(&dev->dev, "failed to enable clks\n");
@@ -1264,6 +1265,9 @@ err_poll_swr:
}
err_mac_rst:
ether_disable_clks(pdata);
if (gpio_is_valid(pdata->phy_reset)) {
gpio_set_value(pdata->phy_reset, OSI_DISABLE);
}
return ret;
}
@@ -2813,6 +2817,7 @@ static int ether_init_plat_resources(struct platform_device *pdev,
mac_addr_fail:
ether_disable_clks(pdata);
ether_put_clks(pdata);
if (gpio_is_valid(pdata->phy_reset)) {
gpio_set_value(pdata->phy_reset, OSI_DISABLE);
}
@@ -3434,6 +3439,10 @@ err_napi:
mdiobus_unregister(pdata->mii);
err_dma_mask:
ether_disable_clks(pdata);
ether_put_clks(pdata);
if (gpio_is_valid(pdata->phy_reset)) {
gpio_set_value(pdata->phy_reset, OSI_DISABLE);
}
err_init_res:
err_parse_dt:
free_netdev(ndev);
@@ -3467,6 +3476,9 @@ static int ether_remove(struct platform_device *pdev)
}
ether_disable_clks(pdata);
ether_put_clks(pdata);
/* Assert MAC RST gpio */
if (pdata->mac_rst) {
reset_control_assert(pdata->mac_rst);