Skip to content

Commit 970635e

Browse files
aloktiwagregkh
authored andcommitted
thunderbolt: Fix bit masking in tb_dp_port_set_hops()
commit 2cdde91 upstream. The tb_dp_port_set_hops() function was incorrectly clearing ADP_DP_CS_1_AUX_RX_HOPID_MASK twice. According to the function's purpose, it should clear both TX and RX AUX HopID fields. Replace the first instance with ADP_DP_CS_1_AUX_TX_HOPID_MASK to ensure proper configuration of both AUX directions. Fixes: 9817638 ("thunderbolt: Convert DP adapter register names to follow the USB4 spec") Cc: stable@vger.kernel.org Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 17a6ea2 commit 970635e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/thunderbolt/switch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ int tb_dp_port_set_hops(struct tb_port *port, unsigned int video,
14501450
return ret;
14511451

14521452
data[0] &= ~ADP_DP_CS_0_VIDEO_HOPID_MASK;
1453-
data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;
1453+
data[1] &= ~ADP_DP_CS_1_AUX_TX_HOPID_MASK;
14541454
data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;
14551455

14561456
data[0] |= (video << ADP_DP_CS_0_VIDEO_HOPID_SHIFT) &

0 commit comments

Comments
 (0)