Skip to content
Browse files

MFC r256477:

cxgbe(4): Store the log2 of the # of doorbells per BAR2 page for both
ingress and egress queues, and for both T4 and T5.  These values are
used by the T4/T5 iWARP driver.

Approved by:	re (glebius)
  • Loading branch information...
1 parent 6de0bde commit b36ea7524500e7b946ee61a3d580644d0e9320cd np committed Oct 20, 2013
Showing with 14 additions and 8 deletions.
  1. +2 −1 sys/dev/cxgbe/adapter.h
  2. +12 −7 sys/dev/cxgbe/t4_sge.c
View
3 sys/dev/cxgbe/adapter.h
@@ -510,7 +510,8 @@ struct sge {
int timer_val[SGE_NTIMERS];
int counter_val[SGE_NCOUNTERS];
int fl_starve_threshold;
- int s_qpp;
+ int eq_s_qpp;
+ int iq_s_qpp;
int nrxq; /* total # of Ethernet rx queues */
int ntxq; /* total # of Ethernet tx tx queues */
View
19 sys/dev/cxgbe/t4_sge.c
@@ -569,12 +569,17 @@ t4_read_chip_settings(struct adapter *sc)
r = t4_read_reg(sc, A_SGE_CONM_CTRL);
s->fl_starve_threshold = G_EGRTHRESHOLD(r) * 2 + 1;
- if (is_t5(sc)) {
- r = t4_read_reg(sc, A_SGE_EGRESS_QUEUES_PER_PAGE_PF);
- r >>= S_QUEUESPERPAGEPF0 +
- (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
- s->s_qpp = r & M_QUEUESPERPAGEPF0;
- }
+ /* egress queues: log2 of # of doorbells per BAR2 page */
+ r = t4_read_reg(sc, A_SGE_EGRESS_QUEUES_PER_PAGE_PF);
+ r >>= S_QUEUESPERPAGEPF0 +
+ (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
+ s->eq_s_qpp = r & M_QUEUESPERPAGEPF0;
+
+ /* ingress queues: log2 of # of doorbells per BAR2 page */
+ r = t4_read_reg(sc, A_SGE_INGRESS_QUEUES_PER_PAGE_PF);
+ r >>= S_QUEUESPERPAGEPF0 +
+ (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
+ s->iq_s_qpp = r & M_QUEUESPERPAGEPF0;
t4_init_tp_params(sc);
@@ -2799,7 +2804,7 @@ alloc_eq(struct adapter *sc, struct port_info *pi, struct sge_eq *eq)
if (isset(&eq->doorbells, DOORBELL_UDB) ||
isset(&eq->doorbells, DOORBELL_UDBWC) ||
isset(&eq->doorbells, DOORBELL_WCWR)) {
- uint32_t s_qpp = sc->sge.s_qpp;
+ uint32_t s_qpp = sc->sge.eq_s_qpp;
uint32_t mask = (1 << s_qpp) - 1;
volatile uint8_t *udb;

0 comments on commit b36ea75

Please sign in to comment.
Something went wrong with that request. Please try again.