Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1049842/?format=api
{ "id": 1049842, "url": "http://patchwork.ozlabs.org/api/patches/1049842/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190228232432.31659-10-anirudh.venkataramanan@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": "<20190228232432.31659-10-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-28T23:24:30", "name": "[S16,09/11] ice: Add code for DCB rebuild", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7743ecf3030219bf51aa19bf6db2a9e9ad246d8f", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190228232432.31659-10-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94826, "url": "http://patchwork.ozlabs.org/api/series/94826/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94826", "date": "2019-02-28T23:24:25", "name": "Add support for Data Center Bridging (DCB)", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/94826/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1049842/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1049842/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 449TD33r2Kz9sCJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Mar 2019 10:24:51 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id EC21D220CE;\n\tThu, 28 Feb 2019 23:24:49 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id E0jfSOO6G4vC; Thu, 28 Feb 2019 23:24:43 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id CE7522272C;\n\tThu, 28 Feb 2019 23:24:41 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id ECA221BF410\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:37 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EA158869EC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:37 +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 k7UCkjWdtPHU for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:35 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 1CC9286919\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:35 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Feb 2019 15:24:34 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Feb 2019 15:24:34 -0800" ], "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.58,425,1544515200\"; d=\"scan'208\";a=\"137127729\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 28 Feb 2019 15:24:30 -0800", "Message-Id": "<20190228232432.31659-10-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190228232432.31659-1-anirudh.venkataramanan@intel.com>", "References": "<20190228232432.31659-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S16 09/11] ice: Add code for DCB rebuild", "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>", "MIME-Version": "1.0", "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": "This patch introduces a new function ice_dcb_rebuild which reinitializes\nDCB after a reset.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 78 ++++++++++++++++++++++++++++\n drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 5 ++\n drivers/net/ethernet/intel/ice/ice_main.c | 2 +\n 3 files changed, 85 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex c6ddb748ef53..32546aef2500 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -197,6 +197,84 @@ static int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg)\n \treturn ret;\n }\n \n+/**\n+ * ice_dcb_rebuild - rebuild DCB post reset\n+ * @pf: physical function instance\n+ */\n+void ice_dcb_rebuild(struct ice_pf *pf)\n+{\n+\tstruct ice_aqc_port_ets_elem buf = { 0 };\n+\tstruct ice_dcbx_cfg *prev_cfg;\n+\tenum ice_status ret;\n+\tu8 willing;\n+\n+\tret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);\n+\tif (ret) {\n+\t\tdev_err(&pf->pdev->dev, \"Query Port ETS failed\\n\");\n+\t\tgoto dcb_error;\n+\t}\n+\n+\t/* If DCB was not enabled previously, we are done */\n+\tif (!test_bit(ICE_FLAG_DCB_ENA, pf->flags))\n+\t\treturn;\n+\n+\t/* Save current willing state and force FW to unwilling */\n+\twilling = pf->hw.port_info->local_dcbx_cfg.etscfg.willing;\n+\tpf->hw.port_info->local_dcbx_cfg.etscfg.willing = 0x0;\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+\t\tgoto dcb_error;\n+\t}\n+\n+\t/* Retrieve DCB config and ensure same as current in SW */\n+\tprev_cfg = devm_kmemdup(&pf->pdev->dev,\n+\t\t\t\t&pf->hw.port_info->local_dcbx_cfg,\n+\t\t\t\tsizeof(*prev_cfg), GFP_KERNEL);\n+\tif (!prev_cfg) {\n+\t\tdev_err(&pf->pdev->dev, \"Failed to alloc space for DCB cfg\\n\");\n+\t\tgoto dcb_error;\n+\t}\n+\n+\tice_init_dcb(&pf->hw);\n+\tif (memcmp(prev_cfg, &pf->hw.port_info->local_dcbx_cfg,\n+\t\t sizeof(*prev_cfg))) {\n+\t\t/* difference in cfg detected - disable DCB till next MIB */\n+\t\tdev_err(&pf->pdev->dev, \"Set local MIB not accurate\\n\");\n+\t\tdevm_kfree(&pf->pdev->dev, prev_cfg);\n+\t\tgoto dcb_error;\n+\t}\n+\n+\t/* fetched config congruent to previous configuration */\n+\tdevm_kfree(&pf->pdev->dev, prev_cfg);\n+\n+\t/* Configuration replayed - reset willing state to previous */\n+\tpf->hw.port_info->local_dcbx_cfg.etscfg.willing = willing;\n+\tret = ice_set_dcb_cfg(pf->hw.port_info);\n+\tif (ret) {\n+\t\tdev_err(&pf->pdev->dev, \"Fail restoring prev willing state\\n\");\n+\t\tgoto dcb_error;\n+\t}\n+\tdev_info(&pf->pdev->dev, \"DCB restored after reset\\n\");\n+\tret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);\n+\tif (ret) {\n+\t\tdev_err(&pf->pdev->dev, \"Query Port ETS failed\\n\");\n+\t\tgoto dcb_error;\n+\t}\n+\n+\treturn;\n+\n+dcb_error:\n+\tdev_err(&pf->pdev->dev, \"Disabling DCB until new settings occur\\n\");\n+\tprev_cfg = devm_kzalloc(&pf->pdev->dev, sizeof(*prev_cfg), GFP_KERNEL);\n+\tprev_cfg->etscfg.willing = true;\n+\tprev_cfg->etscfg.tcbwtable[0] = ICE_TC_MAX_BW;\n+\tprev_cfg->etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;\n+\tmemcpy(&prev_cfg->etsrec, &prev_cfg->etscfg, sizeof(prev_cfg->etsrec));\n+\tice_pf_dcb_cfg(pf, prev_cfg);\n+\tdevm_kfree(&pf->pdev->dev, prev_cfg);\n+}\n+\n /**\n * ice_dcb_init_cfg - set the initial DCB config in SW\n * @pf: pf to apply config to\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\nindex 1b4159d44617..7786ec94b06a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\n@@ -8,6 +8,9 @@\n #include \"ice_lib.h\"\n \n #ifdef CONFIG_DCB\n+#define ICE_TC_MAX_BW 100 /* Default Max BW percentage */\n+\n+void ice_dcb_rebuild(struct ice_pf *pf);\n u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg);\n u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);\n void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);\n@@ -25,6 +28,8 @@ ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring)\n \ttlan_ctx->cgd_num = ring->dcb_tc;\n }\n #else\n+#define ice_dcb_rebuild(pf) do {} while (0)\n+\n static inline u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg __always_unused *dcbcfg)\n {\n \treturn ICE_DFLT_TRAFFIC_CLASS;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 1a37132446a3..fba4eb086578 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3793,6 +3793,8 @@ static void ice_rebuild(struct ice_pf *pf)\n \tif (err)\n \t\tgoto err_sched_init_port;\n \n+\tice_dcb_rebuild(pf);\n+\n \t/* reset search_hint of irq_trackers to 0 since interrupts are\n \t * reclaimed and could be allocated from beginning during VSI rebuild\n \t */\n", "prefixes": [ "S16", "09/11" ] }