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 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: add support for XPCS reset

Browse Source 
Bug 3288030

Change-Id: I5e08c266befec52094c508719bff8e8d8e8ef696
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2522194
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com>
This commit is contained in:
Bhadram Varka
2021-04-29 13:01:32 +05:30
committed by Revanth Kumar Uppala
parent 848c6a2e9a
commit ae45ba80a8
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1950,6 +1950,14 @@ static int ether_open(struct net_device *dev)
}
}
if (pdata->xpcs_rst && !osi_core->pre_si) {
ret = reset_control_reset(pdata->xpcs_rst);
if (ret < 0) {
dev_err(&dev->dev, "failed to reset XPCS HW\n");
goto err_xpcs_rst;
}
}
if (osi_core->mac == OSI_MAC_HW_MGBE &&
osi_core->use_virtualization != OSI_ENABLE) {
power_ungate(pdata);
@@ -2115,6 +2123,10 @@ err_alloc:
}
err_phy_init:
err_poll_swr:
if (!osi_core->pre_si && pdata->xpcs_rst) {
reset_control_assert(pdata->xpcs_rst);
}
err_xpcs_rst:
if (!osi_core->pre_si && pdata->mac_rst) {
reset_control_assert(pdata->mac_rst);
}
@@ -2307,6 +2319,10 @@ static int ether_close(struct net_device *ndev)
ether_stop_ivc(pdata);
if (!pdata->osi_core->pre_si && pdata->xpcs_rst) {
reset_control_assert(pdata->xpcs_rst);
}
/* Assert MAC RST gpio */
if (!pdata->osi_core->pre_si && pdata->mac_rst) {
reset_control_assert(pdata->mac_rst);
@@ -4005,6 +4021,12 @@ static int ether_configure_car(struct platform_device *pdev,
return PTR_ERR(pdata->mac_rst);
}
pdata->xpcs_rst = devm_reset_control_get(&pdev->dev, "xpcs_rst");
if (IS_ERR_OR_NULL(pdata->xpcs_rst)) {
dev_info(&pdev->dev, "failed to get XPCS reset\n");
pdata->xpcs_rst = NULL;
}
/* get PHY reset */
pdata->phy_reset = of_get_named_gpio(np, "nvidia,phy-reset-gpio", 0);
if (pdata->phy_reset < 0) {
@@ -5158,6 +5180,11 @@ static int ether_remove(struct platform_device *pdev)
if (!pdata->osi_core->pre_si && pdata->mac_rst) {
reset_control_assert(pdata->mac_rst);
}
if (!pdata->osi_core->pre_si && pdata->xpcs_rst) {
reset_control_assert(pdata->xpcs_rst);
}
free_netdev(ndev);
return 0;
@@ -5280,6 +5307,14 @@ static int ether_resume(struct ether_priv_data *pdata)
return ret;
}
if (pdata->xpcs_rst) {
ret = reset_control_reset(pdata->xpcs_rst);
if (ret < 0) {
dev_err(dev, "failed to reset XPCS hw\n");
return ret;
}
}
ioctl_data.cmd = OSI_CMD_PAD_CALIBRATION;
ret = osi_handle_ioctl(osi_core, &ioctl_data);
if (ret < 0) {