From patchwork Fri Aug 26 09:25:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Jia" X-Patchwork-Id: 15353 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1E5F658F7; Fri, 26 Aug 2016 11:21:17 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id CBE8A58D8 for ; Fri, 26 Aug 2016 11:21:12 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 26 Aug 2016 02:21:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,580,1464678000"; d="scan'208";a="753751123" Received: from dpdk3.sh.intel.com ([10.239.129.207]) by FMSMGA003.fm.intel.com with ESMTP; 26 Aug 2016 02:21:11 -0700 From: Jeff Guo To: helin.zhang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, jia.guo@intel.com Date: Fri, 26 Aug 2016 05:25:05 -0400 Message-Id: <1472203505-76527-2-git-send-email-jia.guo@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1472203505-76527-1-git-send-email-jia.guo@intel.com> References: <1472203505-76527-1-git-send-email-jia.guo@intel.com> Subject: [dpdk-dev] [PATCH] drivers/i40e: Add FD PCTYPE translation for x722 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Before the filter is programmed, the PCTYPE in the FD programming descriptor need to use GLQF_FD_PCTYPE table to translate into Second PCTYPE. Signed-off-by: Jeff Guo --- drivers/net/i40e/i40e_ethdev.c | 11 +++++++++++ drivers/net/i40e/i40e_fdir.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index aee8f40..7824704 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -7736,7 +7736,9 @@ i40e_hash_filter_inset_select(struct i40e_hw *hw, PMD_DRV_LOG(ERR, "invalid flow_type input."); return -EINVAL; } + pctype = i40e_flowtype_to_pctype(conf->flow_type); + ret = i40e_parse_input_set(&input_set, pctype, conf->field, conf->inset_size); if (ret) { @@ -7805,7 +7807,16 @@ i40e_fdir_filter_inset_select(struct i40e_pf *pf, PMD_DRV_LOG(ERR, "invalid flow_type input."); return -EINVAL; } + +#ifdef X722_SUPPORT + /* get translated pctype value in fd pctype register */ + pctype = i40e_read_rx_ctl(hw, + I40E_GLQF_FD_PCTYPES(i40e_flowtype_to_pctype( + conf->flow_type))); +#else pctype = i40e_flowtype_to_pctype(conf->flow_type); +#endif + ret = i40e_parse_input_set(&input_set, pctype, conf->field, conf->inset_size); if (ret) { diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index f65c411..d91df96 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -664,7 +664,14 @@ i40e_fdir_configure(struct rte_eth_dev *dev) i40e_set_flx_pld_cfg(pf, &conf->flex_set[i]); /* configure flex mask*/ for (i = 0; i < conf->nb_flexmasks; i++) { +#ifdef X722_SUPPORT + /* get translated pctype value in fd pctype register */ + pctype = i40e_read_rx_ctl(hw, + I40E_GLQF_FD_PCTYPES(i40e_flowtype_to_pctype( + conf->flex_mask[i].flow_type))); +#else pctype = i40e_flowtype_to_pctype(conf->flex_mask[i].flow_type); +#endif i40e_set_flex_mask_on_pctype(pf, pctype, &conf->flex_mask[i]); } @@ -1012,6 +1019,7 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, const struct rte_eth_fdir_filter *filter, bool add) { + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; enum i40e_filter_pctype pctype; @@ -1044,7 +1052,16 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, PMD_DRV_LOG(ERR, "construct packet for fdir fails."); return ret; } + +#ifdef X722_SUPPORT + /* get translated pctype value in fd pctype register */ + pctype = i40e_read_rx_ctl(hw, + I40E_GLQF_FD_PCTYPES(i40e_flowtype_to_pctype( + filter->input.flow_type))); +#else pctype = i40e_flowtype_to_pctype(filter->input.flow_type); +#endif + ret = i40e_fdir_filter_programming(pf, pctype, filter, add); if (ret < 0) { PMD_DRV_LOG(ERR, "fdir programming fails for PCTYPE(%u).",