linux-stable.git/drivers/net/phy, branch linux-3.15.y

net: phy: re-apply PHY fixups during phy_register_device

2014-08-14T01:51:48+00:00

[ Upstream commit d92f5dec6325079c550889883af51db1b77d5623 ]

Commit 87aa9f9c61ad ("net: phy: consolidate PHY reset in phy_init_hw()")
moved the call to phy_scan_fixups() in phy_init_hw() after a software
reset is performed.

By the time phy_init_hw() is called in phy_device_register(), no driver
has been bound to this PHY yet, so all the checks in phy_init_hw()
against the PHY driver and the PHY driver's config_init function will
return 0. We will therefore never call phy_scan_fixups() as we should.

Fix this by calling phy_scan_fixups() and check for its return value to
restore the intended functionality.

This broke PHY drivers which do register an early PHY fixup callback to
intercept the PHY probing and do things like changing the 32-bits unique
PHY identifier when a pseudo-PHY address has been used, as well as
board-specific PHY fixups that need to be applied during driver probe
time.

Reported-by: Hauke Merthens 
Reported-by: Jonas Gorski 
Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net: phy: resume phydev when going to RESUMING

2014-05-16T19:17:58+00:00

With commit be9dad1f9f26604fb ("net: phy: suspend phydev when going
to HALTED"), an unused PHY device will be put in a low-power mode
using BMCR_PDOWN. Some Ethernet drivers might be calling phy_start()
and phy_stop() from ndo_open and ndo_close() respectively, while
calling phy_connect() and phy_disconnect() from probe and remove.
In such a case, the PHY will be powered down during the phy_stop()
call, but will fail to be powered up in phy_start().
This patch fixes this scenario.

Signed-off-by: Jiancheng Xue 
Signed-off-by: Zhangfei Gao 
Signed-off-by: David S. Miller

net: phy: Don't call phy_resume if phy_init_hw failed

2014-05-16T02:56:43+00:00

After the call to phy_init_hw failed in phy_attach_direct, phy_detach is called
to detach the phy device from its network device. If the attached driver is a
generic phy driver, this also detaches the driver. Subsequently phy_resume
is called, which assumes without checking that a driver is attached to the
device. This will result in a crash such as

Unable to handle kernel paging request for data at address 0xffffffffffffff90
Faulting instruction address: 0xc0000000003a0e18
Oops: Kernel access of bad area, sig: 11 [#1]
...
NIP [c0000000003a0e18] .phy_attach_direct+0x68/0x17c
LR [c0000000003a0e6c] .phy_attach_direct+0xbc/0x17c
Call Trace:
[c0000003fc0475d0] [c0000000003a0e6c] .phy_attach_direct+0xbc/0x17c (unreliable)
[c0000003fc047670] [c0000000003a0ff8] .phy_connect_direct+0x28/0x98
[c0000003fc047700] [c0000000003f0074] .of_phy_connect+0x4c/0xa4

Only call phy_resume if phy_init_hw was successful.

Signed-off-by: Guenter Roeck 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: mdio-gpio: warn about missing bus alias id

2014-05-09T19:51:19+00:00

Use a sane default bus id (rather than -ENODEV) and print a warning when
the bus alias id is missing.

Signed-off-by: Johan Hovold 
Signed-off-by: David S. Miller

net phy: Check for aneg completion before setting state to PHY_RUNNING

2014-05-02T19:50:57+00:00

phy_state_machine should check whether auto-negotiatin is completed
before changing phydev->state from PHY_NOLINK to PHY_RUNNING. If
auto-negotiation is not completed phydev->state should be set to
PHY_AN.

Signed-off-by: Balakumaran Kannan 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller

net/phy: micrel: fix bugged test on device tree loading for ksz9021

2014-04-23T18:58:58+00:00

In ksz9021_load_values_from_of() val2 to val4 aren't tested against their
initialization value.
This causes the test to always succeed, and this value to be used as if it
was loaded from the devicetree instead of being ignored, in case of a
missing/invalid property in the ethernet OF device node.
As a result, the value "0" is written to the relevant registers.

Change the conditions to test against the right initialization value.

Signed-off-by: Hubert Chaumette 
Signed-off-by: David S. Miller

net: mdio-gpio: Add support for separate MDI and MDO gpio pins

2014-04-16T19:09:51+00:00

This is for a system with fixed assignments of input and output pins
(various variants of Kontron COMe).

Signed-off-by: Guenter Roeck 
Signed-off-by: David S. Miller

net: mdio-gpio: Add support for active low gpio pins

2014-04-16T19:09:51+00:00

Some systems using mdio-gpio may use active-low gpio pins
(eg with inverters or FETs connected to all or some of the
gpio pins).

Signed-off-by: Guenter Roeck 
Signed-off-by: David S. Miller

net: mdio-gpio: Use devm_ functions where possible

2014-04-16T19:09:51+00:00

This simplifies error path and deinit/removal functions.

Signed-off-by: Guenter Roeck 
Tested-by: Chris Healy 
Signed-off-by: David S. Miller

net phylib: Remove unnecessary condition check in phy

2014-04-09T17:03:53+00:00

This condition check makes no difference in the code flow since 3.10

Signed-off-by: Balakumaran Kannan 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller