Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1049866/?format=api
{ "id": 1049866, "url": "http://patchwork.ozlabs.org/api/patches/1049866/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190228232603.32156-16-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": "<20190228232603.32156-16-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-28T23:26:01", "name": "[S17,15/17] ice: Refactor link event flow", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "636c61931d39ccdb61a1ea74a3c38288bca9f637", "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/20190228232603.32156-16-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94829, "url": "http://patchwork.ozlabs.org/api/series/94829/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94829", "date": "2019-02-28T23:25:46", "name": "Implementation updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/94829/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1049866/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1049866/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 449TFv2gl3z9s4V\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Mar 2019 10:26:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CE545220CE;\n\tThu, 28 Feb 2019 23:26:25 +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 rhxyKzy-EKio; Thu, 28 Feb 2019 23:26:17 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id A932D22268;\n\tThu, 28 Feb 2019 23:26:14 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 216EC1BF3EA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1ED458126A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26: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 H4hkuT8IjZc5 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:06 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 3386D81B71\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:06 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Feb 2019 15:26:06 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Feb 2019 15:26:06 -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=\"137128005\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 28 Feb 2019 15:26:01 -0800", "Message-Id": "<20190228232603.32156-16-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190228232603.32156-1-anirudh.venkataramanan@intel.com>", "References": "<20190228232603.32156-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S17 15/17] ice: Refactor link event flow", "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": "From: Brett Creeley <brett.creeley@intel.com>\n\nCurrently the link event flow works, but can be much better.\nRefactor the link event flow to make it cleaner and more clear\non what is going on.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice.h | 20 +++++++\n drivers/net/ethernet/intel/ice/ice_main.c | 93 +++++++++++++++----------------\n 2 files changed, 65 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex d66aad49bfd4..804d12c2f1df 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -420,6 +420,26 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,\n \twr32(hw, GLINT_DYN_CTL(vector), val);\n }\n \n+/**\n+ * ice_find_vsi_by_type - Find and return VSI of a given type\n+ * @pf: PF to search for VSI\n+ * @type: Value indicating type of VSI we are looking for\n+ */\n+static inline struct ice_vsi *\n+ice_find_vsi_by_type(struct ice_pf *pf, enum ice_vsi_type type)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < pf->num_alloc_vsi; i++) {\n+\t\tstruct ice_vsi *vsi = pf->vsi[i];\n+\n+\t\tif (vsi && vsi->type == type)\n+\t\t\treturn vsi;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n void ice_set_ethtool_ops(struct net_device *netdev);\n int ice_up(struct ice_vsi *vsi);\n int ice_down(struct ice_vsi *vsi);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex a0d2c337fede..d57ac8ce9e42 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -590,6 +590,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)\n \tconst char *speed;\n \tconst char *fc;\n \n+\tif (!vsi)\n+\t\treturn;\n+\n \tif (vsi->current_isup == isup)\n \t\treturn;\n \n@@ -659,15 +662,16 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)\n */\n static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)\n {\n-\tif (!vsi || test_bit(__ICE_DOWN, vsi->state))\n+\tif (!vsi)\n+\t\treturn;\n+\n+\tif (test_bit(__ICE_DOWN, vsi->state) || !vsi->netdev)\n \t\treturn;\n \n \tif (vsi->type == ICE_VSI_PF) {\n-\t\tif (!vsi->netdev) {\n-\t\t\tdev_dbg(&vsi->back->pdev->dev,\n-\t\t\t\t\"vsi->netdev is not initialized!\\n\");\n+\t\tif (link_up == netif_carrier_ok(vsi->netdev))\n \t\t\treturn;\n-\t\t}\n+\n \t\tif (link_up) {\n \t\t\tnetif_carrier_on(vsi->netdev);\n \t\t\tnetif_tx_wake_all_queues(vsi->netdev);\n@@ -682,61 +686,51 @@ static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)\n * ice_link_event - process the link event\n * @pf: pf that the link event is associated with\n * @pi: port_info for the port that the link event is associated with\n+ * @link_up: true if the physical link is up and false if it is down\n+ * @link_speed: current link speed received from the link event\n *\n- * Returns -EIO if ice_get_link_status() fails\n- * Returns 0 on success\n+ * Returns 0 on success and negative on failure\n */\n static int\n-ice_link_event(struct ice_pf *pf, struct ice_port_info *pi)\n+ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,\n+\t u16 link_speed)\n {\n-\tu8 new_link_speed, old_link_speed;\n \tstruct ice_phy_info *phy_info;\n-\tbool new_link_same_as_old;\n-\tbool new_link, old_link;\n-\tu8 lport;\n-\tu16 v;\n+\tstruct ice_vsi *vsi;\n+\tu16 old_link_speed;\n+\tbool old_link;\n+\tint result;\n \n \tphy_info = &pi->phy;\n \tphy_info->link_info_old = phy_info->link_info;\n-\t/* Force ice_get_link_status() to update link info */\n-\tphy_info->get_link_info = true;\n \n-\told_link = (phy_info->link_info_old.link_info & ICE_AQ_LINK_UP);\n+\told_link = !!(phy_info->link_info_old.link_info & ICE_AQ_LINK_UP);\n \told_link_speed = phy_info->link_info_old.link_speed;\n \n-\tlport = pi->lport;\n-\tif (ice_get_link_status(pi, &new_link)) {\n+\t/* update the link info structures and re-enable link events,\n+\t * don't bail on failure due to other book keeping needed\n+\t */\n+\tresult = ice_update_link_info(pi);\n+\tif (result)\n \t\tdev_dbg(&pf->pdev->dev,\n-\t\t\t\"Could not get link status for port %d\\n\", lport);\n-\t\treturn -EIO;\n-\t}\n-\n-\tnew_link_speed = phy_info->link_info.link_speed;\n-\n-\tnew_link_same_as_old = (new_link == old_link &&\n-\t\t\t\tnew_link_speed == old_link_speed);\n+\t\t\t\"Failed to update link status and re-enable link events for port %d\\n\",\n+\t\t\tpi->lport);\n \n-\tice_for_each_vsi(pf, v) {\n-\t\tstruct ice_vsi *vsi = pf->vsi[v];\n+\t/* if the old link up/down and speed is the same as the new */\n+\tif (link_up == old_link && link_speed == old_link_speed)\n+\t\treturn result;\n \n-\t\tif (!vsi || !vsi->port_info)\n-\t\t\tcontinue;\n+\tvsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);\n+\tif (!vsi || !vsi->port_info)\n+\t\treturn -EINVAL;\n \n-\t\tif (new_link_same_as_old &&\n-\t\t (test_bit(__ICE_DOWN, vsi->state) ||\n-\t\t new_link == netif_carrier_ok(vsi->netdev)))\n-\t\t\tcontinue;\n+\tice_vsi_link_event(vsi, link_up);\n+\tice_print_link_msg(vsi, link_up);\n \n-\t\tif (vsi->port_info->lport == lport) {\n-\t\t\tice_print_link_msg(vsi, new_link);\n-\t\t\tice_vsi_link_event(vsi, new_link);\n-\t\t}\n-\t}\n-\n-\tif (!new_link_same_as_old && pf->num_alloc_vfs)\n+\tif (pf->num_alloc_vfs)\n \t\tice_vc_notify_link_state(pf);\n \n-\treturn 0;\n+\treturn result;\n }\n \n /**\n@@ -801,20 +795,23 @@ static int ice_init_link_events(struct ice_port_info *pi)\n /**\n * ice_handle_link_event - handle link event via ARQ\n * @pf: pf that the link event is associated with\n- *\n- * Return -EINVAL if port_info is null\n- * Return status on success\n+ * @event: event structure containing link status info\n */\n-static int ice_handle_link_event(struct ice_pf *pf)\n+static int\n+ice_handle_link_event(struct ice_pf *pf, struct ice_rq_event_info *event)\n {\n+\tstruct ice_aqc_get_link_status_data *link_data;\n \tstruct ice_port_info *port_info;\n \tint status;\n \n+\tlink_data = (struct ice_aqc_get_link_status_data *)event->msg_buf;\n \tport_info = pf->hw.port_info;\n \tif (!port_info)\n \t\treturn -EINVAL;\n \n-\tstatus = ice_link_event(pf, port_info);\n+\tstatus = ice_link_event(pf, port_info,\n+\t\t\t\t!!(link_data->link_info & ICE_AQ_LINK_UP),\n+\t\t\t\tle16_to_cpu(link_data->link_speed));\n \tif (status)\n \t\tdev_dbg(&pf->pdev->dev,\n \t\t\t\"Could not process link event, error %d\\n\", status);\n@@ -926,7 +923,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \n \t\tswitch (opcode) {\n \t\tcase ice_aqc_opc_get_link_status:\n-\t\t\tif (ice_handle_link_event(pf))\n+\t\t\tif (ice_handle_link_event(pf, &event))\n \t\t\t\tdev_err(&pf->pdev->dev,\n \t\t\t\t\t\"Could not handle link event\\n\");\n \t\t\tbreak;\n", "prefixes": [ "S17", "15/17" ] }