From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4DC99A0350; Mon, 22 Jun 2020 09:17:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 69B751D614; Mon, 22 Jun 2020 09:07:22 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id F16301D608 for ; Mon, 22 Jun 2020 09:07:18 +0200 (CEST) IronPort-SDR: rhAKrJp0vbMva111ItNn+xR62Vv/Lx8p7QMMgTsAnsGKfwWVttyjR6G8JYqFzvmyisL3Kfr3HC QCF4hdViQdjA== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="131070894" X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="131070894" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 00:07:18 -0700 IronPort-SDR: 2FoIzxtHLH8c90mT8u/uKJ8pMFZBoe83j/65HSVIkRI/kaRuNS7kw7PQeyyK4R3+P7KWMxpyTl eNVuY0rCux3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="384409281" Received: from dpdk.sh.intel.com ([10.239.255.83]) by fmsmga001.fm.intel.com with ESMTP; 22 Jun 2020 00:07:17 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Jeff Guo , Zhao1 Wei , Guinan Sun , Sasha Neftin Date: Mon, 22 Jun 2020 06:46:27 +0000 Message-Id: <20200622064634.70941-64-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622064634.70941-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH 63/70] net/e1000/base: modify VLAN names X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix defines macro to be align with upstream. Signed-off-by: Sasha Neftin Signed-off-by: Guinan Sun --- drivers/net/e1000/base/e1000_defines.h | 3 +++ drivers/net/e1000/base/e1000_regs.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h index bcd7a1008..9302e5ed6 100644 --- a/drivers/net/e1000/base/e1000_defines.h +++ b/drivers/net/e1000/base/e1000_defines.h @@ -1524,6 +1524,9 @@ #define E1000_MAX_MAC_HDR_LEN 127 #define E1000_MAX_NETWORK_HDR_LEN 511 +#define E1000_VLANPQF_QSEL(_n, q_idx) ((q_idx) << ((_n) * 4)) +#define E1000_VLANPQF_VALID(_n) (0x1 << (3 + (_n) * 4)) +#define E1000_VLANPQF_QUEUE_MASK 0x03 #define E1000_VFTA_BLOCK_SIZE 8 /* SerDes Control */ #define E1000_GEN_CTL_READY 0x80000000 diff --git a/drivers/net/e1000/base/e1000_regs.h b/drivers/net/e1000/base/e1000_regs.h index 9262d7fac..b0f9ff487 100644 --- a/drivers/net/e1000/base/e1000_regs.h +++ b/drivers/net/e1000/base/e1000_regs.h @@ -271,6 +271,8 @@ (0x054E0 + ((_i - 16) * 8))) #define E1000_RAH(_i) (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \ (0x054E4 + ((_i - 16) * 8))) +#define E1000_VLANPQF 0x055B0 /* VLAN Priority Queue Filter VLAPQF */ + #define E1000_SHRAL(_i) (0x05438 + ((_i) * 8)) #define E1000_SHRAH(_i) (0x0543C + ((_i) * 8)) #define E1000_IP4AT_REG(_i) (0x05840 + ((_i) * 8)) -- 2.17.1