diff options
| author | Eric Bénard <eric@eukrea.com> | 2012-09-06 21:39:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-14 09:03:03 +0200 |
| commit | 79101c609c57798efbd74238939cbe61f916cede (patch) | |
| tree | 497e1b5500ab4dbec0ca2da8f5b69133e61d19ad | |
| parent | 8b3bf5971afbdf1acc5becabb6f15ba4b2a5559d (diff) | |
| download | barebox-79101c609c57798efbd74238939cbe61f916cede.tar.gz barebox-79101c609c57798efbd74238939cbe61f916cede.tar.xz | |
miidev: fix 1G wrong detection
since 99e72c8bbdbdc690025a5868d831f1fe79ad56fc 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>
| -rw-r--r-- | drivers/net/miidev.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/drivers/net/miidev.c b/drivers/net/miidev.c index 75b53e3c5c..e0f9d67d93 100644 --- a/drivers/net/miidev.c +++ b/drivers/net/miidev.c @@ -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) |