mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-12 14:29:28 +00:00
Code Issues Releases Activity

sfxge: add driver context member with number of receive queues

Browse Source 
Mainly to unify with similar member for transmit queues.

Sponsored by:   Solarflare Communications, Inc.
Approved by:    gnn (mentor)
This commit is contained in:
Andrew Rybchenko 2015-02-18 06:20:59 +00:00
parent e2b05fe21c
commit 133366a6e5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=278939
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/sfxge/sfxge.h
View File

@ -260,6 +260,7 @@ struct sfxge_softc {
char tx_lock_name[SFXGE_LOCK_NAME_MAX]; char tx_lock_name[SFXGE_LOCK_NAME_MAX];
#endif #endif
unsigned int rxq_count;
unsigned int txq_count; unsigned int txq_count;
}; };

25
sys/dev/sfxge/sfxge_rx.c
View File

@ -939,13 +939,10 @@ sfxge_rx_qstart(struct sfxge_softc *sc, unsigned int index)
void void
sfxge_rx_stop(struct sfxge_softc *sc) sfxge_rx_stop(struct sfxge_softc *sc)
{ {
struct sfxge_intr *intr;
int index; int index;
intr = &sc->intr;
/* Stop the receive queue(s) */ /* Stop the receive queue(s) */
index = intr->n_alloc; index = sc->rxq_count;
while (--index >= 0) while (--index >= 0)
sfxge_rx_qstop(sc, index); sfxge_rx_qstop(sc, index);
@ -987,7 +984,7 @@ sfxge_rx_start(struct sfxge_softc *sc)
* Set up the scale table. Enable all hash types and hash insertion. * Set up the scale table. Enable all hash types and hash insertion.
*/ */
for (index = 0; index < SFXGE_RX_SCALE_MAX; index++) for (index = 0; index < SFXGE_RX_SCALE_MAX; index++)
sc->rx_indir_table[index] = index % sc->intr.n_alloc; sc->rx_indir_table[index] = index % sc->rxq_count;
if ((rc = efx_rx_scale_tbl_set(sc->enp, sc->rx_indir_table, if ((rc = efx_rx_scale_tbl_set(sc->enp, sc->rx_indir_table,
SFXGE_RX_SCALE_MAX)) != 0) SFXGE_RX_SCALE_MAX)) != 0)
goto fail; goto fail;
@ -1000,7 +997,7 @@ sfxge_rx_start(struct sfxge_softc *sc)
goto fail; goto fail;
/* Start the receive queue(s). */ /* Start the receive queue(s). */
for (index = 0; index < intr->n_alloc; index++) { for (index = 0; index < sc->rxq_count; index++) {
if ((rc = sfxge_rx_qstart(sc, index)) != 0) if ((rc = sfxge_rx_qstart(sc, index)) != 0)
goto fail2; goto fail2;
} }
@ -1099,7 +1096,7 @@ sfxge_rx_qinit(struct sfxge_softc *sc, unsigned int index)
efsys_mem_t *esmp; efsys_mem_t *esmp;
int rc; int rc;
KASSERT(index < sc->intr.n_alloc, ("index >= %d", sc->intr.n_alloc)); KASSERT(index < sc->rxq_count, ("index >= %d", sc->rxq_count));
rxq = malloc(sizeof(struct sfxge_rxq), M_SFXGE, M_ZERO | M_WAITOK); rxq = malloc(sizeof(struct sfxge_rxq), M_SFXGE, M_ZERO | M_WAITOK);
rxq->sc = sc; rxq->sc = sc;
@ -1159,7 +1156,7 @@ sfxge_rx_stat_handler(SYSCTL_HANDLER_ARGS)
/* Sum across all RX queues */ /* Sum across all RX queues */
sum = 0; sum = 0;
for (index = 0; index < sc->intr.n_alloc; index++) for (index = 0; index < sc->rxq_count; index++)
sum += *(unsigned int *)((caddr_t)sc->rxq[index] + sum += *(unsigned int *)((caddr_t)sc->rxq[index] +
sfxge_rx_stats[id].offset); sfxge_rx_stats[id].offset);
@ -1190,14 +1187,13 @@ sfxge_rx_stat_init(struct sfxge_softc *sc)
void void
sfxge_rx_fini(struct sfxge_softc *sc) sfxge_rx_fini(struct sfxge_softc *sc)
{ {
struct sfxge_intr *intr;
int index; int index;
intr = &sc->intr; index = sc->rxq_count;
index = intr->n_alloc;
while (--index >= 0) while (--index >= 0)
sfxge_rx_qfini(sc, index); sfxge_rx_qfini(sc, index);
sc->rxq_count = 0;
} }
int int
@ -1212,11 +1208,13 @@ sfxge_rx_init(struct sfxge_softc *sc)
intr = &sc->intr; intr = &sc->intr;
sc->rxq_count = intr->n_alloc;
KASSERT(intr->state == SFXGE_INTR_INITIALIZED, KASSERT(intr->state == SFXGE_INTR_INITIALIZED,
("intr->state != SFXGE_INTR_INITIALIZED")); ("intr->state != SFXGE_INTR_INITIALIZED"));
/* Initialize the receive queue(s) - one per interrupt. */ /* Initialize the receive queue(s) - one per interrupt. */
for (index = 0; index < intr->n_alloc; index++) { for (index = 0; index < sc->rxq_count; index++) {
if ((rc = sfxge_rx_qinit(sc, index)) != 0) if ((rc = sfxge_rx_qinit(sc, index)) != 0)
goto fail; goto fail;
} }
@ -1230,5 +1228,6 @@ sfxge_rx_init(struct sfxge_softc *sc)
while (--index >= 0) while (--index >= 0)
sfxge_rx_qfini(sc, index); sfxge_rx_qfini(sc, index);
sc->rxq_count = 0;
return (rc); return (rc);
} }