Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ibm_emac: Convert to use napi_struct independent of struct net_device

Browse Source 
Commit da3dedd9 ("[NET]: Make NAPI polling independent of struct
net_device objects.") changed the interface to NAPI polling.  Fix up
the ibm_emac driver so that it works with this new interface.  This is
actually a nice cleanup because ibm_emac is one of the drivers that
wants to have multiple NAPI structures for a single net_device.

Tested with the internal MAC of a PowerPC 440SPe SoC with an AMCC
'Yucca' evaluation board.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Roland Dreier 2007-10-09 15:47:37 -07:00 committed by David S. Miller
parent 9153f66a5b
commit bfe13f54f5
3 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/net/ibm_emac/ibm_emac_mal.c
View File

@ -207,10 +207,10 @@ static irqreturn_t mal_serr(int irq, void *dev_instance)
static inline void mal_schedule_poll(struct ibm_ocp_mal *mal) static inline void mal_schedule_poll(struct ibm_ocp_mal *mal)
{ {
if (likely(netif_rx_schedule_prep(&mal->poll_dev))) { if (likely(napi_schedule_prep(&mal->napi))) {
MAL_DBG2("%d: schedule_poll" NL, mal->def->index); MAL_DBG2("%d: schedule_poll" NL, mal->def->index);
mal_disable_eob_irq(mal); mal_disable_eob_irq(mal);
__netif_rx_schedule(&mal->poll_dev); __napi_schedule(&mal->napi);
} else } else
MAL_DBG2("%d: already in poll" NL, mal->def->index); MAL_DBG2("%d: already in poll" NL, mal->def->index);
} }
@ -273,11 +273,11 @@ static irqreturn_t mal_rxde(int irq, void *dev_instance)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int mal_poll(struct net_device *ndev, int *budget) static int mal_poll(struct napi_struct *napi, int budget)
{ {
struct ibm_ocp_mal *mal = ndev->priv; struct ibm_ocp_mal *mal = container_of(napi, struct ibm_ocp_mal, napi);
struct list_head *l; struct list_head *l;
int rx_work_limit = min(ndev->quota, *budget), received = 0, done; int received = 0;
MAL_DBG2("%d: poll(%d) %d ->" NL, mal->def->index, *budget, MAL_DBG2("%d: poll(%d) %d ->" NL, mal->def->index, *budget,
rx_work_limit); rx_work_limit);
@ -295,38 +295,34 @@ static int mal_poll(struct net_device *ndev, int *budget)
list_for_each(l, &mal->poll_list) { list_for_each(l, &mal->poll_list) {
struct mal_commac *mc = struct mal_commac *mc =
list_entry(l, struct mal_commac, poll_list); list_entry(l, struct mal_commac, poll_list);
int n = mc->ops->poll_rx(mc->dev, rx_work_limit); int n = mc->ops->poll_rx(mc->dev, budget);
if (n) { if (n) {
received += n; received += n;
rx_work_limit -= n; budget -= n;
if (rx_work_limit <= 0) { if (budget <= 0)
done = 0;
goto more_work; // XXX What if this is the last one ? goto more_work; // XXX What if this is the last one ?
} }
} }
}
/* We need to disable IRQs to protect from RXDE IRQ here */ /* We need to disable IRQs to protect from RXDE IRQ here */
local_irq_disable(); local_irq_disable();
__netif_rx_complete(ndev); __napi_complete(napi);
mal_enable_eob_irq(mal); mal_enable_eob_irq(mal);
local_irq_enable(); local_irq_enable();
done = 1;
/* Check for "rotting" packet(s) */ /* Check for "rotting" packet(s) */
list_for_each(l, &mal->poll_list) { list_for_each(l, &mal->poll_list) {
struct mal_commac *mc = struct mal_commac *mc =
list_entry(l, struct mal_commac, poll_list); list_entry(l, struct mal_commac, poll_list);
if (unlikely(mc->ops->peek_rx(mc->dev) || mc->rx_stopped)) { if (unlikely(mc->ops->peek_rx(mc->dev) || mc->rx_stopped)) {
MAL_DBG2("%d: rotting packet" NL, mal->def->index); MAL_DBG2("%d: rotting packet" NL, mal->def->index);
if (netif_rx_reschedule(ndev, received)) if (napi_reschedule(napi))
mal_disable_eob_irq(mal); mal_disable_eob_irq(mal);
else else
MAL_DBG2("%d: already in poll list" NL, MAL_DBG2("%d: already in poll list" NL,
mal->def->index); mal->def->index);
if (rx_work_limit > 0) if (budget > 0)
goto again; goto again;
else else
goto more_work; goto more_work;
@ -335,12 +331,8 @@ static int mal_poll(struct net_device *ndev, int *budget)
} }
more_work: more_work:
ndev->quota -= received; MAL_DBG2("%d: poll() %d <- %d" NL, mal->def->index, budget, received);
*budget -= received; return received;
MAL_DBG2("%d: poll() %d <- %d" NL, mal->def->index, *budget,
done ? 0 : 1);
return done ? 0 : 1;
} }
static void mal_reset(struct ibm_ocp_mal *mal) static void mal_reset(struct ibm_ocp_mal *mal)
@ -425,11 +417,8 @@ static int __init mal_probe(struct ocp_device *ocpdev)
mal->def = ocpdev->def; mal->def = ocpdev->def;
INIT_LIST_HEAD(&mal->poll_list); INIT_LIST_HEAD(&mal->poll_list);
set_bit(__LINK_STATE_START, &mal->poll_dev.state); mal->napi.weight = CONFIG_IBM_EMAC_POLL_WEIGHT;
mal->poll_dev.weight = CONFIG_IBM_EMAC_POLL_WEIGHT; mal->napi.poll = mal_poll;
mal->poll_dev.poll = mal_poll;
mal->poll_dev.priv = mal;
atomic_set(&mal->poll_dev.refcnt, 1);
INIT_LIST_HEAD(&mal->list); INIT_LIST_HEAD(&mal->list);
@ -520,11 +509,8 @@ static void __exit mal_remove(struct ocp_device *ocpdev)
MAL_DBG("%d: remove" NL, mal->def->index); MAL_DBG("%d: remove" NL, mal->def->index);
/* Syncronize with scheduled polling, /* Synchronize with scheduled polling */
stolen from net/core/dev.c:dev_close() napi_disable(&mal->napi);
*/
clear_bit(__LINK_STATE_START, &mal->poll_dev.state);
netif_poll_disable(&mal->poll_dev);
if (!list_empty(&mal->list)) { if (!list_empty(&mal->list)) {
/* This is *very* bad */ /* This is *very* bad */

2
drivers/net/ibm_emac/ibm_emac_mal.h
View File

@ -195,7 +195,7 @@ struct ibm_ocp_mal {
dcr_host_t dcrhost; dcr_host_t dcrhost;
struct list_head poll_list; struct list_head poll_list;
struct net_device poll_dev; struct napi_struct napi;
struct list_head list; struct list_head list;
u32 tx_chan_mask; u32 tx_chan_mask;

10
include/linux/netdevice.h
View File

@ -349,6 +349,16 @@ static inline void napi_schedule(struct napi_struct *n)
__napi_schedule(n); __napi_schedule(n);
} }
/* Try to reschedule poll. Called by dev->poll() after napi_complete(). */
static inline int napi_reschedule(struct napi_struct *napi)
{
if (napi_schedule_prep(napi)) {
__napi_schedule(napi);
return 1;
}
return 0;
}
/** /**
* napi_complete - NAPI processing complete * napi_complete - NAPI processing complete
* @n: napi context * @n: napi context