sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

miidev: fix 1G wrong detection 

since 99e72c8bbd on an i.MX51 based board,
I get : "phy0: Link is up - 1000/Full". It seems miidev tries to probe
the PHY to early and gets 0x3ffff which leads to the wrong capabilities
setting.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Eric Bénard 2012-09-06 21:39:31 +02:00 committed by Sascha Hauer
parent 8166603baa
commit 3facad280b
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/miidev.c
View File

@ -131,6 +131,14 @@ int miidev_get_status(struct mii_device *mdev)
status = ret & BMSR_LSTATUS ? MIIDEV_STATUS_IS_UP : 0;
if (ret & BMSR_ESTATEN) {
ret = mii_read(mdev, mdev->address, MII_ESTATUS);
if (ret < 0)
goto err_out;
if (ret & (ESTATUS_1000_TFULL | ESTATUS_1000_THALF))
mdev->capabilities = MIIDEV_CAPABLE_1000M;
}
ret = mii_read(mdev, mdev->address, MII_BMCR);
if (ret < 0)
goto err_out;
@ -239,27 +247,8 @@ static struct file_operations miidev_ops = {
static int miidev_probe(struct device_d *dev)
{
struct mii_device *mdev = dev->priv;
int val;
int caps = 0;
val = mii_read(mdev, mdev->address, MII_PHYSID1);
if (val < 0 || val == 0xffff)
goto err_out;
val = mii_read(mdev, mdev->address, MII_PHYSID2);
if (val < 0 || val == 0xffff)
goto err_out;
val = mii_read(mdev, mdev->address, MII_BMSR);
if (val < 0)
goto err_out;
if (val & BMSR_ESTATEN) {
val = mii_read(mdev, mdev->address, MII_ESTATUS);
if (val < 0)
goto err_out;
if (val & (ESTATUS_1000_TFULL | ESTATUS_1000_THALF))
caps = MIIDEV_CAPABLE_1000M;
}
mdev->capabilities = caps;
mdev->capabilities = 0;
mdev->cdev.name = asprintf("phy%d", dev->id);
mdev->cdev.size = 64;
mdev->cdev.ops = &miidev_ops;
@ -268,10 +257,6 @@ static int miidev_probe(struct device_d *dev)
devfs_create(&mdev->cdev);
list_add_tail(&mdev->list, &miidev_list);
return 0;
err_out:
dev_err(dev, "cannot read PHY registers (addr %d)\n", mdev->address);
return -ENODEV;
}
static void miidev_remove(struct device_d *dev)