| From 593771bcdb10dcfe60d99bc3e440666d9d4c3823 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Jun 2019 19:31:26 +0300 |
| Subject: thunderbolt: Correct path indices for PCIe tunnel |
| |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| |
| [ Upstream commit ce19f91eae43e39d5a1da55344756ab5a3c7e8d1 ] |
| |
| PCIe tunnel path indices got mixed up when we added support for tunnels |
| between switches that are not adjacent. This did not affect the |
| functionality as it is just an index but fix it now nevertheless to make |
| the code easier to understand. |
| |
| Reported-by: Rajmohan Mani <rajmohan.mani@intel.com> |
| Fixes: 8c7acaaf020f ("thunderbolt: Extend tunnel creation to more than 2 adjacent switches") |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Reviewed-by: Yehezkel Bernat <YehezkelShB@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/thunderbolt/tunnel.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c |
| index 31d0234837e45..5a99234826e73 100644 |
| --- a/drivers/thunderbolt/tunnel.c |
| +++ b/drivers/thunderbolt/tunnel.c |
| @@ -211,7 +211,7 @@ struct tb_tunnel *tb_tunnel_alloc_pci(struct tb *tb, struct tb_port *up, |
| return NULL; |
| } |
| tb_pci_init_path(path); |
| - tunnel->paths[TB_PCI_PATH_UP] = path; |
| + tunnel->paths[TB_PCI_PATH_DOWN] = path; |
| |
| path = tb_path_alloc(tb, up, TB_PCI_HOPID, down, TB_PCI_HOPID, 0, |
| "PCIe Up"); |
| @@ -220,7 +220,7 @@ struct tb_tunnel *tb_tunnel_alloc_pci(struct tb *tb, struct tb_port *up, |
| return NULL; |
| } |
| tb_pci_init_path(path); |
| - tunnel->paths[TB_PCI_PATH_DOWN] = path; |
| + tunnel->paths[TB_PCI_PATH_UP] = path; |
| |
| return tunnel; |
| } |
| -- |
| 2.20.1 |
| |
