Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/51616/?format=api
http://patches.dpdk.org/api/patches/51616/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190325090102.85918-3-qiming.yang@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190325090102.85918-3-qiming.yang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190325090102.85918-3-qiming.yang@intel.com", "date": "2019-03-25T09:01:01", "name": "[v6,2/3] net/ice: add safe mode", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "60dbe08d3805e010fcc1b47f95c0ced719ab9aa2", "submitter": { "id": 522, "url": "http://patches.dpdk.org/api/people/522/?format=api", "name": "Qiming Yang", "email": "qiming.yang@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190325090102.85918-3-qiming.yang@intel.com/mbox/", "series": [ { "id": 3890, "url": "http://patches.dpdk.org/api/series/3890/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3890", "date": "2019-03-25T09:00:59", "name": "enable package download in ice driver", "version": 6, "mbox": "http://patches.dpdk.org/series/3890/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/51616/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/51616/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 50BA44C99;\n\tMon, 25 Mar 2019 10:01:21 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 0FE84378E\n\tfor <dev@dpdk.org>; Mon, 25 Mar 2019 10:01:07 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Mar 2019 02:01:07 -0700", "from dpdk-qiming2.sh.intel.com ([10.67.119.132])\n\tby orsmga004.jf.intel.com with ESMTP; 25 Mar 2019 02:01:08 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,256,1549958400\"; d=\"scan'208\";a=\"285623008\"", "From": "Qiming Yang <qiming.yang@intel.com>", "To": "dev@dpdk.org", "Cc": "qi.z.zhang@intel.com,\n\tQiming Yang <qiming.yang@intel.com>", "Date": "Mon, 25 Mar 2019 17:01:01 +0800", "Message-Id": "<20190325090102.85918-3-qiming.yang@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20190325090102.85918-1-qiming.yang@intel.com>", "References": "<20190321150232.13536-2-qiming.yang@intel.com>\n\t<20190325090102.85918-1-qiming.yang@intel.com>", "Subject": "[dpdk-dev] [PATCH v6 2/3] net/ice: add safe mode", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "If E810 download package failed, driver need to go to safe mode.\nIn the safe mode, some advanced features will not be supported.\n\nSigned-off-by: Qiming Yang <qiming.yang@intel.com>\n---\n doc/guides/rel_notes/release_19_05.rst | 2 +-\n drivers/net/ice/ice_ethdev.c | 48 ++++++++++++++++++++++------------\n drivers/net/ice/ice_ethdev.h | 1 +\n 3 files changed, 34 insertions(+), 17 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst\nindex b73938a..c9267a2 100644\n--- a/doc/guides/rel_notes/release_19_05.rst\n+++ b/doc/guides/rel_notes/release_19_05.rst\n@@ -94,7 +94,7 @@ New Features\n * **Updated the ice driver.**\n \n * Added package download support.\n-\n+ * Added Safe Mode support.\n \n Removed Items\n -------------\ndiff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex c2a03c3..db4c115 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -1336,6 +1336,8 @@ ice_dev_init(struct rte_eth_dev *dev)\n \tstruct rte_intr_handle *intr_handle;\n \tstruct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_adapter *ad =\n+\t\tICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n \tstruct ice_vsi *vsi;\n \tint ret;\n \n@@ -1370,8 +1372,9 @@ ice_dev_init(struct rte_eth_dev *dev)\n \n \tret = ice_load_pkg(dev);\n \tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to load the DDP package\");\n-\t\tgoto err_load_pkg;\n+\t\tPMD_INIT_LOG(WARNING, \"Failed to load the DDP package,\"\n+\t\t\t\t\"Entering Safe Mode\");\n+\t\tad->is_safe_mode = 1;\n \t}\n \n \tPMD_INIT_LOG(INFO, \"FW %d.%d.%05d API %d.%d\",\n@@ -1419,7 +1422,6 @@ ice_dev_init(struct rte_eth_dev *dev)\n err_msix_pool_init:\n \trte_free(dev->data->mac_addrs);\n err_init_mac:\n-err_load_pkg:\n \tice_sched_cleanup_all(hw);\n \trte_free(hw->port_info);\n \tice_shutdown_all_ctrlq(hw);\n@@ -1589,12 +1591,18 @@ static int ice_init_rss(struct ice_pf *pf)\n \tstruct ice_aqc_get_set_rss_keys key;\n \tuint16_t i, nb_q;\n \tint ret = 0;\n+\tbool is_safe_mode = pf->adapter->is_safe_mode;\n \n \trss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;\n \tnb_q = dev->data->nb_rx_queues;\n \tvsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;\n \tvsi->rss_lut_size = hw->func_caps.common_cap.rss_table_size;\n \n+\tif (is_safe_mode) {\n+\t\tPMD_DRV_LOG(WARNING, \"RSS is not supported in safe mode\\n\");\n+\t\treturn 0;\n+\t}\n+\n \tif (!vsi->rss_key)\n \t\tvsi->rss_key = rte_zmalloc(NULL,\n \t\t\t\t\t vsi->rss_key_size, 0);\n@@ -1898,6 +1906,7 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tstruct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct ice_vsi *vsi = pf->main_vsi;\n \tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);\n+\tbool is_safe_mode = pf->adapter->is_safe_mode;\n \n \tdev_info->min_rx_bufsize = ICE_BUF_SIZE_MIN;\n \tdev_info->max_rx_pktlen = ICE_FRAME_SIZE_MAX;\n@@ -1908,33 +1917,40 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \n \tdev_info->rx_offload_capa =\n \t\tDEV_RX_OFFLOAD_VLAN_STRIP |\n-\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n-\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_VLAN_EXTEND |\n \t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n \t\tDEV_RX_OFFLOAD_KEEP_CRC |\n \t\tDEV_RX_OFFLOAD_SCATTER |\n \t\tDEV_RX_OFFLOAD_VLAN_FILTER;\n \tdev_info->tx_offload_capa =\n \t\tDEV_TX_OFFLOAD_VLAN_INSERT |\n-\t\tDEV_TX_OFFLOAD_QINQ_INSERT |\n-\t\tDEV_TX_OFFLOAD_IPV4_CKSUM |\n-\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n-\t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n-\t\tDEV_TX_OFFLOAD_SCTP_CKSUM |\n-\t\tDEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |\n \t\tDEV_TX_OFFLOAD_TCP_TSO |\n \t\tDEV_TX_OFFLOAD_MULTI_SEGS |\n \t\tDEV_TX_OFFLOAD_MBUF_FAST_FREE;\n+\tdev_info->flow_type_rss_offloads = 0;\n+\n+\tif (!is_safe_mode) {\n+\t\tdev_info->rx_offload_capa |=\n+\t\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n+\t\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n+\t\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n+\t\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n+\t\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n+\t\t\tDEV_RX_OFFLOAD_VLAN_EXTEND;\n+\t\tdev_info->tx_offload_capa |=\n+\t\t\tDEV_TX_OFFLOAD_QINQ_INSERT |\n+\t\t\tDEV_TX_OFFLOAD_IPV4_CKSUM |\n+\t\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n+\t\t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n+\t\t\tDEV_TX_OFFLOAD_SCTP_CKSUM |\n+\t\t\tDEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;\n+\t\tdev_info->flow_type_rss_offloads |= ICE_RSS_OFFLOAD_ALL;\n+\t}\n+\n \tdev_info->rx_queue_offload_capa = 0;\n \tdev_info->tx_queue_offload_capa = 0;\n \n \tdev_info->reta_size = hw->func_caps.common_cap.rss_table_size;\n \tdev_info->hash_key_size = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);\n-\tdev_info->flow_type_rss_offloads = ICE_RSS_OFFLOAD_ALL;\n \n \tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n \t\t.rx_thresh = {\ndiff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h\nindex 3cefa5b..b1f1f79 100644\n--- a/drivers/net/ice/ice_ethdev.h\n+++ b/drivers/net/ice/ice_ethdev.h\n@@ -264,6 +264,7 @@ struct ice_adapter {\n \tbool tx_simple_allowed;\n \t/* ptype mapping table */\n \tuint32_t ptype_tbl[ICE_MAX_PKT_TYPE] __rte_cache_min_aligned;\n+\tbool is_safe_mode;\n };\n \n struct ice_vsi_vlan_pvid_info {\n", "prefixes": [ "v6", "2/3" ] }{ "id": 51616, "url": "