{"id":814986,"url":"http://patchwork.ozlabs.org/api/patches/814986/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918153049.44185-5-mika.westerberg@linux.intel.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"<20170918153049.44185-5-mika.westerberg@linux.intel.com>","list_archive_url":null,"date":"2017-09-18T15:30:37","name":"[04/16] thunderbolt: Move thunderbolt domain structure to thunderbolt.h","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"557ca5e475e318fa7e7799541fcda7bbd6ccb33a","submitter":{"id":14534,"url":"http://patchwork.ozlabs.org/api/people/14534/?format=json","name":"Mika Westerberg","email":"mika.westerberg@linux.intel.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918153049.44185-5-mika.westerberg@linux.intel.com/mbox/","series":[{"id":3664,"url":"http://patchwork.ozlabs.org/api/series/3664/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3664","date":"2017-09-18T15:30:47","name":"Thunderbolt networking","version":1,"mbox":"http://patchwork.ozlabs.org/series/3664/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814986/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814986/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwqqJ72ypz9s78\n\tfor ;\n\tTue, 19 Sep 2017 01:36:28 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754339AbdIRPaz (ORCPT );\n\tMon, 18 Sep 2017 11:30:55 -0400","from mga02.intel.com ([134.134.136.20]:18431 \"EHLO mga02.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753735AbdIRPay (ORCPT );\n\tMon, 18 Sep 2017 11:30:54 -0400","from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t18 Sep 2017 08:30:53 -0700","from black.fi.intel.com ([10.237.72.28])\n\tby orsmga002.jf.intel.com with ESMTP; 18 Sep 2017 08:30:50 -0700","by black.fi.intel.com (Postfix, from userid 1001)\n\tid 8A6A8317; Mon, 18 Sep 2017 18:30:49 +0300 (EEST)"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.42,413,1500966000\"; d=\"scan'208\";a=\"136612042\"","From":"Mika Westerberg ","To":"Greg Kroah-Hartman ,\n\t\"David S . Miller\" ","Cc":"Andreas Noever ,\n\tMichael Jamet ,\n\tYehezkel Bernat ,\n\tAmir Levy ,\n\tMario.Limonciello@dell.com, Lukas Wunner ,\n\tAndy Shevchenko ,\n\tMika Westerberg ,\n\tlinux-kernel@vger.kernel.org, netdev@vger.kernel.org","Subject":"[PATCH 04/16] thunderbolt: Move thunderbolt domain structure to\n\tthunderbolt.h","Date":"Mon, 18 Sep 2017 18:30:37 +0300","Message-Id":"<20170918153049.44185-5-mika.westerberg@linux.intel.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170918153049.44185-1-mika.westerberg@linux.intel.com>","References":"<20170918153049.44185-1-mika.westerberg@linux.intel.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"These are needed by Thunderbolt services so move them to thunderbolt.h\nto make sure they are available outside of drivers/thunderbolt.\n\nSigned-off-by: Mika Westerberg \nReviewed-by: Michael Jamet \nReviewed-by: Yehezkel Bernat \n---\n drivers/thunderbolt/tb.h | 42 ------------------------------------------\n include/linux/thunderbolt.h | 45 +++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 45 insertions(+), 42 deletions(-)","diff":"diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h\nindex e0deee4f1eb0..2fefe76621ca 100644\n--- a/drivers/thunderbolt/tb.h\n+++ b/drivers/thunderbolt/tb.h\n@@ -39,20 +39,6 @@ struct tb_switch_nvm {\n \tbool authenticating;\n };\n \n-/**\n- * enum tb_security_level - Thunderbolt security level\n- * @TB_SECURITY_NONE: No security, legacy mode\n- * @TB_SECURITY_USER: User approval required at minimum\n- * @TB_SECURITY_SECURE: One time saved key required at minimum\n- * @TB_SECURITY_DPONLY: Only tunnel Display port (and USB)\n- */\n-enum tb_security_level {\n-\tTB_SECURITY_NONE,\n-\tTB_SECURITY_USER,\n-\tTB_SECURITY_SECURE,\n-\tTB_SECURITY_DPONLY,\n-};\n-\n #define TB_SWITCH_KEY_SIZE\t\t32\n /* Each physical port contains 2 links on modern controllers */\n #define TB_SWITCH_LINKS_PER_PHY_PORT\t2\n@@ -223,33 +209,6 @@ struct tb_cm_ops {\n \tint (*disconnect_pcie_paths)(struct tb *tb);\n };\n \n-/**\n- * struct tb - main thunderbolt bus structure\n- * @dev: Domain device\n- * @lock: Big lock. Must be held when accessing any struct\n- *\t tb_switch / struct tb_port.\n- * @nhi: Pointer to the NHI structure\n- * @ctl: Control channel for this domain\n- * @wq: Ordered workqueue for all domain specific work\n- * @root_switch: Root switch of this domain\n- * @cm_ops: Connection manager specific operations vector\n- * @index: Linux assigned domain number\n- * @security_level: Current security level\n- * @privdata: Private connection manager specific data\n- */\n-struct tb {\n-\tstruct device dev;\n-\tstruct mutex lock;\n-\tstruct tb_nhi *nhi;\n-\tstruct tb_ctl *ctl;\n-\tstruct workqueue_struct *wq;\n-\tstruct tb_switch *root_switch;\n-\tconst struct tb_cm_ops *cm_ops;\n-\tint index;\n-\tenum tb_security_level security_level;\n-\tunsigned long privdata[0];\n-};\n-\n static inline void *tb_priv(struct tb *tb)\n {\n \treturn (void *)tb->privdata;\n@@ -368,7 +327,6 @@ static inline int tb_port_write(struct tb_port *port, const void *buffer,\n struct tb *icm_probe(struct tb_nhi *nhi);\n struct tb *tb_probe(struct tb_nhi *nhi);\n \n-extern struct bus_type tb_bus_type;\n extern struct device_type tb_domain_type;\n extern struct device_type tb_switch_type;\n \ndiff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h\nindex 0b22b64dacba..89dbb0c20f07 100644\n--- a/include/linux/thunderbolt.h\n+++ b/include/linux/thunderbolt.h\n@@ -14,7 +14,9 @@\n #ifndef THUNDERBOLT_H_\n #define THUNDERBOLT_H_\n \n+#include \n #include \n+#include \n #include \n \n enum tb_cfg_pkg_type {\n@@ -34,6 +36,49 @@ enum tb_cfg_pkg_type {\n };\n \n /**\n+ * enum tb_security_level - Thunderbolt security level\n+ * @TB_SECURITY_NONE: No security, legacy mode\n+ * @TB_SECURITY_USER: User approval required at minimum\n+ * @TB_SECURITY_SECURE: One time saved key required at minimum\n+ * @TB_SECURITY_DPONLY: Only tunnel Display port (and USB)\n+ */\n+enum tb_security_level {\n+\tTB_SECURITY_NONE,\n+\tTB_SECURITY_USER,\n+\tTB_SECURITY_SECURE,\n+\tTB_SECURITY_DPONLY,\n+};\n+\n+/**\n+ * struct tb - main thunderbolt bus structure\n+ * @dev: Domain device\n+ * @lock: Big lock. Must be held when accessing any struct\n+ *\t tb_switch / struct tb_port.\n+ * @nhi: Pointer to the NHI structure\n+ * @ctl: Control channel for this domain\n+ * @wq: Ordered workqueue for all domain specific work\n+ * @root_switch: Root switch of this domain\n+ * @cm_ops: Connection manager specific operations vector\n+ * @index: Linux assigned domain number\n+ * @security_level: Current security level\n+ * @privdata: Private connection manager specific data\n+ */\n+struct tb {\n+\tstruct device dev;\n+\tstruct mutex lock;\n+\tstruct tb_nhi *nhi;\n+\tstruct tb_ctl *ctl;\n+\tstruct workqueue_struct *wq;\n+\tstruct tb_switch *root_switch;\n+\tconst struct tb_cm_ops *cm_ops;\n+\tint index;\n+\tenum tb_security_level security_level;\n+\tunsigned long privdata[0];\n+};\n+\n+extern struct bus_type tb_bus_type;\n+\n+/**\n * struct tb_property_dir - XDomain property directory\n * @uuid: Directory UUID or %NULL if root directory\n * @properties: List of properties in this directory\n","prefixes":["04/16"]}