Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1174144/?format=api
{ "id": 1174144, "url": "http://patchwork.ozlabs.org/api/patches/1174144/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191009140953.14087-5-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20191009140953.14087-5-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-10-09T14:09:43", "name": "[S31,05/15] ice: handle DCBx non-contiguous TC request", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "725323fcbc39348f928df64376eb7e9952ebd876", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191009140953.14087-5-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 135203, "url": "http://patchwork.ozlabs.org/api/series/135203/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=135203", "date": "2019-10-09T14:09:45", "name": "[S31,01/15] ice: implement set_eeprom functionality", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/135203/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1174144/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1174144/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 46pTgb3Fk1z9sNF\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 10 Oct 2019 09:40:11 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B4D8C8695F;\n\tWed, 9 Oct 2019 22:40:09 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5+73gFjGZMri; Wed, 9 Oct 2019 22:40:07 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3E3E6868CA;\n\tWed, 9 Oct 2019 22:40:07 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 14F5F1BF3CC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Oct 2019 22:40:03 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0D97C883B8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Oct 2019 22:40:03 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id kWtapFg-5z7H for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Oct 2019 22:40:01 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id AE0FD88390\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Oct 2019 22:40:01 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Oct 2019 15:40:00 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga003.jf.intel.com with ESMTP; 09 Oct 2019 15:40:00 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,277,1566889200\"; d=\"scan'208\";a=\"197052255\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 9 Oct 2019 07:09:43 -0700", "Message-Id": "<20191009140953.14087-5-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191009140953.14087-1-anthony.l.nguyen@intel.com>", "References": "<20191009140953.14087-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S31 05/15] ice: handle DCBx non-contiguous\n\tTC request", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Paul Greenwalt <paul.greenwalt@intel.com>\n\nIf DCBx request non-contiguous TCs, then the driver will configure default\ntraffic class (TC0). This is done to prevent Tx hang since the driver\ncurrently does not support non-contiguous TC.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 161 +++++++++++++------\n 1 file changed, 112 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex a308f9d2f74b..ba1573d29885 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -3,6 +3,8 @@\n \n #include \"ice_dcb_lib.h\"\n \n+static void ice_pf_dcb_recfg(struct ice_pf *pf);\n+\n /**\n * ice_vsi_cfg_netdev_tc - Setup the netdev TC configuration\n * @vsi: the VSI being configured\n@@ -137,52 +139,6 @@ void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi)\n \t}\n }\n \n-/**\n- * ice_pf_dcb_recfg - Reconfigure all VEBs and VSIs\n- * @pf: pointer to the PF struct\n- *\n- * Assumed caller has already disabled all VSIs before\n- * calling this function. Reconfiguring DCB based on\n- * local_dcbx_cfg.\n- */\n-static void ice_pf_dcb_recfg(struct ice_pf *pf)\n-{\n-\tstruct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->local_dcbx_cfg;\n-\tstruct iidc_event *event;\n-\tu8 tc_map = 0;\n-\tint v, ret;\n-\n-\t/* Update each VSI */\n-\tice_for_each_vsi(pf, v) {\n-\t\tif (!pf->vsi[v])\n-\t\t\tcontinue;\n-\n-\t\tif (pf->vsi[v]->type == ICE_VSI_PF)\n-\t\t\ttc_map = ice_dcb_get_ena_tc(dcbcfg);\n-\t\telse\n-\t\t\ttc_map = ICE_DFLT_TRAFFIC_CLASS;\n-\n-\t\tret = ice_vsi_cfg_tc(pf->vsi[v], tc_map);\n-\t\tif (ret) {\n-\t\t\tdev_err(&pf->pdev->dev,\n-\t\t\t\t\"Failed to config TC for VSI index: %d\\n\",\n-\t\t\t\tpf->vsi[v]->idx);\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tice_vsi_map_rings_to_vectors(pf->vsi[v]);\n-\t}\n-\tevent = kzalloc(sizeof(*event), GFP_KERNEL);\n-\tif (!event)\n-\t\treturn;\n-\n-\tset_bit(IIDC_EVENT_TC_CHANGE, event->type);\n-\tevent->reporter = NULL;\n-\tice_setup_dcb_qos_info(pf, &event->info.port_qos);\n-\tice_for_each_peer(pf, event, ice_peer_check_for_reg);\n-\tkfree(event);\n-}\n-\n /**\n * ice_peer_prep_tc_change - Pre-notify RDMA Peer in blocking call of TC change\n * @peer_dev_int: ptr to peer device internal struct\n@@ -471,9 +427,10 @@ static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked)\n /**\n * ice_dcb_sw_default_config - Apply a default DCB config\n * @pf: PF to apply config to\n+ * @ets_willing: configure ets willing\n * @locked: was this function called with RTNL held\n */\n-static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool locked)\n+static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked)\n {\n \tstruct ice_aqc_port_ets_elem buf = { 0 };\n \tstruct ice_dcbx_cfg *dcbcfg;\n@@ -488,7 +445,7 @@ static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool locked)\n \tmemset(dcbcfg, 0, sizeof(*dcbcfg));\n \tmemset(&pi->local_dcbx_cfg, 0, sizeof(*dcbcfg));\n \n-\tdcbcfg->etscfg.willing = 1;\n+\tdcbcfg->etscfg.willing = ets_willing ? 1 : 0;\n \tdcbcfg->etscfg.maxtcs = hw->func_caps.common_cap.maxtc;\n \tdcbcfg->etscfg.tcbwtable[0] = 100;\n \tdcbcfg->etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;\n@@ -513,6 +470,112 @@ static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool locked)\n \treturn ice_query_port_ets(pi, &buf, sizeof(buf), NULL);\n }\n \n+/**\n+ * ice_dcb_tc_contig - Check that TCs are contiguous\n+ * @prio_table: pointer to priority table\n+ *\n+ * Check if TCs begin with TC0 and are contiguous\n+ */\n+static bool ice_dcb_tc_contig(u8 *prio_table)\n+{\n+\tu8 max_tc = 0;\n+\tint i;\n+\n+\tfor (i = 0; i < CEE_DCBX_MAX_PRIO; i++) {\n+\t\tu8 cur_tc = prio_table[i];\n+\n+\t\tif (cur_tc > max_tc)\n+\t\t\treturn false;\n+\t\telse if (cur_tc == max_tc)\n+\t\t\tmax_tc++;\n+\t}\n+\n+\treturn true;\n+}\n+\n+/**\n+ * ice_dcb_noncontig_cfg - Configure DCB for non-contiguous TCs\n+ * @pf: pointer to the PF struct\n+ *\n+ * If non-contiguous TCs, then configure SW DCB with TC0 and ETS non-willing\n+ */\n+static int ice_dcb_noncontig_cfg(struct ice_pf *pf)\n+{\n+\tstruct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->local_dcbx_cfg;\n+\tint ret;\n+\n+\t/* Configure SW DCB default with ETS non-willing */\n+\tret = ice_dcb_sw_dflt_cfg(pf, false, true);\n+\tif (ret) {\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"Failed to set local DCB config %d\\n\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\t/* Reconfigure with ETS willing so that FW will send LLDP MIB event */\n+\tdcbcfg->etscfg.willing = 1;\n+\tret = ice_set_dcb_cfg(pf->hw.port_info);\n+\tif (ret)\n+\t\tdev_err(&pf->pdev->dev, \"Failed to set DCB to unwilling\\n\");\n+\n+\treturn ret;\n+}\n+\n+/**\n+ * ice_pf_dcb_recfg - Reconfigure all VEBs and VSIs\n+ * @pf: pointer to the PF struct\n+ *\n+ * Assumed caller has already disabled all VSIs before\n+ * calling this function. Reconfiguring DCB based on\n+ * local_dcbx_cfg.\n+ */\n+static void ice_pf_dcb_recfg(struct ice_pf *pf)\n+{\n+\tstruct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->local_dcbx_cfg;\n+\tstruct iidc_event *event;\n+\tu8 tc_map = 0;\n+\tint v, ret;\n+\n+\t/* Update each VSI */\n+\tice_for_each_vsi(pf, v) {\n+\t\tif (!pf->vsi[v])\n+\t\t\tcontinue;\n+\n+\t\tif (pf->vsi[v]->type == ICE_VSI_PF) {\n+\t\t\ttc_map = ice_dcb_get_ena_tc(dcbcfg);\n+\n+\t\t\t/* If DCBX request non-contiguous TC, then configure\n+\t\t\t * default TC\n+\t\t\t */\n+\t\t\tif (!ice_dcb_tc_contig(dcbcfg->etscfg.prio_table)) {\n+\t\t\t\ttc_map = ICE_DFLT_TRAFFIC_CLASS;\n+\t\t\t\tice_dcb_noncontig_cfg(pf);\n+\t\t\t}\n+\t\t} else {\n+\t\t\ttc_map = ICE_DFLT_TRAFFIC_CLASS;\n+\t\t}\n+\n+\t\tret = ice_vsi_cfg_tc(pf->vsi[v], tc_map);\n+\t\tif (ret) {\n+\t\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\t\"Failed to config TC for VSI index: %d\\n\",\n+\t\t\t\tpf->vsi[v]->idx);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tice_vsi_map_rings_to_vectors(pf->vsi[v]);\n+\t}\n+\tevent = kzalloc(sizeof(*event), GFP_KERNEL);\n+\tif (!event)\n+\t\treturn;\n+\n+\tset_bit(IIDC_EVENT_TC_CHANGE, event->type);\n+\tevent->reporter = NULL;\n+\tice_setup_dcb_qos_info(pf, &event->info.port_qos);\n+\tice_for_each_peer(pf, event, ice_peer_check_for_reg);\n+\tkfree(event);\n+}\n+\n /**\n * ice_init_pf_dcb - initialize DCB for a PF\n * @pf: PF to initialize DCB for\n@@ -541,7 +604,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\tdev_info(&pf->pdev->dev,\n \t\t\t \"FW LLDP is disabled, DCBx/LLDP in SW mode.\\n\");\n \t\tclear_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);\n-\t\terr = ice_dcb_sw_dflt_cfg(pf, locked);\n+\t\terr = ice_dcb_sw_dflt_cfg(pf, true, locked);\n \t\tif (err) {\n \t\t\tdev_err(&pf->pdev->dev,\n \t\t\t\t\"Failed to set local DCB config %d\\n\", err);\n", "prefixes": [ "S31", "05/15" ] }