Commit b8fd789a authored by David S. Miller's avatar David S. Miller

Merge branch 'bcmsysport-napi-updates'

Florian Fainelli says:

====================
net: bcmsysport: utilize newer NAPI APIs

These two patches are very analoguous to what was already submitted for
BCMGENET and switch the SYSTEMPORT driver to utilizing __napi_schedule_irqoff()
and napi_complete_done for the RX NAPI context.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c57107c7 c82f47ef
...@@ -831,7 +831,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget) ...@@ -831,7 +831,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget)
rdma_writel(priv, priv->rx_c_index, RDMA_CONS_INDEX); rdma_writel(priv, priv->rx_c_index, RDMA_CONS_INDEX);
if (work_done < budget) { if (work_done < budget) {
napi_complete(napi); napi_complete_done(napi, work_done);
/* re-enable RX interrupts */ /* re-enable RX interrupts */
intrl2_0_mask_clear(priv, INTRL2_0_RDMA_MBDONE); intrl2_0_mask_clear(priv, INTRL2_0_RDMA_MBDONE);
} }
...@@ -873,7 +873,7 @@ static irqreturn_t bcm_sysport_rx_isr(int irq, void *dev_id) ...@@ -873,7 +873,7 @@ static irqreturn_t bcm_sysport_rx_isr(int irq, void *dev_id)
if (likely(napi_schedule_prep(&priv->napi))) { if (likely(napi_schedule_prep(&priv->napi))) {
/* disable RX interrupts */ /* disable RX interrupts */
intrl2_0_mask_set(priv, INTRL2_0_RDMA_MBDONE); intrl2_0_mask_set(priv, INTRL2_0_RDMA_MBDONE);
__napi_schedule(&priv->napi); __napi_schedule_irqoff(&priv->napi);
} }
} }
...@@ -916,7 +916,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id) ...@@ -916,7 +916,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id)
if (likely(napi_schedule_prep(&txr->napi))) { if (likely(napi_schedule_prep(&txr->napi))) {
intrl2_1_mask_set(priv, BIT(ring)); intrl2_1_mask_set(priv, BIT(ring));
__napi_schedule(&txr->napi); __napi_schedule_irqoff(&txr->napi);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment