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: Invoke API to backup/restore registers

Browse Source 
Issue: During SOC suspend, the MAC is placed in reset.
       This causes all dynamic configurations done by
       SW on the MAC core registers is lost. When SOC
       resumes, MAC is initialized to power-on-default
       configuration, while other SW components still
       have previously set configuration. This results
       in mismatch between HW/SW configuration.
Fix:   Invoke APIs osi_save_registers(), osi_restore_registers()
       to backup and restore the MAC core configuration
       registers before suspend and after resume respectively.

Bug 200561046

Change-Id: I22183ba86fe9e7a7d8f9efb6a90c265182c5c68a
Signed-off-by: Srinivas Ramachandran <srinivasra@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2267402
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Srinivas Ramachandran
2019-12-22 21:58:32 -08:00
committed by Revanth Kumar Uppala
parent 1573817944
commit 6fc9bd5147
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2018-2020, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -3924,6 +3924,17 @@ static int ether_suspend_noirq(struct device *dev)
if (!netif_running(ndev))
return 0;
/* Since MAC is placed in reset during suspend, take a backup of
* current configuration so that SW view of HW is maintained across
* suspend/resume.
*/
if (osi_core->backup_config) {
if (osi_save_registers(osi_core)) {
dev_err(dev, "Failed to backup MAC core registers\n");
return -EBUSY;
}
}
/* Stop workqueue while DUT is going to suspend state */
ether_stats_work_queue_stop(pdata);
@@ -4061,6 +4072,7 @@ static int ether_resume_noirq(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
struct ether_priv_data *pdata = netdev_priv(ndev);
struct osi_core_priv_data *osi_core = pdata->osi_core;
int ret = 0;
if (!netif_running(ndev))
@@ -4081,6 +4093,18 @@ static int ether_resume_noirq(struct device *dev)
return ret;
}
/* Since MAC is brought of reset, all the SW configuration done before
* suspend/resume will be overwritten by power-on-default values.
* Restore the backup of the MAC configuration to maintain consistency
* between SW/HW state.
*/
if (osi_core->backup_config) {
if (osi_restore_registers(osi_core)) {
//TODO: Ideally, undo MAC init/resume & return.
dev_err(dev, "Failed to restore MAC core registers\n");
}
}
return 0;
}