Commit 4b4a8ec2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-xgmac-minor-fixes' 

Rohan G Thomas says:

====================
net: stmmac: xgmac: Minor fixes

This patch series includes following minor fixes for stmmac
dwxgmac driver:

    1. Disable Rx FIFO overflow interrupt for dwxgmac
    2. Correct supported speed modes for dwxgmac
    3. Check for coe-unsupported flag before setting CIC bit of
       Tx Desc3 in the AF_XDP flow

v2: https://lore.kernel.org/20250816-xgmac-minor-fixes-v2-0-699552cf8a7f@altera.com
v1: https://lore.kernel.org/20250714-xgmac-minor-fixes-v1-0-c34092a88a72@altera.com
====================

Link: https://patch.msgid.link/20250825-xgmac-minor-fixes-v3-0-c225fe4444c0@altera.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 24be0900 b1eded58

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

+11 −2
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ static void dwxgmac2_core_init(struct mac_device_info *hw, 
	writel(XGMAC_INT_DEFAULT_EN, ioaddr + XGMAC_INT_EN);

}



static void dwxgmac2_update_caps(struct stmmac_priv *priv)

{

	if (!priv->dma_cap.mbps_10_100)

		priv->hw->link.caps &= ~(MAC_10 | MAC_100);

	else if (!priv->dma_cap.half_duplex)

		priv->hw->link.caps &= ~(MAC_10HD | MAC_100HD);

}



static void dwxgmac2_set_mac(void __iomem *ioaddr, bool enable)

{

	u32 tx = readl(ioaddr + XGMAC_TX_CONFIG);
@@ -1424,6 +1432,7 @@ static void dwxgmac2_set_arp_offload(struct mac_device_info *hw, bool en, 


const struct stmmac_ops dwxgmac210_ops = {

	.core_init = dwxgmac2_core_init,

	.update_caps = dwxgmac2_update_caps,

	.set_mac = dwxgmac2_set_mac,

	.rx_ipc = dwxgmac2_rx_ipc,

	.rx_queue_enable = dwxgmac2_rx_queue_enable,
@@ -1532,8 +1541,8 @@ int dwxgmac2_setup(struct stmmac_priv *priv) 
		mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);



	mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

			 MAC_1000FD | MAC_2500FD | MAC_5000FD |

			 MAC_10000FD;

			 MAC_10 | MAC_100 | MAC_1000FD |

			 MAC_2500FD | MAC_5000FD | MAC_10000FD;

	mac->link.duplex = 0;

	mac->link.speed10 = XGMAC_CONFIG_SS_10_MII;

	mac->link.speed100 = XGMAC_CONFIG_SS_100_MII;

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c

+5 −4
Original line number Diff line number Diff line
@@ -203,10 +203,6 @@ static void dwxgmac2_dma_rx_mode(struct stmmac_priv *priv, void __iomem *ioaddr, 
	}



	writel(value, ioaddr + XGMAC_MTL_RXQ_OPMODE(channel));



	/* Enable MTL RX overflow */

	value = readl(ioaddr + XGMAC_MTL_QINTEN(channel));

	writel(value | XGMAC_RXOIE, ioaddr + XGMAC_MTL_QINTEN(channel));

}



static void dwxgmac2_dma_tx_mode(struct stmmac_priv *priv, void __iomem *ioaddr,
@@ -386,8 +382,11 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, 
static int dwxgmac2_get_hw_feature(void __iomem *ioaddr,

				   struct dma_features *dma_cap)

{

	struct stmmac_priv *priv;

	u32 hw_cap;



	priv = container_of(dma_cap, struct stmmac_priv, dma_cap);



	/* MAC HW feature 0 */

	hw_cap = readl(ioaddr + XGMAC_HW_FEATURE0);

	dma_cap->edma = (hw_cap & XGMAC_HWFEAT_EDMA) >> 31;
@@ -410,6 +409,8 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, 
	dma_cap->vlhash = (hw_cap & XGMAC_HWFEAT_VLHASH) >> 4;

	dma_cap->half_duplex = (hw_cap & XGMAC_HWFEAT_HDSEL) >> 3;

	dma_cap->mbps_1000 = (hw_cap & XGMAC_HWFEAT_GMIISEL) >> 1;

	if (dma_cap->mbps_1000 && priv->synopsys_id >= DWXGMAC_CORE_2_20)

		dma_cap->mbps_10_100 = 1;



	/* MAC HW feature 1 */

	hw_cap = readl(ioaddr + XGMAC_HW_FEATURE1);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −2
Original line number Diff line number Diff line
@@ -2584,6 +2584,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget) 
	struct netdev_queue *nq = netdev_get_tx_queue(priv->dev, queue);

	struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[queue];

	struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[queue];

	bool csum = !priv->plat->tx_queues_cfg[queue].coe_unsupported;

	struct xsk_buff_pool *pool = tx_q->xsk_pool;

	unsigned int entry = tx_q->cur_tx;

	struct dma_desc *tx_desc = NULL;
@@ -2671,7 +2672,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,

				       true, priv->mode, true, true,

				       csum, priv->mode, true, true,

				       xdp_desc.len);



		stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
@@ -4983,6 +4984,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue, 
{

	struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[queue];

	struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[queue];

	bool csum = !priv->plat->tx_queues_cfg[queue].coe_unsupported;

	unsigned int entry = tx_q->cur_tx;

	struct dma_desc *tx_desc;

	dma_addr_t dma_addr;
@@ -5034,7 +5036,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,

			       true, priv->mode, true, true,

			       csum, priv->mode, true, true,

			       xdpf->len);



	tx_q->tx_count_frames++;