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 39B6A3BFE33 for ; Wed, 18 Mar 2026 18:26:42 +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=1773858403; cv=none; b=HuB2M+N3fjtERmp2e1L62PrAljfs4AmSJ/iYRrL/NMj+U117ffk+TggVZbkcQPMmoXmRPJx1IicVO7ey2STZD6IqFRsfzo4vcCcN0sX948bJNzRvMd/d9BFVjBM9b9f4DwPwxhOBWbNN836iDrW7cbgw8jS8eHrQHLWg0isMdg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773858403; c=relaxed/simple; bh=dsvdDoyWlXYQz8miOhXFoE9qTq773TAaL6rQS/9NYt8=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=UOtGoM9G9jByhBAz5yg5Cy0pr4VD7Lwp+MCbEIwa9GVNsZLq5wXdCiBMnU5Ocuz6YwWaOn3gLrvhxIdXzWo1cLm4ee8QvDO42wueNvIdVRlGRo0uJ6QY5i/fmgWa3wpSKHEoehXRTfp9PeqQiUYGEg8ZF8cRqLY2jnTbhRN8Npc= 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=N7KHpjJ6; 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="N7KHpjJ6" 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=6F5RbYjwrweXgBMfc/nBuLz5ZDj05fkoaWvuU8RxfYs=; b=N7KHpjJ63v5uOrdTgBQ9CEaRLM mSLN3weBTgC9gkefZZnoPSk7We9TdYWp0S9ed3YTVRXtpddB8OSU0edDVrdNY46tPLdv8gZ0mwpZ+ biQawgKjNf0+a1B+MbnBM+/zGjZIumDo0bzgkuhWVuF6OrmQ/4Djr2mFAXnKO1aSDTN5Sqe92vaHS 04emqyua+Nfx1bGSj/EiwOWxqQCdD1dUoytoDi7OMqf1ZnXyi9QRpn9aDO+nqPajKbCQULH5R1nP3 6HTnq5oixTJUKuKDliyscVecSlZ3e+bHJF09miDwLHa/K6QV2vnmvTg1g+dGyXmIj94lhMv3IwGS3 JnSpcOcA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:56022 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 1w2vbG-000000003p3-3H0v; Wed, 18 Mar 2026 18:26:34 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1w2vbF-0000000DbWQ-4674; Wed, 18 Mar 2026 18:26:34 +0000 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, Paolo Abeni Subject: [PATCH net-next 1/5] net: stmmac: rename "mode" to "descriptor_mode" 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, 18 Mar 2026 18:26:33 +0000 priv->mode doesn't describe what it refers to, it is whether we operate the DMA descriptors as a ring or chain. It is also difficult to grep for as there are several "mode" struct members. Add "descriptor_" prefix. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 5 +++- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 24 ++++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index 71dac8c1a3ca..511b0fd5e834 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -57,11 +57,11 @@ static void stmmac_dwmac_mode_quirk(struct stmmac_priv *priv) if (priv->chain_mode) { dev_info(priv->device, "Chain mode enabled\n"); - priv->mode = STMMAC_CHAIN_MODE; + priv->descriptor_mode = STMMAC_CHAIN_MODE; mac->mode = &chain_mode_ops; } else { dev_info(priv->device, "Ring mode enabled\n"); - priv->mode = STMMAC_RING_MODE; + priv->descriptor_mode = STMMAC_RING_MODE; mac->mode = &ring_mode_ops; } } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index b9d849a3f06e..919a93a52390 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -323,7 +323,10 @@ struct stmmac_priv { bool extend_desc; /* chain_mode: requested descriptor mode */ bool chain_mode; - unsigned int mode; + /* descriptor_mode: actual descriptor mode, + * see STMMAC_CHAIN_MODE or STMMAC_RING_MODE + */ + u8 descriptor_mode; struct kernel_hwtstamp_config tstamp_config; struct ptp_clock *ptp_clock; struct ptp_clock_info ptp_clock_ops; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 0a933aac3f03..567499e74917 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1589,7 +1589,8 @@ static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, for (i = 0; i < dma_conf->dma_rx_size; i++) { desc = stmmac_get_rx_desc(priv, rx_q, i); - stmmac_init_rx_desc(priv, desc, priv->use_riwt, priv->mode, + stmmac_init_rx_desc(priv, desc, priv->use_riwt, + priv->descriptor_mode, (i == dma_conf->dma_rx_size - 1), dma_conf->dma_buf_sz); } @@ -1616,7 +1617,7 @@ static void stmmac_clear_tx_descriptors(struct stmmac_priv *priv, struct dma_desc *p; p = stmmac_get_tx_desc(priv, tx_q, i); - stmmac_init_tx_desc(priv, p, priv->mode, last); + stmmac_init_tx_desc(priv, p, priv->descriptor_mode, last); } } @@ -1925,7 +1926,7 @@ static int __init_dma_rx_desc_rings(struct stmmac_priv *priv, } /* Setup the chained descriptor addresses */ - if (priv->mode == STMMAC_CHAIN_MODE) { + if (priv->descriptor_mode == STMMAC_CHAIN_MODE) { if (priv->extend_desc) stmmac_mode_init(priv, rx_q->dma_erx, rx_q->dma_rx_phy, @@ -2027,7 +2028,7 @@ static int __init_dma_tx_desc_rings(struct stmmac_priv *priv, (u32)tx_q->dma_tx_phy); /* Setup the chained descriptor addresses */ - if (priv->mode == STMMAC_CHAIN_MODE) { + if (priv->descriptor_mode == STMMAC_CHAIN_MODE) { if (priv->extend_desc) stmmac_mode_init(priv, tx_q->dma_etx, tx_q->dma_tx_phy, @@ -2774,7 +2775,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget) } stmmac_prepare_tx_desc(priv, tx_desc, 1, xdp_desc.len, - csum, priv->mode, true, true, + csum, priv->descriptor_mode, true, true, xdp_desc.len); stmmac_enable_dma_transmission(priv, priv->ioaddr, queue); @@ -2948,7 +2949,7 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue, } } - stmmac_release_tx_desc(priv, p, priv->mode); + stmmac_release_tx_desc(priv, p, priv->descriptor_mode); entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size); } @@ -4794,7 +4795,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) /* Prepare the descriptor and set the own bit too */ stmmac_prepare_tx_desc(priv, desc, 0, len, csum_insertion, - priv->mode, 1, last_segment, skb->len); + priv->descriptor_mode, 1, last_segment, + skb->len); } stmmac_set_tx_dma_last_segment(tx_q, entry); @@ -4890,8 +4892,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) /* Prepare the first descriptor setting the OWN bit too */ stmmac_prepare_tx_desc(priv, first, 1, nopaged_len, - csum_insertion, priv->mode, 0, last_segment, - skb->len); + csum_insertion, priv->descriptor_mode, + 0, last_segment, skb->len); } if (tx_q->tbs & STMMAC_TBS_EN) { @@ -5119,7 +5121,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue, stmmac_set_desc_addr(priv, tx_desc, dma_addr); stmmac_prepare_tx_desc(priv, tx_desc, 1, xdpf->len, - csum, priv->mode, true, true, + csum, priv->descriptor_mode, true, true, xdpf->len); tx_q->tx_count_frames++; @@ -7432,7 +7434,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv) * is not expected to change this. */ priv->plat->dma_cfg->atds = priv->extend_desc && - priv->mode == STMMAC_RING_MODE; + priv->descriptor_mode == STMMAC_RING_MODE; /* Rx Watchdog is available in the COREs newer than the 3.40. * In some case, for example on bugged HW this feature -- 2.47.3