thunderbolt: Introduce tb_port_path_direction_downstream()

[ Upstream commit 2bfeca73e94567c1a117ca45d2e8a25d63e5bd2c ]

Introduce tb_port_path_direction_downstream() to check if path from
source adapter to destination adapter is directed towards downstream.
Convert existing users to call this helper instead of open-coding.

No functional changes.

Signed-off-by: Gil Fine <gil.fine@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Qin Wan <qin.wan@hp.com>
Signed-off-by: Alexandru Gagniuc <alexandru.gagniuc@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 183225bdbbf561bc2313b7b9e06f1e0691525255..4ea0536ec5cfb20b29c4451297961598ab55dd26 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -553,7 +553,7 @@ static struct tb_tunnel *tb_find_first_usb3_tunnel(struct tb *tb,
        struct tb_switch *sw;
 
        /* Pick the router that is deepest in the topology */
-       if (dst_port->sw->config.depth > src_port->sw->config.depth)
+       if (tb_port_path_direction_downstream(src_port, dst_port))
                sw = dst_port->sw;
        else
                sw = src_port->sw;
@@ -1223,7 +1223,7 @@ tb_recalc_estimated_bandwidth_for_group(struct tb_bandwidth_group *group)
                tb_port_dbg(in, "re-calculated estimated bandwidth %u/%u Mb/s\n",
                            estimated_up, estimated_down);
 
-               if (in->sw->config.depth < out->sw->config.depth)
+               if (tb_port_path_direction_downstream(in, out))
                        estimated_bw = estimated_down;
                else
                        estimated_bw = estimated_up;
@@ -2002,7 +2002,7 @@ static void tb_handle_dp_bandwidth_request(struct work_struct *work)
 
        out = tunnel->dst_port;
 
-       if (in->sw->config.depth < out->sw->config.depth) {
+       if (tb_port_path_direction_downstream(in, out)) {
                requested_up = -1;
                requested_down = requested_bw;
        } else {

diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index 2f5f85666302e166050ba2dcf13cf29054337699..6d66dd2a3ab0278094fcad5ea7bbad5fca5e44c9 100644 (file)
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -1044,6 +1044,21 @@ void tb_port_release_out_hopid(struct tb_port *port, int hopid);
 struct tb_port *tb_next_port_on_path(struct tb_port *start, struct tb_port *end,
                                     struct tb_port *prev);
 
+/**
+ * tb_port_path_direction_downstream() - Checks if path directed downstream
+ * @src: Source adapter
+ * @dst: Destination adapter
+ *
+ * Returns %true only if the specified path from source adapter (@src)
+ * to destination adapter (@dst) is directed downstream.
+ */
+static inline bool
+tb_port_path_direction_downstream(const struct tb_port *src,
+                                 const struct tb_port *dst)
+{
+       return src->sw->config.depth < dst->sw->config.depth;
+}
+
 static inline bool tb_port_use_credit_allocation(const struct tb_port *port)
 {
        return tb_port_is_null(port) && port->sw->credit_allocation;

diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index e296ab5d657b971210a4e758410b504aad68d69f..8aec678d80d357d3ed152e63a78c11f2650cc8f0 100644 (file)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -677,7 +677,7 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel)
                      "DP OUT maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",
                      out_rate, out_lanes, bw);
 
-       if (in->sw->config.depth < out->sw->config.depth)
+       if (tb_port_path_direction_downstream(in, out))
                max_bw = tunnel->max_down;
        else
                max_bw = tunnel->max_up;
@@ -802,7 +802,7 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel)
         * max_up/down fields. For discovery we just read what the
         * estimation was set to.
         */
-       if (in->sw->config.depth < out->sw->config.depth)
+       if (tb_port_path_direction_downstream(in, out))
                estimated_bw = tunnel->max_down;
        else
                estimated_bw = tunnel->max_up;
@@ -972,7 +972,7 @@ static int tb_dp_bandwidth_mode_consumed_bandwidth(struct tb_tunnel *tunnel,
        if (allocated_bw == max_bw)
                allocated_bw = ret;
 
-       if (in->sw->config.depth < out->sw->config.depth) {
+       if (tb_port_path_direction_downstream(in, out)) {
                *consumed_up = 0;
                *consumed_down = allocated_bw;
        } else {
@@ -1007,7 +1007,7 @@ static int tb_dp_allocated_bandwidth(struct tb_tunnel *tunnel, int *allocated_up
                if (allocated_bw == max_bw)
                        allocated_bw = ret;
 
-               if (in->sw->config.depth < out->sw->config.depth) {
+               if (tb_port_path_direction_downstream(in, out)) {
                        *allocated_up = 0;
                        *allocated_down = allocated_bw;
                } else {
@@ -1035,7 +1035,7 @@ static int tb_dp_alloc_bandwidth(struct tb_tunnel *tunnel, int *alloc_up,
        if (ret < 0)
                return ret;
 
-       if (in->sw->config.depth < out->sw->config.depth) {
+       if (tb_port_path_direction_downstream(in, out)) {
                tmp = min(*alloc_down, max_bw);
                ret = usb4_dp_port_allocate_bandwidth(in, tmp);
                if (ret)
@@ -1133,7 +1133,7 @@ static int tb_dp_maximum_bandwidth(struct tb_tunnel *tunnel, int *max_up,
        if (ret < 0)
                return ret;
 
-       if (in->sw->config.depth < tunnel->dst_port->sw->config.depth) {
+       if (tb_port_path_direction_downstream(in, tunnel->dst_port)) {
                *max_up = 0;
                *max_down = ret;
        } else {
@@ -1191,7 +1191,7 @@ static int tb_dp_consumed_bandwidth(struct tb_tunnel *tunnel, int *consumed_up,
                return 0;
        }
 
-       if (in->sw->config.depth < tunnel->dst_port->sw->config.depth) {
+       if (tb_port_path_direction_downstream(in, tunnel->dst_port)) {
                *consumed_up = 0;
                *consumed_down = tb_dp_bandwidth(rate, lanes);
        } else {