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

Commit 7cfde0af authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Run HWIF Quirks after getting HW caps 



Currently we were running HWIF quirks before getting HW capabilities.
This is not right because some HWIF callbacks depend on HW caps.

Lets save the quirks callback and use it in a later stage.

This fixes Altera socfpga.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Fixes: 5f0456b4 ("net: stmmac: Implement logic to automatically select HW Interface")
Reported-by: default avatarDinh Nguyen <dinh.linux@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6a6f203

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

+2 −7
Original line number Diff line number Diff line
@@ -252,13 +252,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv) 
				return ret;

		}



		/* Run quirks, if needed */

		if (entry->quirks) {

			ret = entry->quirks(priv);

			if (ret)

				return ret;

		}



		/* Save quirks, if needed for posterior use */

		priv->hwif_quirks = entry->quirks;

		return 0;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ struct stmmac_priv { 
	struct net_device *dev;

	struct device *device;

	struct mac_device_info *hw;

	int (*hwif_quirks)(struct stmmac_priv *priv);

	struct mutex lock;



	/* RX Queue */

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

+7 −0
Original line number Diff line number Diff line
@@ -4135,6 +4135,13 @@ static int stmmac_hw_init(struct stmmac_priv *priv) 
	if (priv->dma_cap.tsoen)

		dev_info(priv->device, "TSO supported\n");



	/* Run HW quirks, if any */

	if (priv->hwif_quirks) {

		ret = priv->hwif_quirks(priv);

		if (ret)

			return ret;

	}



	return 0;

}