Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1032824,
    "url": "http://patchwork.ozlabs.org/api/patches/1032824/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20190129150143.12681-27-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-27-mika.westerberg@linux.intel.com>",
    "list_archive_url": null,
    "date": "2019-01-29T15:01:41",
    "name": "[26/28] thunderbolt: Add support for XDomain connections",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": false,
    "hash": "e12eadd2c9fe7a950d42e1d7f7fd9baf913ad24a",
    "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-27-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/1032824/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/1032824/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 43pqX365QXz9sML\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n\tWed, 30 Jan 2019 02:04:03 +1100 (AEDT)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1729072AbfA2PD6 (ORCPT\n\t<rfc822;patchwork-incoming-netdev@ozlabs.org>);\n\tTue, 29 Jan 2019 10:03:58 -0500",
            "from mga02.intel.com ([134.134.136.20]:34504 \"EHLO mga02.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1728456AbfA2PD5 (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tTue, 29 Jan 2019 10:03:57 -0500",
            "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Jan 2019 07:01:55 -0800",
            "from black.fi.intel.com ([10.237.72.28])\n\tby orsmga006.jf.intel.com with ESMTP; 29 Jan 2019 07:01:51 -0800",
            "by black.fi.intel.com (Postfix, from userid 1001)\n\tid 6A4B3D2F; Tue, 29 Jan 2019 17:01:45 +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=\"112013869\"",
        "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 26/28] thunderbolt: Add support for XDomain connections",
        "Date": "Tue, 29 Jan 2019 18:01:41 +0300",
        "Message-Id": "<20190129150143.12681-27-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": "Two domains (hosts) can be connected through a Thunderbolt cable and in\nthat case they can start software services such as networking over the\nhigh-speed DMA paths. Now that we have all the basic building blocks in\nplace to create DMA tunnels over the Thunderbolt fabric we can add this\nsupport to the software connection manager as well.\n\nSigned-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>\n---\n drivers/thunderbolt/switch.c |  29 ++++++--\n drivers/thunderbolt/tb.c     | 131 ++++++++++++++++++++++++++++++++++-\n 2 files changed, 153 insertions(+), 7 deletions(-)",
    "diff": "diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c\nindex e10bae4a770c..f5ebe8bcaeb0 100644\n--- a/drivers/thunderbolt/switch.c\n+++ b/drivers/thunderbolt/switch.c\n@@ -1885,6 +1885,17 @@ int tb_switch_resume(struct tb_switch *sw)\n \tif (tb_route(sw)) {\n \t\tu64 uid;\n \n+\t\t/*\n+\t\t * Check first that we can still read the switch config\n+\t\t * space. It may be that there is now another domain\n+\t\t * connected.\n+\t\t */\n+\t\terr = tb_cfg_get_upstream_port(sw->tb->ctl, tb_route(sw));\n+\t\tif (err < 0) {\n+\t\t\ttb_sw_info(sw, \"switch not present anymore\\n\");\n+\t\t\treturn err;\n+\t\t}\n+\n \t\terr = tb_drom_read_uid_only(sw, &uid);\n \t\tif (err) {\n \t\t\ttb_sw_warn(sw, \"uid read failed\\n\");\n@@ -1916,13 +1927,23 @@ int tb_switch_resume(struct tb_switch *sw)\n \t\tstruct tb_port *port = &sw->ports[i];\n \t\tif (tb_is_upstream_port(port))\n \t\t\tcontinue;\n-\t\tif (!port->remote)\n+\n+\t\tif (!port->remote && !port->xdomain)\n \t\t\tcontinue;\n-\t\tif (tb_wait_for_port(port, true) <= 0\n-\t\t\t|| tb_switch_resume(port->remote->sw)) {\n+\n+\t\tif (tb_wait_for_port(port, true) <= 0) {\n \t\t\ttb_port_warn(port,\n \t\t\t\t     \"lost during suspend, disconnecting\\n\");\n-\t\t\ttb_sw_set_unplugged(port->remote->sw);\n+\t\t\tif (port->remote)\n+\t\t\t\ttb_sw_set_unplugged(port->remote->sw);\n+\t\t\telse if (port->xdomain)\n+\t\t\t\tport->xdomain->is_unplugged = true;\n+\t\t} else if (port->remote) {\n+\t\t\tif (tb_switch_resume(port->remote->sw)) {\n+\t\t\t\ttb_port_warn(port,\n+\t\t\t\t\t     \"lost during suspend, disconnecting\\n\");\n+\t\t\t\ttb_sw_set_unplugged(port->remote->sw);\n+\t\t\t}\n \t\t}\n \t}\n \treturn 0;\ndiff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c\nindex 4eb74254116c..645798eb0a77 100644\n--- a/drivers/thunderbolt/tb.c\n+++ b/drivers/thunderbolt/tb.c\n@@ -111,6 +111,28 @@ static void tb_switch_authorize(struct work_struct *work)\n \tmutex_unlock(&sw->tb->lock);\n }\n \n+static void tb_scan_xdomain(struct tb_port *port)\n+{\n+\tstruct tb_switch *sw = port->sw;\n+\tstruct tb *tb = sw->tb;\n+\tstruct tb_xdomain *xd;\n+\tu64 route;\n+\n+\troute = tb_downstream_route(port);\n+\txd = tb_xdomain_find_by_route(tb, route);\n+\tif (xd) {\n+\t\ttb_xdomain_put(xd);\n+\t\treturn;\n+\t}\n+\n+\txd = tb_xdomain_alloc(tb, &sw->dev, route, tb->root_switch->uuid,\n+\t\t\t      NULL);\n+\tif (xd) {\n+\t\ttb_port_at(route, sw)->xdomain = xd;\n+\t\ttb_xdomain_add(xd);\n+\t}\n+}\n+\n static void tb_scan_port(struct tb_port *port);\n \n /**\n@@ -150,19 +172,36 @@ static void tb_scan_port(struct tb_port *port)\n \tif (tb_wait_for_port(port, false) <= 0)\n \t\treturn;\n \tif (port->remote) {\n-\t\ttb_port_WARN(port, \"port already has a remote!\\n\");\n+\t\ttb_port_dbg(port, \"port already has a remote\\n\");\n \t\treturn;\n \t}\n \tsw = tb_switch_alloc(port->sw->tb, &port->sw->dev,\n \t\t\t     tb_downstream_route(port));\n-\tif (IS_ERR(sw))\n+\tif (IS_ERR(sw)) {\n+\t\t/*\n+\t\t * If there is an error accessing the connected switch\n+\t\t * it may be connected to another domain. Also we allow\n+\t\t * the other domain to be connected to a max depth switch.\n+\t\t */\n+\t\tif (PTR_ERR(sw) == -EIO || PTR_ERR(sw) == -EADDRNOTAVAIL)\n+\t\t\ttb_scan_xdomain(port);\n \t\treturn;\n+\t}\n \n \tif (tb_switch_configure(sw)) {\n \t\ttb_switch_put(sw);\n \t\treturn;\n \t}\n \n+\t/*\n+\t * If there was previously another domain connected remove it\n+\t * first.\n+\t */\n+\tif (port->xdomain) {\n+\t\ttb_xdomain_remove(port->xdomain);\n+\t\tport->xdomain = NULL;\n+\t}\n+\n \t/*\n \t * Do not send uevents until we have discovered all existing\n \t * tunnels and know which switches were authorized already by\n@@ -377,6 +416,51 @@ static int tb_approve_switch(struct tb *tb, struct tb_switch *sw)\n \treturn tb_tunnel_pci(tb, sw);\n }\n \n+static int tb_approve_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)\n+{\n+\tstruct tb_cm *tcm = tb_priv(tb);\n+\tstruct tb_port *nhi_port, *dst_port;\n+\tstruct tb_tunnel *tunnel;\n+\tstruct tb_switch *sw;\n+\n+\tsw = tb_to_switch(xd->dev.parent);\n+\tdst_port = tb_port_at(xd->route, sw);\n+\tnhi_port = tb_find_port(tb->root_switch, TB_TYPE_NHI);\n+\n+\ttunnel = tb_tunnel_alloc_dma(tb, nhi_port, dst_port, xd->transmit_ring,\n+\t\t\t\t     xd->transmit_path, xd->receive_ring,\n+\t\t\t\t     xd->receive_path);\n+\tif (!tunnel)\n+\t\treturn -ENOMEM;\n+\n+\tif (tb_tunnel_activate(tunnel)) {\n+\t\ttb_port_info(nhi_port,\n+\t\t\t     \"DMA tunnel activation failed, aborting\\n\");\n+\t\ttb_tunnel_free(tunnel);\n+\t\treturn -EIO;\n+\t}\n+\tlist_add_tail(&tunnel->list, &tcm->tunnel_list);\n+\n+\treturn 0;\n+}\n+\n+static int tb_disconnect_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)\n+{\n+\tstruct tb_port *dst_port;\n+\tstruct tb_switch *sw;\n+\n+\tsw = tb_to_switch(xd->dev.parent);\n+\tdst_port = tb_port_at(xd->route, sw);\n+\n+\t/*\n+\t * It is possible that the tunnel was already teared down (in\n+\t * case of cable disconnect) so it is fine if we cannot find it\n+\t * here anymore.\n+\t */\n+\ttb_free_tunnel(tb, TB_TUNNEL_DMA, NULL, dst_port);\n+\treturn 0;\n+}\n+\n /* hotplug handling */\n \n /**\n@@ -417,12 +501,16 @@ static void tb_handle_hotplug(struct work_struct *work)\n \t}\n \tif (ev->unplug) {\n \t\tif (port->remote) {\n-\t\t\ttb_port_info(port, \"unplugged\\n\");\n+\t\t\ttb_port_dbg(port, \"switch unplugged\\n\");\n \t\t\ttb_sw_set_unplugged(port->remote->sw);\n \t\t\ttb_free_invalid_tunnels(tb);\n \t\t\tcancel_work_sync(&sw->work);\n \t\t\ttb_switch_remove(port->remote->sw);\n \t\t\tport->remote = NULL;\n+\t\t} else if (port->xdomain) {\n+\t\t\ttb_port_dbg(port, \"xdomain unplugged\\n\");\n+\t\t\ttb_xdomain_remove(port->xdomain);\n+\t\t\tport->xdomain = NULL;\n \t\t} else if (tb_port_is_dpout(port)) {\n \t\t\ttb_teardown_dp(tb, port);\n \t\t} else {\n@@ -594,13 +682,50 @@ static int tb_resume_noirq(struct tb *tb)\n \treturn 0;\n }\n \n+static int tb_free_unplugged_xdomains(struct tb_switch *sw)\n+{\n+\tint i, ret = 0;\n+\n+\tfor (i = 1; i <= sw->config.max_port_number; i++) {\n+\t\tstruct tb_port *port = &sw->ports[i];\n+\n+\t\tif (tb_is_upstream_port(port))\n+\t\t\tcontinue;\n+\t\tif (port->xdomain && port->xdomain->is_unplugged) {\n+\t\t\ttb_xdomain_remove(port->xdomain);\n+\t\t\tport->xdomain = NULL;\n+\t\t\tret++;\n+\t\t} else if (port->remote) {\n+\t\t\tret += tb_free_unplugged_xdomains(port->remote->sw);\n+\t\t}\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static void tb_complete(struct tb *tb)\n+{\n+\t/*\n+\t * Release any unplugged XDomains and if there is a case where\n+\t * another domain is swapped in place of unplugged XDomain we\n+\t * need to run another rescan.\n+\t */\n+\tmutex_lock(&tb->lock);\n+\tif (tb_free_unplugged_xdomains(tb->root_switch))\n+\t\ttb_scan_switch(tb->root_switch);\n+\tmutex_unlock(&tb->lock);\n+}\n+\n static const struct tb_cm_ops tb_cm_ops = {\n \t.start = tb_start,\n \t.stop = tb_stop,\n \t.suspend_noirq = tb_suspend_noirq,\n \t.resume_noirq = tb_resume_noirq,\n+\t.complete = tb_complete,\n \t.handle_event = tb_handle_event,\n \t.approve_switch = tb_approve_switch,\n+\t.approve_xdomain_paths = tb_approve_xdomain_paths,\n+\t.disconnect_xdomain_paths = tb_disconnect_xdomain_paths,\n };\n \n struct tb *tb_probe(struct tb_nhi *nhi)\n",
    "prefixes": [
        "26/28"
    ]
}