From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 041F1220696; Mon, 18 Aug 2025 13:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523756; cv=none; b=teFxO4Aag9dyLjRkY04zzf6aIM3J9zvmMa+F5DdbpzQPkTosKyNjFgYRpd9i9grbB9Q+hwdB5ZK3w4kH6noRQ9C1N82RV07zln8C4XuRq8ng3cYfFHsb8EbYUlwe17UHv6Lh3D6UbX+4vPOZoM0uLkhs6oWIsRJrPVbmWXnrncw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523756; c=relaxed/simple; bh=ano8SGac4oYuvGBDezsHtkCKSEivibTX89gbNtZ1INA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NMvJmcd8L3331FErF3umdfnNAA/DT7LvFej21GZppke81Pk6D/YHujxlLf7/xzvESLN2xSh6Ntlcc5zZMu5lyC3l4NTrBOxyVHlQpyyQ0udSpAHK3cgI11NJ+FYe8yz1SyScofUDefoBOvIp7DaCeMa2BbcgzdPAeXUJR8/LcIY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kIym8hEh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kIym8hEh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B5D3C4CEEB; Mon, 18 Aug 2025 13:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523755; bh=ano8SGac4oYuvGBDezsHtkCKSEivibTX89gbNtZ1INA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIym8hEhcORLmBP9xCIEiMTxLyH6fBHm++5cmAjAuMDpqneB7Uetn8625yIzxpgFF gb/B3r2m+jTGfVG7rd+Fs37TYCWvY3eJqGOO8Tav94U4MSojQgLtskdt6NhqW/o4Qn ubhowgSG4U/+8Q2YJBCgFdjJxRbWVm3X7NiZ4KqI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mika Westerberg , zhangjianrong , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.15 264/515] net: thunderbolt: Enable end-to-end flow control also in transmit Date: Mon, 18 Aug 2025 14:44:10 +0200 Message-ID: <20250818124508.584889615@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: zhangjianrong [ Upstream commit a8065af3346ebd7c76ebc113451fb3ba94cf7769 ] According to USB4 specification, if E2E flow control is disabled for the Transmit Descriptor Ring, the Host Interface Adapter Layer shall not require any credits to be available before transmitting a Tunneled Packet from this Transmit Descriptor Ring, so e2e flow control should be enabled in both directions. Acked-by: Mika Westerberg Link: https://lore.kernel.org/20250624153805.GC2824380@black.fi.intel.com Signed-off-by: zhangjianrong Link: https://patch.msgid.link/20250628093813.647005-1-zhangjianrong5@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/thunderbolt/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/thunderbolt/main.c b/drivers/net/thunderbolt/main.c index 0a53ec293d04..643cf67840b5 100644 --- a/drivers/net/thunderbolt/main.c +++ b/drivers/net/thunderbolt/main.c @@ -924,8 +924,12 @@ static int tbnet_open(struct net_device *dev) netif_carrier_off(dev); - ring = tb_ring_alloc_tx(xd->tb->nhi, -1, TBNET_RING_SIZE, - RING_FLAG_FRAME); + flags = RING_FLAG_FRAME; + /* Only enable full E2E if the other end supports it too */ + if (tbnet_e2e && net->svc->prtcstns & TBNET_E2E) + flags |= RING_FLAG_E2E; + + ring = tb_ring_alloc_tx(xd->tb->nhi, -1, TBNET_RING_SIZE, flags); if (!ring) { netdev_err(dev, "failed to allocate Tx ring\n"); return -ENOMEM; @@ -944,11 +948,6 @@ static int tbnet_open(struct net_device *dev) sof_mask = BIT(TBIP_PDF_FRAME_START); eof_mask = BIT(TBIP_PDF_FRAME_END); - flags = RING_FLAG_FRAME; - /* Only enable full E2E if the other end supports it too */ - if (tbnet_e2e && net->svc->prtcstns & TBNET_E2E) - flags |= RING_FLAG_E2E; - ring = tb_ring_alloc_rx(xd->tb->nhi, -1, TBNET_RING_SIZE, flags, net->tx_ring.ring->hop, sof_mask, eof_mask, tbnet_start_poll, net); -- 2.39.5