From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <yehezkel.bernat@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Mario.Limonciello@dell.com,
Radion Mirchevsky <radion.mirchevsky@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Randy Dunlap <rdunlap@infradead.org>,
Jeremy McNicoll <jmcnicol@redhat.com>,
Andrei Emeltchenko <andrei.emeltchenko@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v3 13/18] thunderbolt: Add constant for approval timeout
Date: Fri, 2 Mar 2018 15:38:47 +0300 [thread overview]
Message-ID: <20180302123852.50463-14-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20180302123852.50463-1-mika.westerberg@linux.intel.com>
We will be using this from Titan Ridge support code as well so make it
constant.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/thunderbolt/icm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 6798516d6474..1c10aa8d224d 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -41,7 +41,8 @@
#define PHY_PORT_CS1_LINK_STATE_MASK GENMASK(29, 26)
#define PHY_PORT_CS1_LINK_STATE_SHIFT 26
-#define ICM_TIMEOUT 5000 /* ms */
+#define ICM_TIMEOUT 5000 /* ms */
+#define ICM_APPROVE_TIMEOUT 10000 /* ms */
#define ICM_MAX_LINK 4
#define ICM_MAX_DEPTH 6
@@ -260,7 +261,7 @@ static int icm_fr_approve_switch(struct tb *tb, struct tb_switch *sw)
memset(&reply, 0, sizeof(reply));
/* Use larger timeout as establishing tunnels can take some time */
ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
- 1, 10000);
+ 1, ICM_APPROVE_TIMEOUT);
if (ret)
return ret;
--
2.16.1
next prev parent reply other threads:[~2018-03-02 12:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 12:38 [PATCH v3 00/18] thunderbolt: Add support for Intel Titan Ridge Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 01/18] thunderbolt: Resume control channel after hibernation image is created Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 02/18] thunderbolt: Serialize PCIe tunnel creation with PCI rescan Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 03/18] thunderbolt: Handle connecting device in place of host properly Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 04/18] thunderbolt: Do not overwrite error code when domain adding fails Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 05/18] thunderbolt: Wait a bit longer for root switch config space Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 06/18] thunderbolt: Wait a bit longer for ICM to authenticate the active NVM Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 07/18] thunderbolt: Handle rejected Thunderbolt devices Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 08/18] thunderbolt: Factor common ICM add and update operations out Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 09/18] thunderbolt: Correct function name in kernel-doc comment Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 10/18] thunderbolt: Add tb_switch_get() Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 11/18] thunderbolt: Add tb_switch_find_by_route() Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 12/18] thunderbolt: Add tb_xdomain_find_by_route() Mika Westerberg
2018-03-02 12:38 ` Mika Westerberg [this message]
2018-03-02 12:38 ` [PATCH v3 14/18] thunderbolt: Move driver ready handling to struct icm Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 15/18] thunderbolt: Add 'boot' attribute for devices Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 16/18] thunderbolt: Add support for preboot ACL Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 17/18] thunderbolt: Introduce USB only (SL4) security level Mika Westerberg
2018-03-02 12:38 ` [PATCH v3 18/18] thunderbolt: Add support for Intel Titan Ridge Mika Westerberg
2018-03-09 10:06 ` [PATCH v3 00/18] " Mika Westerberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302123852.50463-14-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=Mario.Limonciello@dell.com \
--cc=andreas.noever@gmail.com \
--cc=andrei.emeltchenko@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=jmcnicol@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.jamet@intel.com \
--cc=radion.mirchevsky@intel.com \
--cc=rdunlap@infradead.org \
--cc=yehezkel.bernat@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).