Page MenuHomeFreeBSD
Files F157157850

D18389.id.diff
No OneTemporary
Actions

D18389.id.diff
View Options

Index: head/sys/dev/sfxge/sfxge.c
===================================================================
--- head/sys/dev/sfxge/sfxge.c
+++ head/sys/dev/sfxge/sfxge.c
@@ -151,8 +151,8 @@
limits.edl_min_evq_count = 1;
limits.edl_max_evq_count = evq_max;
- limits.edl_min_txq_count = SFXGE_TXQ_NTYPES;
- limits.edl_max_txq_count = evq_max + SFXGE_TXQ_NTYPES - 1;
+ limits.edl_min_txq_count = SFXGE_EVQ0_N_TXQ(sc);
+ limits.edl_max_txq_count = evq_max + SFXGE_EVQ0_N_TXQ(sc) - 1;
limits.edl_min_rxq_count = 1;
limits.edl_max_rxq_count = evq_max;
@@ -168,12 +168,12 @@
return (rc);
}
- KASSERT(txq_allocated >= SFXGE_TXQ_NTYPES,
- ("txq_allocated < SFXGE_TXQ_NTYPES"));
+ KASSERT(txq_allocated >= SFXGE_EVQ0_N_TXQ(sc),
+ ("txq_allocated < %u", SFXGE_EVQ0_N_TXQ(sc)));
sc->evq_max = MIN(evq_allocated, evq_max);
sc->evq_max = MIN(rxq_allocated, sc->evq_max);
- sc->evq_max = MIN(txq_allocated - (SFXGE_TXQ_NTYPES - 1),
+ sc->evq_max = MIN(txq_allocated - (SFXGE_EVQ0_N_TXQ(sc) - 1),
sc->evq_max);
KASSERT(sc->evq_max <= evq_max,
@@ -205,7 +205,7 @@
limits.edl_min_evq_count = limits.edl_max_evq_count =
sc->intr.n_alloc;
limits.edl_min_txq_count = limits.edl_max_txq_count =
- sc->intr.n_alloc + SFXGE_TXQ_NTYPES - 1;
+ sc->intr.n_alloc + SFXGE_EVQ0_N_TXQ(sc) - 1;
limits.edl_min_rxq_count = limits.edl_max_rxq_count =
sc->intr.n_alloc;
Index: head/sys/dev/sfxge/sfxge_ev.c
===================================================================
--- head/sys/dev/sfxge/sfxge_ev.c
+++ head/sys/dev/sfxge/sfxge_ev.c
@@ -269,9 +269,10 @@
{
unsigned int index;
- KASSERT((evq->index == 0 && label < SFXGE_TXQ_NTYPES) ||
+ KASSERT((evq->index == 0 && label < SFXGE_EVQ0_N_TXQ(evq->sc)) ||
(label == SFXGE_TXQ_IP_TCP_UDP_CKSUM), ("unexpected txq label"));
- index = (evq->index == 0) ? label : (evq->index - 1 + SFXGE_TXQ_NTYPES);
+ index = (evq->index == 0) ?
+ label : (evq->index - 1 + SFXGE_EVQ0_N_TXQ(evq->sc));
return (evq->sc->txq[index]);
}
Index: head/sys/dev/sfxge/sfxge_tx.h
===================================================================
--- head/sys/dev/sfxge/sfxge_tx.h
+++ head/sys/dev/sfxge/sfxge_tx.h
@@ -139,6 +139,8 @@
SFXGE_TXQ_NTYPES
};
+#define SFXGE_EVQ0_N_TXQ(_sc) SFXGE_TXQ_NTYPES
+
#define SFXGE_TXQ_UNBLOCK_LEVEL(_entries) (EFX_TXQ_LIMIT(_entries) / 4)
#define SFXGE_TX_BATCH 64
Index: head/sys/dev/sfxge/sfxge_tx.c
===================================================================
--- head/sys/dev/sfxge/sfxge_tx.c
+++ head/sys/dev/sfxge/sfxge_tx.c
@@ -1973,7 +1973,7 @@
goto fail_tx_dpl_put_max;
}
- sc->txq_count = SFXGE_TXQ_NTYPES - 1 + sc->intr.n_alloc;
+ sc->txq_count = SFXGE_EVQ0_N_TXQ(sc) - 1 + sc->intr.n_alloc;
sc->tso_fw_assisted = sfxge_tso_fw_assisted;
if ((~encp->enc_features & EFX_FEATURE_FW_ASSISTED_TSO) ||
@@ -2002,9 +2002,9 @@
goto fail2;
for (index = 0;
- index < sc->txq_count - SFXGE_TXQ_NTYPES + 1;
+ index < sc->txq_count - SFXGE_EVQ0_N_TXQ(sc) + 1;
index++) {
- if ((rc = sfxge_tx_qinit(sc, SFXGE_TXQ_NTYPES - 1 + index,
+ if ((rc = sfxge_tx_qinit(sc, SFXGE_EVQ0_N_TXQ(sc) - 1 + index,
SFXGE_TXQ_IP_TCP_UDP_CKSUM, index)) != 0)
goto fail3;
}

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 9:09 PM (18 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33328304
Default Alt Text
D18389.id.diff (3 KB)

Event Timeline