]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
thunderbolt: Fix bit masking in tb_dp_port_set_hops()
authorAlok Tiwari <alok.a.tiwari@oracle.com>
Sun, 22 Jun 2025 17:17:02 +0000 (10:17 -0700)
committerMika Westerberg <mika.westerberg@linux.intel.com>
Mon, 23 Jun 2025 09:52:08 +0000 (12:52 +0300)
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: 98176380cbe5 ("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>
drivers/thunderbolt/switch.c

index e9809fb57c35494df88810f53786c628d8523d05..b6c58a7e7b6aa9db5f90ec7e9747857e881cdb19 100644 (file)
@@ -1450,7 +1450,7 @@ int tb_dp_port_set_hops(struct tb_port *port, unsigned int video,
                return ret;
 
        data[0] &= ~ADP_DP_CS_0_VIDEO_HOPID_MASK;
-       data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;
+       data[1] &= ~ADP_DP_CS_1_AUX_TX_HOPID_MASK;
        data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;
 
        data[0] |= (video << ADP_DP_CS_0_VIDEO_HOPID_SHIFT) &