From patchwork Tue Jan 15 13:30:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 49842 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 62BFC2BDB; Tue, 15 Jan 2019 14:29:16 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 00DAF2BA5 for ; Tue, 15 Jan 2019 14:29:14 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jan 2019 05:29:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,481,1539673200"; d="scan'208";a="134775142" Received: from dpdk51.sh.intel.com ([10.67.110.190]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2019 05:29:12 -0800 From: Qi Zhang To: wenzhuo.lu@intel.com, qiming.yang@intel.com Cc: paul.m.stillwell.jr@intel.com, dev@dpdk.org, brian.johnson@intel.com, helin.zhang@intel.com, fred.zhang@intel.com, Qi Zhang Date: Tue, 15 Jan 2019 21:30:41 +0800 Message-Id: <20190115133041.17556-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [RFC] net/ice: enable package download and RSS 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" This is RFC for customer early eveluation. It depends on below patch set http://patchwork.dpdk.org/project/dpdk/list/?series=3189 package download mechanism is hard coded as: A file named "ice_os_default.pkg" at current directory will be downloaded by driver during init stage. Also RSS is enable for UPD/TCP/SCTP+IPV4/IPV6 flows. Signed-off-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index b145d9c64..3898be5ff 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2,9 +2,15 @@ * Copyright(c) 2018 Intel Corporation */ +#include +#include +#include +#include + #include #include "base/ice_sched.h" +#include "base/ice_flow.h" #include "ice_ethdev.h" #include "ice_rxtx.h" @@ -1251,6 +1257,63 @@ ice_pf_setup(struct ice_pf *pf) return 0; } +static int ice_load_pkg(struct ice_pf *pf) +{ + struct ice_hw *hw = ICE_PF_TO_HW(pf); + int err; + uint8_t *buf; + int buf_len; + FILE *file; + struct stat fstat; + + file = fopen("ice_os_default.pkg","rb"); + if (file == NULL) { + PMD_INIT_LOG(ERR, "failed to open file"); + return 0; + } + + err = stat("ice_os_default.pkg", &fstat); + if (err) { + PMD_INIT_LOG(ERR, "failed to get file stats"); + fclose(file); + return 0; + } + + buf_len = fstat.st_size; + printf("buf_len = %d\n", buf_len); + buf = rte_malloc(NULL, buf_len, 0); + + if (buf == NULL) { + PMD_INIT_LOG(ERR, "failed to allocate buf for package"); + fclose(file); + return 0; + } + + err = fread(buf, buf_len, 1, file); + if (err != 1) { + PMD_INIT_LOG(ERR, "failed to read package data"); + fclose(file); + return 0; + } + + fclose(file); + + err = ice_copy_and_init_pkg(hw, buf, buf_len); + if (err) { + PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n", + err); + return err; + } + + err = ice_init_hw_tbls(hw); + if (err) { + PMD_INIT_LOG(ERR, "ice_init_hw_tbls failed: %d\n", err); + return err; + } + + return 0; +} + static int ice_dev_init(struct rte_eth_dev *dev) { @@ -1314,6 +1377,11 @@ ice_dev_init(struct rte_eth_dev *dev) goto err_pf_setup; } + ret = ice_load_pkg(pf); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to load default OS package"); + } + vsi = pf->main_vsi; /* Disable double vlan by default */ @@ -1548,6 +1616,36 @@ static int ice_init_rss(struct ice_pf *pf) if (ret) return -EINVAL; + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV4, + ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV4); + if (ret) + PMD_DRV_LOG(ERR, "%s TCP_IPV4 rss flow fail %d",__func__, ret); + + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV4, + ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV4); + if (ret) + PMD_DRV_LOG(ERR, "%s UDP_IPV4 rss flow fail %d",__func__, ret); + + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_SCTP_IPV4, + ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV4); + if (ret) + PMD_DRV_LOG(ERR, "%s SCTP_IPV4 rss flow fail %d",__func__, ret); + + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV6, + ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV6); + if (ret) + PMD_DRV_LOG(ERR, "%s TCP_IPV6 rss flow fail %d",__func__, ret); + + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV6, + ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV6); + if (ret) + PMD_DRV_LOG(ERR, "%s UDP_IPV6 flow fail %d",__func__, ret); + + ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_SCTP_IPV6, + ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV6); + if (ret) + PMD_DRV_LOG(ERR, "%s SCTP_IPV6 rss flow fail %d",__func__, ret); + return 0; }