linux-stable.git/drivers/net/phy/phy_device.c, branch v4.2.6

phylib: Make PHYs children of their MDIO bus, not the bus' parent.

2015-08-25T18:30:23+00:00

commit 18ee49ddb0d2 ("phylib: rename mii_bus::dev to mii_bus::parent")
changed the parent of PHY devices from the bus to the bus parent.

Then, commit 4dea547fef1b ("phylib: rework to prepare for OF
registration of PHYs") moved the code into phy_device.c

At this point, it is somewhat unclear why the change was seen as
necessary.  But, when we look at the device model tree in
/sys/devices, it is clearly incorrect.  The PHYs should be children of
their MDIO bus.

Change the PHY's parent device to be the MDIO bus device.

Cc: Lennert Buytenhek 
Cc: Grant Likely 
Signed-off-by: David Daney 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

net/phy: tune get_phy_c45_ids to support more c45 phy

2015-06-29T00:05:58+00:00

As some C45 10G PHYs(e.g. Cortina CS4315/CS4340 PHY) have
zero Devices In package, current driver can't get correct
devices_in_package value by non-zero Devices In package.
so let's probe more with zero Devices In package to support
more C45 PHYs.

Signed-off-by: Shengzhou Liu 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: phy: fix phy link up when limiting speed via device tree

2015-06-28T23:59:10+00:00

When limiting phy link speed using "max-speed" to 100mbps or less on a
giga bit phy, phy never completes auto negotiation and phy state
machine is held in PHY_AN. Fixing this issue by comparing the giga
bit advertise though phydev->supported doesn't have it but phy has
BMSR_ESTATEN set. So that auto negotiation is restarted as old and
new advertise are different and link comes up fine.

Signed-off-by: Mugunthan V N 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: phy: keep track of the PHY suspend state

2015-01-27T08:16:51+00:00

In order to avoid double calls to phydev->drv->suspend and resume, keep
track of whether the PHY has already been suspended as a consequence of
a successful call to phy_suspend(). We will use this in our MDIO bus
suspend/resume hooks to avoid a double suspend call.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

phylib: use MDIO_DEVS[12]

2014-08-23T04:16:51+00:00

The bare register numbers are used despite  has MDIO_DEVS[12]
#define'd for those.

Signed-off-by: Sergei Shtylyov 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-07-30T20:25:49+00:00

Signed-off-by: David S. Miller

net: phy: re-apply PHY fixups during phy_register_device

2014-07-29T19:25:57+00:00

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

net: phy: Ensure the MDIO bus module is held

2014-07-25T01:09:52+00:00

This commit adds proper module_{get,put} to prevent the MDIO bus module
from being unloaded while the phydev is connected. By doing so, we fix
a kernel panic produced when a MDIO driver is removed, but the phydev
that relies on it is attached and running.

Signed-off-by: Ezequiel Garcia 
Reviewed-by: Florian Fainelli 
Tested-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: phy: export phy_suspend and phy_resume

2014-07-09T04:06:50+00:00

phy_suspend and phy_resume are two commonly used helper functions that
need to be exported for Ethernet drivers to be built as modules

Fixes: 40755a0fce17 ("net: systemport: add suspend and resume support")
Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-05-24T04:32:30+00:00

Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller