Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1208823/?format=api
{ "id": 1208823, "url": "http://patchwork.ozlabs.org/api/patches/1208823/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191212111307.33566-9-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": "<20191212111307.33566-9-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-12-12T11:13:01", "name": "[S35,09/15] ice: Fix VF link state when it's IFLA_VF_LINK_STATE_AUTO", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d67936194d91454b2c1744fb8380a594c27a69c9", "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/20191212111307.33566-9-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 148167, "url": "http://patchwork.ozlabs.org/api/series/148167/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=148167", "date": "2019-12-12T11:13:03", "name": "[S35,01/15] ice: Support UDP segmentation offload", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/148167/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1208823/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1208823/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 47Yklg5bFZz9sPL\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 13 Dec 2019 06:44:47 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5468187169;\n\tThu, 12 Dec 2019 19:44:46 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 0WmLyhi9kgOp; Thu, 12 Dec 2019 19:44:44 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5BABB86FAF;\n\tThu, 12 Dec 2019 19:44:44 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 36E3F1BF9BA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 29AB9882A9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:39 +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 3bxRxhwuizEF for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:37 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 27E67881BA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:37 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t12 Dec 2019 11:44:36 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga001.jf.intel.com with ESMTP; 12 Dec 2019 11:44: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.69,306,1571727600\"; d=\"scan'208\";a=\"296698856\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 12 Dec 2019 03:13:01 -0800", "Message-Id": "<20191212111307.33566-9-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191212111307.33566-1-anthony.l.nguyen@intel.com>", "References": "<20191212111307.33566-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S35 09/15] ice: Fix VF link state when\n\tit's IFLA_VF_LINK_STATE_AUTO", "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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently the flow for ice_set_vf_link_state() is not configuring link\nthe same as all other VF link configuration flows. Fix this by only\nsetting the necessary VF members in ice_set_vf_link_state() and then\ncall ice_vc_notify_link_state() to actually configure link for the\nVF. This made ice_set_pfe_link_forced() unnecessary, so it was\ndeleted. Also, this commonizes the link flows for the VF to all call\nice_vc_notify_link_state().\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 3 +-\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 56 ++++---------------\n 2 files changed, 12 insertions(+), 47 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 9378a278206d..c2811b56f569 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -847,8 +847,7 @@ ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,\n \tice_vsi_link_event(vsi, link_up);\n \tice_print_link_msg(vsi, link_up);\n \n-\tif (pf->num_alloc_vfs)\n-\t\tice_vc_notify_link_state(pf);\n+\tice_vc_notify_link_state(pf);\n \n \treturn result;\n }\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 54c576bb62ad..c1708eb7ee75 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -121,26 +121,6 @@ ice_set_pfe_link(struct ice_vf *vf, struct virtchnl_pf_event *pfe,\n \t}\n }\n \n-/**\n- * ice_set_pfe_link_forced - Force the virtchnl_pf_event link speed/status\n- * @vf: pointer to the VF structure\n- * @pfe: pointer to the virtchnl_pf_event to set link speed/status for\n- * @link_up: whether or not to set the link up/down\n- */\n-static void\n-ice_set_pfe_link_forced(struct ice_vf *vf, struct virtchnl_pf_event *pfe,\n-\t\t\tbool link_up)\n-{\n-\tu16 link_speed;\n-\n-\tif (link_up)\n-\t\tlink_speed = ICE_AQ_LINK_SPEED_100GB;\n-\telse\n-\t\tlink_speed = ICE_AQ_LINK_SPEED_UNKNOWN;\n-\n-\tice_set_pfe_link(vf, pfe, link_speed, link_up);\n-}\n-\n /**\n * ice_vc_notify_vf_link_state - Inform a VF of link status\n * @vf: pointer to the VF structure\n@@ -161,13 +141,17 @@ static void ice_vc_notify_vf_link_state(struct ice_vf *vf)\n \tpfe.severity = PF_EVENT_SEVERITY_INFO;\n \n \t/* Always report link is down if the VF queues aren't enabled */\n-\tif (!vf->num_qs_ena)\n+\tif (!vf->num_qs_ena) {\n \t\tice_set_pfe_link(vf, &pfe, ICE_AQ_LINK_SPEED_UNKNOWN, false);\n-\telse if (vf->link_forced)\n-\t\tice_set_pfe_link_forced(vf, &pfe, vf->link_up);\n-\telse\n-\t\tice_set_pfe_link(vf, &pfe, ls->link_speed, ls->link_info &\n-\t\t\t\t ICE_AQ_LINK_UP);\n+\t} else if (vf->link_forced) {\n+\t\tu16 link_speed = vf->link_up ?\n+\t\t\tls->link_speed : ICE_AQ_LINK_SPEED_UNKNOWN;\n+\n+\t\tice_set_pfe_link(vf, &pfe, link_speed, vf->link_up);\n+\t} else {\n+\t\tice_set_pfe_link(vf, &pfe, ls->link_speed,\n+\t\t\t\t ls->link_info & ICE_AQ_LINK_UP);\n+\t}\n \n \tice_aq_send_msg_to_vf(hw, vf->vf_id, VIRTCHNL_OP_EVENT,\n \t\t\t VIRTCHNL_STATUS_SUCCESS, (u8 *)&pfe,\n@@ -3367,28 +3351,18 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)\n int ice_set_vf_link_state(struct net_device *netdev, int vf_id, int link_state)\n {\n \tstruct ice_pf *pf = ice_netdev_to_pf(netdev);\n-\tstruct virtchnl_pf_event pfe = { 0 };\n-\tstruct ice_link_status *ls;\n \tstruct ice_vf *vf;\n-\tstruct ice_hw *hw;\n \n \tif (ice_validate_vf_id(pf, vf_id))\n \t\treturn -EINVAL;\n \n \tvf = &pf->vf[vf_id];\n-\thw = &pf->hw;\n-\tls = &pf->hw.port_info->phy.link_info;\n-\n \tif (ice_check_vf_init(pf, vf))\n \t\treturn -EBUSY;\n \n-\tpfe.event = VIRTCHNL_EVENT_LINK_CHANGE;\n-\tpfe.severity = PF_EVENT_SEVERITY_INFO;\n-\n \tswitch (link_state) {\n \tcase IFLA_VF_LINK_STATE_AUTO:\n \t\tvf->link_forced = false;\n-\t\tvf->link_up = ls->link_info & ICE_AQ_LINK_UP;\n \t\tbreak;\n \tcase IFLA_VF_LINK_STATE_ENABLE:\n \t\tvf->link_forced = true;\n@@ -3402,15 +3376,7 @@ int ice_set_vf_link_state(struct net_device *netdev, int vf_id, int link_state)\n \t\treturn -EINVAL;\n \t}\n \n-\tif (vf->link_forced)\n-\t\tice_set_pfe_link_forced(vf, &pfe, vf->link_up);\n-\telse\n-\t\tice_set_pfe_link(vf, &pfe, ls->link_speed, vf->link_up);\n-\n-\t/* Notify the VF of its new link state */\n-\tice_aq_send_msg_to_vf(hw, vf->vf_id, VIRTCHNL_OP_EVENT,\n-\t\t\t VIRTCHNL_STATUS_SUCCESS, (u8 *)&pfe,\n-\t\t\t sizeof(pfe), NULL);\n+\tice_vc_notify_vf_link_state(vf);\n \n \treturn 0;\n }\n", "prefixes": [ "S35", "09/15" ] }