From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (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 3D7B9376BCD for ; Wed, 1 Apr 2026 07:21:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775028081; cv=none; b=O8KxWK32BZupk8ZvH6n02K32rlwpFQf+61sXuaEI9RLne1p7E5vQszJLkT82W2jYuvL23gOP8rY7Rzt02uEWt69LXkkRlmUS9L8opgAkrggbYP8xO4iQQkJYpLo+0MfVrYZTZK1zw5LSxfWX5CRNtlCweLK8pDO5PeTv8sCFqcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775028081; c=relaxed/simple; bh=45Z9/8L404o8fyU6ZRA4Ic68ljK+tjhBNlBWR/gMSKA=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=mqi7YlhZJvXeAL9zbqIpibRo5xwKUVXC9uUy6qMl27mvJz24NuUHYgEU4tr2idHfvR99kGu91/q+3XCHxpOBmM8E9+yl1p75JDdN50O1tTW7uKX1fKm2xbakS+/HOcTbB139gDhu0YuMwbNB08hdoYQnOSX3w/umwSWLRuKuqUM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=LL7CK2b9; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="LL7CK2b9" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5d+H2rXx1nuwhXiwShueydgaYgP8xz5FGnuXucGTjWc=; b=LL7CK2b9z5VgF+YxGgsY226KOw XnQah7NwA6TxACg/Y8SQzXuOeV4yp/ylUO8DgH3kEiW0pPI7XG8bP1Do7LM9NCaeTFA+1C47+itmW 0RT6sVjlrmzxJKpYyCf8463bycYWBLIPb+eDUhLfOBciVadH9MF3jxkS6bl+OHHP1oMwWiEC/XX09 nTXZ/tgSvdw9P4sl1ccKw47yU2ACSSdzyeSbdnpfk8czIzvjcHzkzXzWhENtsRvQge7K2gazrJHIE /T6Im96gMVndcIl7ufsKSFfdbh3NVb2XsUl/O40Ga2OjeEPiWgS6eW4aUuPwT09RLt9P7Tv+2u83J fRxjN0TA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:56388 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1w7pt4-000000002fW-4BaQ; Wed, 01 Apr 2026 08:21:15 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1w7pt4-0000000Easn-14WL; Wed, 01 Apr 2026 08:21:14 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, Ong Boon Leong , Paolo Abeni Subject: [PATCH net-next v2 01/14] net: stmmac: fix channel TSO enable on resume Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Wed, 01 Apr 2026 08:21:14 +0100 Rather than configuring the channels depending on whether GSO/TSO is currently enabled by the user, always enable if the hardware has TSO support and the platform wants TSO to be enabled. This avoids the channel TSO enable bit being disabled after a resume when the user has disabled TSO features. This will cause problems when the user re-enables TSO. This bug goes back to commit f748be531d70 ("stmmac: support new GMAC4") Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ce51b9c22129..cd76f62e1b6e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3705,7 +3705,7 @@ static int stmmac_hw_setup(struct net_device *dev) stmmac_set_rings_length(priv); /* Enable TSO */ - if (priv->tso) { + if (priv->dma_cap.tsoen && priv->plat->flags & STMMAC_FLAG_TSO_EN) { for (chan = 0; chan < tx_cnt; chan++) { struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[chan]; -- 2.47.3