Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29feff39 authored by Joao Pinto's avatar Joao Pinto Committed by David S. Miller
Browse files

net: stmmac: flow_ctrl functions adapted to mtl 



This patch adapts flow_ctrl function to prepare it for multiple queues.

Signed-off-by: default avatarJoao Pinto <jpinto@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d43042f4

drivers/net/ethernet/stmicro/stmmac/common.h

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ struct stmmac_ops { 
	void (*set_filter)(struct mac_device_info *hw, struct net_device *dev);

	/* Flow control setting */

	void (*flow_ctrl)(struct mac_device_info *hw, unsigned int duplex,

			  unsigned int fc, unsigned int pause_time);

			  unsigned int fc, unsigned int pause_time, u32 tx_cnt);

	/* Set power management mode (e.g. magic frame) */

	void (*pmt)(struct mac_device_info *hw, unsigned long mode);

	/* Set/Get Unicast MAC addresses */

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

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, 




static void dwmac1000_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,

				unsigned int fc, unsigned int pause_time)

				unsigned int fc, unsigned int pause_time,

				u32 tx_cnt)

{

	void __iomem *ioaddr = hw->pcsr;

	/* Set flow such that DZPQ in Mac Register 6 is 0,

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

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ static void dwmac100_set_filter(struct mac_device_info *hw, 
}



static void dwmac100_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,

			       unsigned int fc, unsigned int pause_time)

			       unsigned int fc, unsigned int pause_time,

			       u32 tx_cnt)

{

	void __iomem *ioaddr = hw->pcsr;

	unsigned int flow = MAC_FLOW_CTRL_ENABLE;

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

+13 −7
Original line number Diff line number Diff line
@@ -336,11 +336,12 @@ static void dwmac4_set_filter(struct mac_device_info *hw, 
}



static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,

			     unsigned int fc, unsigned int pause_time)

			     unsigned int fc, unsigned int pause_time,

			     u32 tx_cnt)

{

	void __iomem *ioaddr = hw->pcsr;

	u32 channel = STMMAC_CHAN0;	/* FIXME */

	unsigned int flow = 0;

	u32 queue = 0;



	pr_debug("GMAC Flow-Control:\n");

	if (fc & FLOW_RX) {
@@ -350,13 +351,18 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex, 
	}

	if (fc & FLOW_TX) {

		pr_debug("\tTransmit Flow-Control ON\n");

		flow |= GMAC_TX_FLOW_CTRL_TFE;

		writel(flow, ioaddr + GMAC_QX_TX_FLOW_CTRL(channel));



		if (duplex) {

		if (duplex)

			pr_debug("\tduplex mode: PAUSE %d\n", pause_time);

			flow |= (pause_time << GMAC_TX_FLOW_CTRL_PT_SHIFT);

			writel(flow, ioaddr + GMAC_QX_TX_FLOW_CTRL(channel));



		for (queue = 0; queue < tx_cnt; queue++) {

			flow |= GMAC_TX_FLOW_CTRL_TFE;



			if (duplex)

				flow |=

				(pause_time << GMAC_TX_FLOW_CTRL_PT_SHIFT);



			writel(flow, ioaddr + GMAC_QX_TX_FLOW_CTRL(queue));

		}

	}

}

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

+2 −1
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ stmmac_set_pauseparam(struct net_device *netdev, 
		      struct ethtool_pauseparam *pause)

{

	struct stmmac_priv *priv = netdev_priv(netdev);

	u32 tx_cnt = priv->plat->tx_queues_to_use;

	struct phy_device *phy = netdev->phydev;

	int new_pause = FLOW_OFF;
@@ -511,7 +512,7 @@ stmmac_set_pauseparam(struct net_device *netdev, 
	}



	priv->hw->mac->flow_ctrl(priv->hw, phy->duplex, priv->flow_ctrl,

				 priv->pause);

				 priv->pause, tx_cnt);

	return 0;

}