[PATCH 1/2] thunderbolt: Fix redundant Bit masking of ADP_DP_CS_1_AUX_RX_HOPID_MASK

[PATCH 1/2] thunderbolt: Fix redundant Bit masking of ADP_DP_CS_1_AUX_RX_HOPID_MASK

[Alok Tiwari]

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
hop ID 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")
Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
---
 drivers/thunderbolt/switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 28febb95f8fa1..36918a656f456 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -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) &
-- 
2.46.0

[PATCH 2/2] thunderbolt: Fix typos in documentation comments

[Alok Tiwari]

Fixes two minor typos in Thunderbolt driver comments:
Correct "passwd" -> "passed" in nvm.c.
Correct "boths" -> "both" in switch.c.

Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
---
 drivers/thunderbolt/nvm.c    | 2 +-
 drivers/thunderbolt/switch.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thunderbolt/nvm.c b/drivers/thunderbolt/nvm.c
index 8901db2de327c..da11c8112e29b 100644
--- a/drivers/thunderbolt/nvm.c
+++ b/drivers/thunderbolt/nvm.c
@@ -588,7 +588,7 @@ int tb_nvm_read_data(unsigned int address, void *buf, size_t size,
  * @size: Size of the buffer in bytes
  * @retries: Number of retries if the block write fails
  * @write_block: Function that writes block to the flash
- * @write_block_data: Data passwd to @write_block
+ * @write_block_data: Data passed to @write_block
  *
  * This is generic function that writes data to NVM or NVM like device.
  *
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 36918a656f456..3ee16a9ec736c 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -3069,7 +3069,7 @@ static int tb_switch_asym_disable(struct tb_switch *sw)
  * @width: The new link width
  *
  * Set device router link width to @width from router upstream port
- * perspective. Supports also asymmetric links if the routers boths side
+ * perspective. Supports also asymmetric links if the routers both side
  * of the link supports it.
  *
  * Does nothing for host router.
-- 
2.46.0

Re: [PATCH 2/2] thunderbolt: Fix typos in documentation comments

[Mika Westerberg]

On Sun, Jun 22, 2025 at 10:17:03AM -0700, Alok Tiwari wrote:
> Fixes two minor typos in Thunderbolt driver comments:
> Correct "passwd" -> "passed" in nvm.c.
> Correct "boths" -> "both" in switch.c.
> 
> Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>

Applied to thunderbolt.git/next, thanks!

Re: [PATCH 1/2] thunderbolt: Fix redundant Bit masking of ADP_DP_CS_1_AUX_RX_HOPID_MASK

[Mika Westerberg]

On Sun, Jun 22, 2025 at 10:17:02AM -0700, Alok Tiwari wrote:
> 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
> hop ID 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")
> Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>

Applied to thunderbolt.git/fixes, thanks!