Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1032838/?format=api
{ "id": 1032838, "url": "http://patchwork.ozlabs.org/api/patches/1032838/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20190129150143.12681-8-mika.westerberg@linux.intel.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190129150143.12681-8-mika.westerberg@linux.intel.com>", "list_archive_url": null, "date": "2019-01-29T15:01:22", "name": "[07/28] thunderbolt: Set sleep bit when suspending switch", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "3a7a127f8396e38b5cb139c5b5d6263eecb3161a", "submitter": { "id": 14534, "url": "http://patchwork.ozlabs.org/api/people/14534/?format=api", "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20190129150143.12681-8-mika.westerberg@linux.intel.com/mbox/", "series": [ { "id": 88859, "url": "http://patchwork.ozlabs.org/api/series/88859/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=88859", "date": "2019-01-29T15:01:18", "name": "thunderbolt: Software connection manager improvements", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/88859/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1032838/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1032838/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=none (p=none dis=none)\n\theader.from=linux.intel.com" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 43pqYx1H3qz9sML\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n\tWed, 30 Jan 2019 02:05:41 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1728243AbfA2PBw (ORCPT\n\t<rfc822;patchwork-incoming-netdev@ozlabs.org>);\n\tTue, 29 Jan 2019 10:01:52 -0500", "from mga07.intel.com ([134.134.136.100]:7039 \"EHLO mga07.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1728139AbfA2PBv (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tTue, 29 Jan 2019 10:01:51 -0500", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Jan 2019 07:01:50 -0800", "from black.fi.intel.com ([10.237.72.28])\n\tby fmsmga001.fm.intel.com with ESMTP; 29 Jan 2019 07:01:48 -0800", "by black.fi.intel.com (Postfix, from userid 1001)\n\tid 7A4E0404; Tue, 29 Jan 2019 17:01:44 +0200 (EET)" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,537,1539673200\"; d=\"scan'208\";a=\"142391801\"", "From": "Mika Westerberg <mika.westerberg@linux.intel.com>", "To": "linux-kernel@vger.kernel.org", "Cc": "Michael Jamet <michael.jamet@intel.com>,\n\tYehezkel Bernat <YehezkelShB@gmail.com>,\n\tAndreas Noever <andreas.noever@gmail.com>,\n\tLukas Wunner <lukas@wunner.de>, \"David S . Miller\" <davem@davemloft.net>,\n\tMika Westerberg <mika.westerberg@linux.intel.com>,\n\tAndy Shevchenko <andriy.shevchenko@linux.intel.com>,\n\tnetdev@vger.kernel.org", "Subject": "[PATCH 07/28] thunderbolt: Set sleep bit when suspending switch", "Date": "Tue, 29 Jan 2019 18:01:22 +0300", "Message-Id": "<20190129150143.12681-8-mika.westerberg@linux.intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190129150143.12681-1-mika.westerberg@linux.intel.com>", "References": "<20190129150143.12681-1-mika.westerberg@linux.intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Thunderbolt 2 devices and beyond link controller needs to be notified\nwhen a switch is going to be suspended by setting bit 31 in LC_SX_CTRL\nregister. Add this functionality to the software connection manager.\n\nSigned-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>\n---\n drivers/thunderbolt/lc.c | 44 +++++++++++++++++++++++++++++++++++\n drivers/thunderbolt/switch.c | 6 ++---\n drivers/thunderbolt/tb.h | 1 +\n drivers/thunderbolt/tb_regs.h | 2 ++\n 4 files changed, 49 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/thunderbolt/lc.c b/drivers/thunderbolt/lc.c\nindex a5dddf176546..ae1e92611c3e 100644\n--- a/drivers/thunderbolt/lc.c\n+++ b/drivers/thunderbolt/lc.c\n@@ -133,3 +133,47 @@ void tb_lc_unconfigure_link(struct tb_switch *sw)\n \ttb_lc_configure_lane(up, false);\n \ttb_lc_configure_lane(down, false);\n }\n+\n+/**\n+ * tb_lc_set_sleep() - Inform LC that the switch is going to sleep\n+ * @sw: Switch to set sleep\n+ *\n+ * Let the switch link controllers know that the switch is going to\n+ * sleep.\n+ */\n+int tb_lc_set_sleep(struct tb_switch *sw)\n+{\n+\tint start, size, nlc, ret, i;\n+\tu32 desc;\n+\n+\tif (sw->generation < 2)\n+\t\treturn 0;\n+\n+\tret = read_lc_desc(sw, &desc);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* Figure out number of link controllers */\n+\tnlc = desc & TB_LC_DESC_NLC_MASK;\n+\tstart = (desc & TB_LC_DESC_SIZE_MASK) >> TB_LC_DESC_SIZE_SHIFT;\n+\tsize = (desc & TB_LC_DESC_PORT_SIZE_MASK) >> TB_LC_DESC_PORT_SIZE_SHIFT;\n+\n+\t/* For each link controller set sleep bit */\n+\tfor (i = 0; i < nlc; i++) {\n+\t\tunsigned int offset = sw->cap_lc + start + i * size;\n+\t\tu32 ctrl;\n+\n+\t\tret = tb_sw_read(sw, &ctrl, TB_CFG_SWITCH,\n+\t\t\t\t offset + TB_LC_SX_CTRL, 1);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tctrl |= TB_LC_SX_CTRL_SLP;\n+\t\tret = tb_sw_write(sw, &ctrl, TB_CFG_SWITCH,\n+\t\t\t\t offset + TB_LC_SX_CTRL, 1);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c\nindex 760332f57b5c..1eee2502b5ba 100644\n--- a/drivers/thunderbolt/switch.c\n+++ b/drivers/thunderbolt/switch.c\n@@ -1604,10 +1604,8 @@ void tb_switch_suspend(struct tb_switch *sw)\n \t\tif (!tb_is_upstream_port(&sw->ports[i]) && sw->ports[i].remote)\n \t\t\ttb_switch_suspend(sw->ports[i].remote->sw);\n \t}\n-\t/*\n-\t * TODO: invoke tb_cfg_prepare_to_sleep here? does not seem to have any\n-\t * effect?\n-\t */\n+\n+\ttb_lc_set_sleep(sw);\n }\n \n struct tb_sw_lookup {\ndiff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h\nindex e61c2409021d..3160169389cc 100644\n--- a/drivers/thunderbolt/tb.h\n+++ b/drivers/thunderbolt/tb.h\n@@ -453,6 +453,7 @@ int tb_drom_read_uid_only(struct tb_switch *sw, u64 *uid);\n int tb_lc_read_uuid(struct tb_switch *sw, u32 *uuid);\n int tb_lc_configure_link(struct tb_switch *sw);\n void tb_lc_unconfigure_link(struct tb_switch *sw);\n+int tb_lc_set_sleep(struct tb_switch *sw);\n \n static inline int tb_route_length(u64 route)\n {\ndiff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h\nindex e0f867dad5cf..1ab6e0fb31c0 100644\n--- a/drivers/thunderbolt/tb_regs.h\n+++ b/drivers/thunderbolt/tb_regs.h\n@@ -239,6 +239,7 @@ struct tb_regs_hop {\n \n /* Common link controller registers */\n #define TB_LC_DESC\t\t\t0x02\n+#define TB_LC_DESC_NLC_MASK\t\tGENMASK(3, 0)\n #define TB_LC_DESC_SIZE_SHIFT\t\t8\n #define TB_LC_DESC_SIZE_MASK\t\tGENMASK(15, 8)\n #define TB_LC_DESC_PORT_SIZE_SHIFT\t16\n@@ -250,5 +251,6 @@ struct tb_regs_hop {\n #define TB_LC_SX_CTRL_L1C\t\tBIT(16)\n #define TB_LC_SX_CTRL_L2C\t\tBIT(20)\n #define TB_LC_SX_CTRL_UPSTREAM\t\tBIT(30)\n+#define TB_LC_SX_CTRL_SLP\t\tBIT(31)\n \n #endif\n", "prefixes": [ "07/28" ] }