]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
thunderbolt: Add constant for approval timeout
authorMika Westerberg <mika.westerberg@linux.intel.com>
Sat, 7 Oct 2017 07:54:09 +0000 (10:54 +0300)
committerMika Westerberg <mika.westerberg@linux.intel.com>
Fri, 9 Mar 2018 09:54:10 +0000 (12:54 +0300)
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

index 6798516d64747684c6406d4b0ef25346cac8fb51..1c10aa8d224d168bc0019c1d3716176f7beadd8e 100644 (file)
@@ -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;