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

Commit 4d8f0825 authored by Byungho An's avatar Byungho An Committed by David S. Miller
Browse files

stmmac: modified pcs mode support for SGMII 



This patch modifies the pcs mode support for SGMII. Even though
SGMII does auto-negotiation with phy, it needs stmmac_init_phy and
stmmac_mdio_register function for initializing phy.

Signed-off-by: default avatarByungho An <bh74.an@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 779d835e

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

+8 −4
Original line number Diff line number Diff line
@@ -1504,7 +1504,8 @@ static int stmmac_open(struct net_device *dev) 


	stmmac_check_ether_addr(priv);



	if (!priv->pcs) {

	if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&

	    priv->pcs != STMMAC_PCS_RTBI) {

		ret = stmmac_init_phy(dev);

		if (ret) {

			pr_err("%s: Cannot attach to PHY (error: %d)\n",
@@ -1607,7 +1608,8 @@ static int stmmac_open(struct net_device *dev) 
	/* Using PCS we cannot dial with the phy registers at this stage

	 * so we do not support extra feature like EEE.

	 */

	if (!priv->pcs)

	if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&

	    priv->pcs != STMMAC_PCS_RTBI)

		priv->eee_enabled = stmmac_eee_init(priv);



	stmmac_init_tx_coalesce(priv);
@@ -2637,7 +2639,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device, 


	stmmac_check_pcs_mode(priv);



	if (!priv->pcs) {

	if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&

	    priv->pcs != STMMAC_PCS_RTBI) {

		/* MDIO bus Registration */

		ret = stmmac_mdio_register(ndev);

		if (ret < 0) {
@@ -2677,7 +2680,8 @@ int stmmac_dvr_remove(struct net_device *ndev) 
	priv->hw->dma->stop_tx(priv->ioaddr);



	stmmac_set_mac(priv->ioaddr, false);

	if (!priv->pcs)

	if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&

	    priv->pcs != STMMAC_PCS_RTBI)

		stmmac_mdio_unregister(ndev);

	netif_carrier_off(ndev);

	unregister_netdev(ndev);