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

Commit bc8ee596 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: mii: add generic function to support ksetting support 



The old ethtool api (get_setting and set_setting) has generic mii
functions mii_ethtool_sset and mii_ethtool_gset.

To support the new ethtool api ({get|set}_link_ksettings), we add
two generics mii function mii_ethtool_{get|set}_link_ksettings_get.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55454e9e

drivers/net/mii.c

+195 −0
Original line number Diff line number Diff line
@@ -134,6 +134,101 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) 
	return 0;

}



/**

 * mii_ethtool_get_link_ksettings - get settings that are specified in @cmd

 * @mii: MII interface

 * @cmd: requested ethtool_link_ksettings

 *

 * The @cmd parameter is expected to have been cleared before calling

 * mii_ethtool_get_link_ksettings().

 *

 * Returns 0 for success, negative on error.

 */

int mii_ethtool_get_link_ksettings(struct mii_if_info *mii,

				   struct ethtool_link_ksettings *cmd)

{

	struct net_device *dev = mii->dev;

	u16 bmcr, bmsr, ctrl1000 = 0, stat1000 = 0;

	u32 nego, supported, advertising, lp_advertising;



	supported = (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |

		     SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |

		     SUPPORTED_Autoneg | SUPPORTED_TP | SUPPORTED_MII);

	if (mii->supports_gmii)

		supported |= SUPPORTED_1000baseT_Half |

			SUPPORTED_1000baseT_Full;



	/* only supports twisted-pair */

	cmd->base.port = PORT_MII;



	/* this isn't fully supported at higher layers */

	cmd->base.phy_address = mii->phy_id;

	cmd->base.mdio_support = ETH_MDIO_SUPPORTS_C22;



	advertising = ADVERTISED_TP | ADVERTISED_MII;



	bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);

	bmsr = mii->mdio_read(dev, mii->phy_id, MII_BMSR);

	if (mii->supports_gmii) {

		ctrl1000 = mii->mdio_read(dev, mii->phy_id, MII_CTRL1000);

		stat1000 = mii->mdio_read(dev, mii->phy_id, MII_STAT1000);

	}

	if (bmcr & BMCR_ANENABLE) {

		advertising |= ADVERTISED_Autoneg;

		cmd->base.autoneg = AUTONEG_ENABLE;



		advertising |= mii_get_an(mii, MII_ADVERTISE);

		if (mii->supports_gmii)

			advertising |= mii_ctrl1000_to_ethtool_adv_t(ctrl1000);



		if (bmsr & BMSR_ANEGCOMPLETE) {

			lp_advertising = mii_get_an(mii, MII_LPA);

			lp_advertising |=

					mii_stat1000_to_ethtool_lpa_t(stat1000);

		} else {

			lp_advertising = 0;

		}



		nego = advertising & lp_advertising;



		if (nego & (ADVERTISED_1000baseT_Full |

			    ADVERTISED_1000baseT_Half)) {

			cmd->base.speed = SPEED_1000;

			cmd->base.duplex = !!(nego & ADVERTISED_1000baseT_Full);

		} else if (nego & (ADVERTISED_100baseT_Full |

				   ADVERTISED_100baseT_Half)) {

			cmd->base.speed = SPEED_100;

			cmd->base.duplex = !!(nego & ADVERTISED_100baseT_Full);

		} else {

			cmd->base.speed = SPEED_10;

			cmd->base.duplex = !!(nego & ADVERTISED_10baseT_Full);

		}

	} else {

		cmd->base.autoneg = AUTONEG_DISABLE;



		cmd->base.speed = ((bmcr & BMCR_SPEED1000 &&

				    (bmcr & BMCR_SPEED100) == 0) ?

				   SPEED_1000 :

				   ((bmcr & BMCR_SPEED100) ?

				    SPEED_100 : SPEED_10));

		cmd->base.duplex = (bmcr & BMCR_FULLDPLX) ?

			DUPLEX_FULL : DUPLEX_HALF;

	}



	mii->full_duplex = cmd->base.duplex;



	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,

						supported);

	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,

						advertising);

	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.lp_advertising,

						lp_advertising);



	/* ignore maxtxpkt, maxrxpkt for now */



	return 0;

}



/**

 * mii_ethtool_sset - set settings that are specified in @ecmd

 * @mii: MII interface
@@ -226,6 +321,104 @@ int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) 
	return 0;

}



/**

 * mii_ethtool_set_link_ksettings - set settings that are specified in @cmd

 * @mii: MII interfaces

 * @cmd: requested ethtool_link_ksettings

 *

 * Returns 0 for success, negative on error.

 */

int mii_ethtool_set_link_ksettings(struct mii_if_info *mii,

				   const struct ethtool_link_ksettings *cmd)

