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: remove calling of osi_update_stats_counter

Browse Source 
remove osi_update_stats_counter and add logic in
nvethernet itself to take care of incrementing the
value

Bug 4284096
Bug 4449611

Change-Id: I0b7e6f03651b0d092d136baf0efd1caffc762205
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3053871
(cherry picked from commit bdb1fedec9f3781a3100bd2838271551df31984f)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3074753
(cherry picked from commit d31b03a583adf52a7978ef14a9cc0c7d3005ccb0)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3081228
Reviewed-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-by: Srinivas Ramachandran <srinivasra@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Bhadram Varka <vbhadram@nvidia.com>
This commit is contained in:
Narayan Reddy
2024-01-15 17:03:23 +00:00
committed by mobile promotions
parent 050caf414d
commit 85cf3fb4b3
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1144,8 +1144,7 @@ static void ether_adjust_link(struct net_device *dev)
new_state = 1;
pdata->oldlink = 1;
val = pdata->xstats.link_connect_count;
pdata->xstats.link_connect_count =
osi_update_stats_counter(val, 1UL);
pdata->xstats.link_connect_count = update_stats_counter(val, 1UL);
}
} else if (pdata->oldlink) {
new_state = 1;
@@ -1153,8 +1152,7 @@ static void ether_adjust_link(struct net_device *dev)
pdata->speed = 0;
pdata->oldduplex = -1;
val = pdata->xstats.link_disconnect_count;
pdata->xstats.link_disconnect_count =
osi_update_stats_counter(val, 1UL);
pdata->xstats.link_disconnect_count = update_stats_counter(val, 1UL);
ether_en_dis_monitor_clks(pdata, OSI_DISABLE);
} else {
/* Nothing here */
@@ -1351,8 +1349,7 @@ static irqreturn_t ether_tx_chan_isr(int irq, void *data)
raw_spin_unlock_irqrestore(&pdata->rlock, flags);
val = pdata->xstats.tx_normal_irq_n[chan];
pdata->xstats.tx_normal_irq_n[chan] =
osi_update_stats_counter(val, 1U);
pdata->xstats.tx_normal_irq_n[chan] = update_stats_counter(val, 1U);
if (likely(napi_schedule_prep(&tx_napi->napi))) {
__napi_schedule_irqoff(&tx_napi->napi);
@@ -1398,8 +1395,7 @@ static irqreturn_t ether_rx_chan_isr(int irq, void *data)
raw_spin_unlock_irqrestore(&pdata->rlock, flags);
val = pdata->xstats.rx_normal_irq_n[chan];
pdata->xstats.rx_normal_irq_n[chan] =
osi_update_stats_counter(val, 1U);
pdata->xstats.rx_normal_irq_n[chan] = update_stats_counter(val, 1U);
if (likely(napi_schedule_prep(&rx_napi->napi))) {
__napi_schedule_irqoff(&rx_napi->napi);
@@ -4373,8 +4369,7 @@ static enum hrtimer_restart ether_tx_usecs_hrtimer(struct hrtimer *data)
unsigned long val;
val = pdata->xstats.tx_usecs_swtimer_n[tx_napi->chan];
pdata->xstats.tx_usecs_swtimer_n[tx_napi->chan] =
osi_update_stats_counter(val, 1U);
pdata->xstats.tx_usecs_swtimer_n[tx_napi->chan] = update_stats_counter(val, 1U);
atomic_set(&pdata->tx_napi[tx_napi->chan]->tx_usecs_timer_armed,
OSI_DISABLE);