nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 17:55:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: fix race in enable/disable Tx/Rx interrupts

Browse Source 
Change-Id: I5d2ba00662d965d742fea0c655dd2845b65f59b9
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2161941
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Bhadram Varka
2019-07-26 15:57:51 +05:30
committed by Revanth Kumar Uppala
parent 65a4e04daf
commit 23da7763f3
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,16 +299,18 @@ static irqreturn_t ether_tx_chan_isr(int irq, void *data)
struct osi_dma_priv_data *osi_dma = pdata->osi_dma;
struct osi_core_priv_data *osi_core = pdata->osi_core;
unsigned int chan = tx_napi->chan;
unsigned long flags;
unsigned long val;
osi_clear_tx_intr(osi_dma, chan);
val = osi_core->xstats.tx_normal_irq_n[chan];
osi_core->xstats.tx_normal_irq_n[chan] =
osi_update_stats_counter(val, 1U);
if (likely(napi_schedule_prep(&tx_napi->napi))) {
spin_lock_irqsave(&pdata->rlock, flags);
osi_disable_chan_tx_intr(osi_dma, chan);
spin_unlock_irqrestore(&pdata->rlock, flags);
__napi_schedule(&tx_napi->napi);
}
@@ -341,7 +343,7 @@ static irqreturn_t ether_rx_chan_isr(int irq, void *data)
struct osi_dma_priv_data *osi_dma = pdata->osi_dma;
struct osi_core_priv_data *osi_core = pdata->osi_core;
unsigned int chan = rx_napi->chan;
unsigned long val;
unsigned long val, flags;
osi_clear_rx_intr(osi_dma, chan);
val = osi_core->xstats.rx_normal_irq_n[chan];
@@ -350,7 +352,9 @@ static irqreturn_t ether_rx_chan_isr(int irq, void *data)
if (likely(napi_schedule_prep(&rx_napi->napi))) {
spin_lock_irqsave(&pdata->rlock, flags);
osi_disable_chan_rx_intr(osi_dma, chan);
spin_unlock_irqrestore(&pdata->rlock, flags);
__napi_schedule(&rx_napi->napi);
}
@@ -2200,12 +2204,15 @@ static int ether_napi_poll_rx(struct napi_struct *napi, int budget)
struct ether_priv_data *pdata = rx_napi->pdata;
struct osi_dma_priv_data *osi_dma = pdata->osi_dma;
unsigned int chan = rx_napi->chan;
unsigned long flags;
int received = 0;
received = osi_process_rx_completions(osi_dma, chan, budget);
if (received < budget) {
napi_complete(napi);
spin_lock_irqsave(&pdata->rlock, flags);
osi_enable_chan_rx_intr(osi_dma, chan);
spin_unlock_irqrestore(&pdata->rlock, flags);
}
return received;
@@ -2232,12 +2239,15 @@ static int ether_napi_poll_tx(struct napi_struct *napi, int budget)
struct ether_priv_data *pdata = tx_napi->pdata;
struct osi_dma_priv_data *osi_dma = pdata->osi_dma;
unsigned int chan = tx_napi->chan;
unsigned long flags;
int processed;
processed = osi_process_tx_completions(osi_dma, chan);
if (processed == 0) {
napi_complete(napi);
spin_lock_irqsave(&pdata->rlock, flags);
osi_enable_chan_tx_intr(osi_dma, chan);
spin_unlock_irqrestore(&pdata->rlock, flags);
return 0;
}
@@ -3470,6 +3480,7 @@ static int ether_probe(struct platform_device *pdev)
spin_lock_init(&pdata->lock);
spin_lock_init(&pdata->ioctl_lock);
spin_lock_init(&pdata->rlock);
init_filter_values(pdata);
/* Disable Clocks */
ether_disable_clks(pdata);

1
drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
View File

@@ -237,6 +237,7 @@ struct ether_priv_data {
/* for filtering */
spinlock_t lock;
spinlock_t rlock;
/* spin lock for ioctl path */
spinlock_t ioctl_lock;
int num_mac_addr_regs;