From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <neescoba@cisco.com>
Received: from alln-iport-7.cisco.com (alln-iport-7.cisco.com [173.37.142.94])
by dpdk.org (Postfix) with ESMTP id 6A7C2C666
for <dev@dpdk.org>; Sat, 25 Jun 2016 00:41:29 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=cisco.com; i=@cisco.com; l=2165; q=dns/txt; s=iport;
t=1466808089; x=1468017689;
h=from:to:cc:subject:date:message-id;
bh=5dpTAAkshpP+2YzwB84kaj8Z06muhBfBQWUwzYakjfU=;
b=jWFuVjlo0JnouXRJvpjHQT2FHLn3v7xLfSZ0SCOofxxm8LxlLsKv8fHU
+pMXKBq6t7K1X8asD0nH3A7EtnNt6YZndeIBdLuwSIPvXiY5PiOShd20a
R9M3da/CqLEMOHd9VbHSiA5JibKCJBXO47HFUxFK+gzW4RUBgrPi5n02I k=;
X-IronPort-AV: E=Sophos;i="5.26,523,1459814400"; d="scan'208";a="289717723"
Received: from alln-core-11.cisco.com ([173.36.13.133])
by alln-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA;
24 Jun 2016 22:41:28 +0000
Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48])
by alln-core-11.cisco.com (8.14.5/8.14.5) with ESMTP id u5OMfSfF030626;
Fri, 24 Jun 2016 22:41:28 GMT
Received: by cisco.com (Postfix, from userid 412739)
id 1589E3FAAE0D; Fri, 24 Jun 2016 15:41:28 -0700 (PDT)
From: Nelson Escobar <neescoba@cisco.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, Nelson Escobar <neescoba@cisco.com>
Date: Fri, 24 Jun 2016 15:39:57 -0700
Message-Id: <1466807997-21403-1-git-send-email-neescoba@cisco.com>
X-Mailer: git-send-email 2.7.0
Subject: [dpdk-dev] [PATCH] enic: fix issues when using Rx scatter with
multiple RQs
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jun 2016 22:41:29 -0000
The Rx scatter patch failed to make a few changes and resulted
in problems when using multiple RQs since the wrong RQ or CQ
was being used.
Fixes: 14a261bf0520 ("enic: add scattered Rx support")
Signed-off-by: Nelson Escobar <neescoba@cisco.com>
Reviewed-by: John Daley <johndale@cisco.com>
---
drivers/net/enic/enic.h | 2 +-
drivers/net/enic/enic_main.c | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index ed5f18d..15b1d45 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -174,7 +174,7 @@ static inline unsigned int enic_vnic_rq_count(struct enic *enic)
static inline unsigned int enic_cq_rq(__rte_unused struct enic *enic, unsigned int rq)
{
- return rq;
+ return rq / 2;
}
static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq)
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 15389e5..68dbe40 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -238,19 +238,20 @@ void enic_init_vnic_resources(struct enic *enic)
struct vnic_rq *data_rq;
for (index = 0; index < enic->rq_count; index++) {
+ cq_idx = enic_cq_rq(enic, enic_sop_rq(index));
+
vnic_rq_init(&enic->rq[enic_sop_rq(index)],
- enic_cq_rq(enic, index),
+ cq_idx,
error_interrupt_enable,
error_interrupt_offset);
data_rq = &enic->rq[enic_data_rq(index)];
if (data_rq->in_use)
vnic_rq_init(data_rq,
- enic_cq_rq(enic, index),
+ cq_idx,
error_interrupt_enable,
error_interrupt_offset);
- cq_idx = enic_cq_rq(enic, index);
vnic_cq_init(&enic->cq[cq_idx],
0 /* flow_control_enable */,
1 /* color_enable */,
@@ -899,7 +900,8 @@ static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)
return -ENOMEM;
for (i = 0; i < (1 << rss_hash_bits); i++)
- (*rss_cpu_buf_va).cpu[i/4].b[i%4] = i % enic->rq_count;
+ (*rss_cpu_buf_va).cpu[i / 4].b[i % 4] =
+ enic_sop_rq(i % enic->rq_count);
err = enic_set_rss_cpu(enic,
rss_cpu_buf_pa,
--
2.7.0