mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
[PATCH] emac: add support for platform-specific unsupported PHY features
This patch adds support to the ibm_emac driver for platform-specific unsupported PHY features. The patch attempts to determine the highest speed and duplex when autonegotiation is unsupported. Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
32b5bfab9a
commit
49a9db07ab
1 changed files with 31 additions and 0 deletions
|
@ -1875,6 +1875,9 @@ static int emac_init_device(struct ocp_device *ocpdev, struct ibm_ocp_mal *mal)
|
|||
rc = -ENODEV;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
/* Disable any PHY features not supported by the platform */
|
||||
ep->phy_mii.def->features &= ~emacdata->phy_feat_exc;
|
||||
|
||||
/* Setup initial PHY config & startup aneg */
|
||||
if (ep->phy_mii.def->ops->init)
|
||||
|
@ -1882,6 +1885,34 @@ static int emac_init_device(struct ocp_device *ocpdev, struct ibm_ocp_mal *mal)
|
|||
netif_carrier_off(ndev);
|
||||
if (ep->phy_mii.def->features & SUPPORTED_Autoneg)
|
||||
ep->want_autoneg = 1;
|
||||
else {
|
||||
ep->want_autoneg = 0;
|
||||
|
||||
/* Select highest supported speed/duplex */
|
||||
if (ep->phy_mii.def->features & SUPPORTED_1000baseT_Full) {
|
||||
ep->phy_mii.speed = SPEED_1000;
|
||||
ep->phy_mii.duplex = DUPLEX_FULL;
|
||||
} else if (ep->phy_mii.def->features &
|
||||
SUPPORTED_1000baseT_Half) {
|
||||
ep->phy_mii.speed = SPEED_1000;
|
||||
ep->phy_mii.duplex = DUPLEX_HALF;
|
||||
} else if (ep->phy_mii.def->features &
|
||||
SUPPORTED_100baseT_Full) {
|
||||
ep->phy_mii.speed = SPEED_100;
|
||||
ep->phy_mii.duplex = DUPLEX_FULL;
|
||||
} else if (ep->phy_mii.def->features &
|
||||
SUPPORTED_100baseT_Half) {
|
||||
ep->phy_mii.speed = SPEED_100;
|
||||
ep->phy_mii.duplex = DUPLEX_HALF;
|
||||
} else if (ep->phy_mii.def->features &
|
||||
SUPPORTED_10baseT_Full) {
|
||||
ep->phy_mii.speed = SPEED_10;
|
||||
ep->phy_mii.duplex = DUPLEX_FULL;
|
||||
} else {
|
||||
ep->phy_mii.speed = SPEED_10;
|
||||
ep->phy_mii.duplex = DUPLEX_HALF;
|
||||
}
|
||||
}
|
||||
emac_start_link(ep, NULL);
|
||||
|
||||
/* read the MAC Address */
|
||||
|
|
Loading…
Reference in a new issue