From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <beileixi@shecgisg004.sh.intel.com>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by dpdk.org (Postfix) with ESMTP id 87043C4E0
for <dev@dpdk.org>; Thu, 16 Jun 2016 05:15:38 +0200 (CEST)
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by fmsmga102.fm.intel.com with ESMTP; 15 Jun 2016 20:15:37 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.26,478,1459839600"; d="scan'208";a="976709214"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
by orsmga001.jf.intel.com with ESMTP; 15 Jun 2016 20:15:36 -0700
Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com
[10.239.29.89])
by shvmail01.sh.intel.com with ESMTP id u5G3FY3p008190;
Thu, 16 Jun 2016 11:15:34 +0800
Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1])
by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
u5G3FVwr011055; Thu, 16 Jun 2016 11:15:33 +0800
Received: (from beileixi@localhost)
by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u5G3FVnG011051;
Thu, 16 Jun 2016 11:15:31 +0800
From: Beilei Xing <beilei.xing@intel.com>
To: wenzhuo.lu@intel.com
Cc: dev@dpdk.org, Beilei Xing <beilei.xing@intel.com>
Date: Thu, 16 Jun 2016 11:15:30 +0800
Message-Id: <1466046930-11021-1-git-send-email-beilei.xing@intel.com>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <1464922755-2888-1-git-send-email-beilei.xing@intel.com>
References: <1464922755-2888-1-git-send-email-beilei.xing@intel.com>
Subject: [dpdk-dev] [PATCH v3] e1000: configure VLAN TPID
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: Thu, 16 Jun 2016 03:15:38 -0000
This patch enables configuring the outer TPID for double VLAN.
Note that outer TPID of single VLAN and inner TPID of double VLAN
are read only.
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
v3 changes:
Update commit log and comments.
drivers/net/e1000/igb_ethdev.c | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index f0921ee..1a5f1f1 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -86,6 +86,13 @@
#define E1000_INCVALUE_82576 (16 << IGB_82576_TSYNC_SHIFT)
#define E1000_TSAUXC_DISABLE_SYSTIME 0x80000000
+/* External VLAN Enable bit mask */
+#define E1000_CTRL_EXT_EXT_VLAN (1 << 26)
+
+/* External VLAN Ether Type bit mask and shift */
+#define E1000_VET_VET_EXT 0xFFFF0000
+#define E1000_VET_VET_EXT_SHIFT 16
+
static int eth_igb_configure(struct rte_eth_dev *dev);
static int eth_igb_start(struct rte_eth_dev *dev);
static void eth_igb_stop(struct rte_eth_dev *dev);
@@ -2237,13 +2244,37 @@ eth_igb_vlan_tpid_set(struct rte_eth_dev *dev,
{
struct e1000_hw *hw =
E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint32_t reg = ETHER_TYPE_VLAN;
+ uint32_t reg;
+ uint32_t qinq;
int ret = 0;
+ qinq = E1000_READ_REG(hw, E1000_CTRL_EXT);
+ qinq &= E1000_CTRL_EXT_EXT_VLAN;
+
switch (vlan_type) {
case ETH_VLAN_TYPE_INNER:
- reg |= (tpid << 16);
- E1000_WRITE_REG(hw, E1000_VET, reg);
+ if (qinq) {
+ ret = -ENOTSUP;
+ PMD_DRV_LOG(WARNING,
+ "Inner vlan ether type is read-only\n");
+ } else {
+ ret = -ENOTSUP;
+ PMD_DRV_LOG(ERR, "Inner type is not supported"
+ " by single vlan\n");
+ }
+ break;
+ case ETH_VLAN_TYPE_OUTER:
+ if (qinq) {
+ reg = E1000_READ_REG(hw, E1000_VET);
+ reg = (reg & (~E1000_VET_VET_EXT)) |
+ ((uint32_t)tpid << E1000_VET_VET_EXT_SHIFT);
+ E1000_WRITE_REG(hw, E1000_VET, reg);
+ } else {
+ ret = -ENOTSUP;
+ PMD_DRV_LOG(WARNING,
+ "Single vlan ether type is read-only\n");
+ }
+
break;
default:
ret = -EINVAL;
--
2.5.0