diff options
| author |   Matt Carlson <mcarlson@broadcom.com> | 2011-04-20 07:57:38 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-04-21 17:05:56 -0700 |
| commit | 34eea5ac214353ccd93ef7dd8dbd10aed87f5f46 (patch) | |
| tree | 73c13f9fc49f7c7a0ef517adca25c847dc214d44 /drivers/net/tg3.c | |
| parent | tg3: Nullify RSS for loopback test (diff) | |
| download | linux-dev-34eea5ac214353ccd93ef7dd8dbd10aed87f5f46.tar.xz linux-dev-34eea5ac214353ccd93ef7dd8dbd10aed87f5f46.zip | |
tg3: Only allow phy ioctls while netif_running
When tg3 was new, phy accesses through ioctl were allowable at any time.
Then, the driver started shutting down the phy when the device was
closed. Phy accesses would be allowed when the driver first attached to
the device, but then would be forbidden after the device had been up'd
and down'd. After that, management firmware made it illegal to access
the phy unless the driver "owned" the device. Now that most firmware
is being moved over to the APE, it is less clear when phy accesses are
safe.
While it is possible to attempt to identify these conditions and code
the driver to navigate through the pitfalls, it could be perplexing to
the admin why phy accesses work in some cases and not others. This
patch brings some uniformity to the problem by only allowing phy
accesses while the driver has control of the device.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 1f233c49b4f0..e134e484aee3 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -11444,9 +11444,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) break; /* We have no PHY */ - if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) || - ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && - !netif_running(dev))) + if (!netif_running(dev)) return -EAGAIN; spin_lock_bh(&tp->lock); @@ -11462,9 +11460,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) break; /* We have no PHY */ - if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) || - ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && - !netif_running(dev))) + if (!netif_running(dev)) return -EAGAIN; spin_lock_bh(&tp->lock); |