{

	struct net_device *dev = mii->dev;

	u32 speed = cmd->base.speed;



	if (speed != SPEED_10 &&

	    speed != SPEED_100 &&

	    speed != SPEED_1000)

		return -EINVAL;

	if (cmd->base.duplex != DUPLEX_HALF && cmd->base.duplex != DUPLEX_FULL)

		return -EINVAL;

	if (cmd->base.port != PORT_MII)

		return -EINVAL;

	if (cmd->base.phy_address != mii->phy_id)

		return -EINVAL;

	if (cmd->base.autoneg != AUTONEG_DISABLE &&

	    cmd->base.autoneg != AUTONEG_ENABLE)

		return -EINVAL;

	if ((speed == SPEED_1000) && (!mii->supports_gmii))

		return -EINVAL;



	/* ignore supported, maxtxpkt, maxrxpkt */



	if (cmd->base.autoneg == AUTONEG_ENABLE) {

		u32 bmcr, advert, tmp;

		u32 advert2 = 0, tmp2 = 0;

		u32 advertising;



		ethtool_convert_link_mode_to_legacy_u32(

			&advertising, cmd->link_modes.advertising);



		if ((advertising & (ADVERTISED_10baseT_Half |

				    ADVERTISED_10baseT_Full |

				    ADVERTISED_100baseT_Half |

				    ADVERTISED_100baseT_Full |

				    ADVERTISED_1000baseT_Half |

				    ADVERTISED_1000baseT_Full)) == 0)

			return -EINVAL;



		/* advertise only what has been requested */

		advert = mii->mdio_read(dev, mii->phy_id, MII_ADVERTISE);

		tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);

		if (mii->supports_gmii) {

			advert2 = mii->mdio_read(dev, mii->phy_id,

						 MII_CTRL1000);

			tmp2 = advert2 &

				~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);

		}

		tmp |= ethtool_adv_to_mii_adv_t(advertising);



		if (mii->supports_gmii)

			tmp2 |= ethtool_adv_to_mii_ctrl1000_t(advertising);

		if (advert != tmp) {

			mii->mdio_write(dev, mii->phy_id, MII_ADVERTISE, tmp);

			mii->advertising = tmp;

		}

		if ((mii->supports_gmii) && (advert2 != tmp2))

			mii->mdio_write(dev, mii->phy_id, MII_CTRL1000, tmp2);



		/* turn on autonegotiation, and force a renegotiate */

		bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);

		bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);

		mii->mdio_write(dev, mii->phy_id, MII_BMCR, bmcr);



		mii->force_media = 0;

	} else {

		u32 bmcr, tmp;



		/* turn off auto negotiation, set speed and duplexity */

		bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);

		tmp = bmcr & ~(BMCR_ANENABLE | BMCR_SPEED100 |

			       BMCR_SPEED1000 | BMCR_FULLDPLX);

		if (speed == SPEED_1000)

			tmp |= BMCR_SPEED1000;

		else if (speed == SPEED_100)

			tmp |= BMCR_SPEED100;

		if (cmd->base.duplex == DUPLEX_FULL) {

			tmp |= BMCR_FULLDPLX;

			mii->full_duplex = 1;

		} else {

			mii->full_duplex = 0;

		}

		if (bmcr != tmp)

			mii->mdio_write(dev, mii->phy_id, MII_BMCR, tmp);



		mii->force_media = 1;

	}

	return 0;

}



/**

 * mii_check_gmii_support - check if the MII supports Gb interfaces

 * @mii: the MII interface
@@ -466,7 +659,9 @@ MODULE_LICENSE("GPL"); 
EXPORT_SYMBOL(mii_link_ok);

EXPORT_SYMBOL(mii_nway_restart);

EXPORT_SYMBOL(mii_ethtool_gset);

EXPORT_SYMBOL(mii_ethtool_get_link_ksettings);

EXPORT_SYMBOL(mii_ethtool_sset);

EXPORT_SYMBOL(mii_ethtool_set_link_ksettings);

EXPORT_SYMBOL(mii_check_link);

EXPORT_SYMBOL(mii_check_media);

EXPORT_SYMBOL(mii_check_gmii_support);

include/linux/mii.h

+4 −0
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ struct mii_if_info { 
extern int mii_link_ok (struct mii_if_info *mii);

extern int mii_nway_restart (struct mii_if_info *mii);

extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);

extern int mii_ethtool_get_link_ksettings(

	struct mii_if_info *mii, struct ethtool_link_ksettings *cmd);

extern int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);

extern int mii_ethtool_set_link_ksettings(

	struct mii_if_info *mii, const struct ethtool_link_ksettings *cmd);

extern int mii_check_gmii_support(struct mii_if_info *mii);

extern void mii_check_link (struct mii_if_info *mii);

extern unsigned int mii_check_media (struct mii_if_info *mii,