|
@@ -920,7 +920,7 @@ static void quiesce_rx(struct adapter *adap)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(adap->sge.ingr_map); i++) {
|
|
|
+ for (i = 0; i < adap->sge.ingr_sz; i++) {
|
|
|
struct sge_rspq *q = adap->sge.ingr_map[i];
|
|
|
|
|
|
if (q && q->handler) {
|
|
@@ -941,7 +941,7 @@ static void enable_rx(struct adapter *adap)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(adap->sge.ingr_map); i++) {
|
|
|
+ for (i = 0; i < adap->sge.ingr_sz; i++) {
|
|
|
struct sge_rspq *q = adap->sge.ingr_map[i];
|
|
|
|
|
|
if (!q)
|
|
@@ -970,8 +970,8 @@ static int setup_sge_queues(struct adapter *adap)
|
|
|
int err, msi_idx, i, j;
|
|
|
struct sge *s = &adap->sge;
|
|
|
|
|
|
- bitmap_zero(s->starving_fl, MAX_EGRQ);
|
|
|
- bitmap_zero(s->txq_maperr, MAX_EGRQ);
|
|
|
+ bitmap_zero(s->starving_fl, s->egr_sz);
|
|
|
+ bitmap_zero(s->txq_maperr, s->egr_sz);
|
|
|
|
|
|
if (adap->flags & USING_MSIX)
|
|
|
msi_idx = 1; /* vector 0 is for non-queue interrupts */
|
|
@@ -983,6 +983,19 @@ static int setup_sge_queues(struct adapter *adap)
|
|
|
msi_idx = -((int)s->intrq.abs_id + 1);
|
|
|
}
|
|
|
|
|
|
+ /* NOTE: If you add/delete any Ingress/Egress Queue allocations in here,
|
|
|
+ * don't forget to update the following which need to be
|
|
|
+ * synchronized to and changes here.
|
|
|
+ *
|
|
|
+ * 1. The calculations of MAX_INGQ in cxgb4.h.
|
|
|
+ *
|
|
|
+ * 2. Update enable_msix/name_msix_vecs/request_msix_queue_irqs
|
|
|
+ * to accommodate any new/deleted Ingress Queues
|
|
|
+ * which need MSI-X Vectors.
|
|
|
+ *
|
|
|
+ * 3. Update sge_qinfo_show() to include information on the
|
|
|
+ * new/deleted queues.
|
|
|
+ */
|
|
|
err = t4_sge_alloc_rxq(adap, &s->fw_evtq, true, adap->port[0],
|
|
|
msi_idx, NULL, fwevtq_handler);
|
|
|
if (err) {
|
|
@@ -4733,8 +4746,9 @@ static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c)
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
- ret = t4_cfg_pfvf(adap, adap->fn, adap->fn, 0, MAX_EGRQ, 64, MAX_INGQ,
|
|
|
- 0, 0, 4, 0xf, 0xf, 16, FW_CMD_CAP_PF, FW_CMD_CAP_PF);
|
|
|
+ ret = t4_cfg_pfvf(adap, adap->fn, adap->fn, 0, adap->sge.egr_sz, 64,
|
|
|
+ MAX_INGQ, 0, 0, 4, 0xf, 0xf, 16, FW_CMD_CAP_PF,
|
|
|
+ FW_CMD_CAP_PF);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
@@ -5293,6 +5307,51 @@ static int adap_init0(struct adapter *adap)
|
|
|
adap->tids.nftids = val[4] - val[3] + 1;
|
|
|
adap->sge.ingr_start = val[5];
|
|
|
|
|
|
+ /* qids (ingress/egress) returned from firmware can be anywhere
|
|
|
+ * in the range from EQ(IQFLINT)_START to EQ(IQFLINT)_END.
|
|
|
+ * Hence driver needs to allocate memory for this range to
|
|
|
+ * store the queue info. Get the highest IQFLINT/EQ index returned
|
|
|
+ * in FW_EQ_*_CMD.alloc command.
|
|
|
+ */
|
|
|
+ params[0] = FW_PARAM_PFVF(EQ_END);
|
|
|
+ params[1] = FW_PARAM_PFVF(IQFLINT_END);
|
|
|
+ ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params, val);
|
|
|
+ if (ret < 0)
|
|
|
+ goto bye;
|
|
|
+ adap->sge.egr_sz = val[0] - adap->sge.egr_start + 1;
|
|
|
+ adap->sge.ingr_sz = val[1] - adap->sge.ingr_start + 1;
|
|
|
+
|
|
|
+ adap->sge.egr_map = kcalloc(adap->sge.egr_sz,
|
|
|
+ sizeof(*adap->sge.egr_map), GFP_KERNEL);
|
|
|
+ if (!adap->sge.egr_map) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto bye;
|
|
|
+ }
|
|
|
+
|
|
|
+ adap->sge.ingr_map = kcalloc(adap->sge.ingr_sz,
|
|
|
+ sizeof(*adap->sge.ingr_map), GFP_KERNEL);
|
|
|
+ if (!adap->sge.ingr_map) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto bye;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Allocate the memory for the vaious egress queue bitmaps
|
|
|
+ * ie starving_fl and txq_maperr.
|
|
|
+ */
|
|
|
+ adap->sge.starving_fl = kcalloc(BITS_TO_LONGS(adap->sge.egr_sz),
|
|
|
+ sizeof(long), GFP_KERNEL);
|
|
|
+ if (!adap->sge.starving_fl) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto bye;
|
|
|
+ }
|
|
|
+
|
|
|
+ adap->sge.txq_maperr = kcalloc(BITS_TO_LONGS(adap->sge.egr_sz),
|
|
|
+ sizeof(long), GFP_KERNEL);
|
|
|
+ if (!adap->sge.txq_maperr) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto bye;
|
|
|
+ }
|
|
|
+
|
|
|
params[0] = FW_PARAM_PFVF(CLIP_START);
|
|
|
params[1] = FW_PARAM_PFVF(CLIP_END);
|
|
|
ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params, val);
|
|
@@ -5501,6 +5560,10 @@ static int adap_init0(struct adapter *adap)
|
|
|
* happened to HW/FW, stop issuing commands.
|
|
|
*/
|
|
|
bye:
|
|
|
+ kfree(adap->sge.egr_map);
|
|
|
+ kfree(adap->sge.ingr_map);
|
|
|
+ kfree(adap->sge.starving_fl);
|
|
|
+ kfree(adap->sge.txq_maperr);
|
|
|
if (ret != -ETIMEDOUT && ret != -EIO)
|
|
|
t4_fw_bye(adap, adap->mbox);
|
|
|
return ret;
|
|
@@ -5912,6 +5975,10 @@ static void free_some_resources(struct adapter *adapter)
|
|
|
|
|
|
t4_free_mem(adapter->l2t);
|
|
|
t4_free_mem(adapter->tids.tid_tab);
|
|
|
+ kfree(adapter->sge.egr_map);
|
|
|
+ kfree(adapter->sge.ingr_map);
|
|
|
+ kfree(adapter->sge.starving_fl);
|
|
|
+ kfree(adapter->sge.txq_maperr);
|
|
|
disable_msi(adapter);
|
|
|
|
|
|
for_each_port(adapter, i)
|