RE: [PATCH 3/4] phylib: Support attaching to gen10g_driver
From: Shaohui Xie <hidden>
Date: 2013-11-12 12:31:53
Also in:
lkml, netdev
Added more people and list. Best Regards,=20 Shaohui Xie
-----Original Message----- From: shh.xie@gmail.com [mailto:shh.xie@gmail.com] Sent: Monday, November 11, 2013 7:08 PM To: linuxppc-dev@lists.ozlabs.org; linux-kernel@vger.kernel.org Cc: Bucur Madalin-Cristian-B32716; Kanetkar Shruti-B44454; Xie Shaohui-B2=
1989
Subject: [PATCH 3/4] phylib: Support attaching to gen10g_driver =20 From: Andy Fleming =20 phy_attach_direct() may now attach to a generic 10G driver. It can also b=
e used
exactly as phy_connect_direct(), which will be useful when using of_mdio,=
as
phy_connect (and therefore of_phy_connect) start the PHY state machine, w=
hich is
quoted hunk ↗ jump to hunk
currently irrelevant for 10G PHYs. =20 Signed-off-by: Andy Fleming Signed-off-by: Shaohui Xie <redacted> --- drivers/net/phy/phy_device.c | 23 +++++++++++------------ include/linux/phy.h | 2 ++ 2 files changed, 13 insertions(+), 12 deletions(-) =20diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c =
index
quoted hunk ↗ jump to hunk
30bf2d5..f51ea2e 100644--- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c@@ -55,15 +55,13 @@ static void phy_device_release(struct device *dev) }=20 static struct phy_driver genphy_driver; +static struct phy_driver gen10g_driver; extern int mdio_bus_init(void); extern void mdio_bus_exit(void); =20 static LIST_HEAD(phy_fixup_list); static DEFINE_MUTEX(phy_fixup_lock); =20 -static int phy_attach_direct(struct net_device *dev, struct phy_device *=
phydev,
- u32 flags, phy_interface_t interface); - /* * Creates a new phy_fixup and adds it to the list * @bus_id: A string which matches phydev->dev.bus_id (or PHY_ANY_ID) @@=
-
521,12 +519,12 @@ int phy_init_hw(struct phy_device *phydev) * * Description: Called by drivers to attach to a particular PHY * device. The phy_device is found, and properly hooked up - * to the phy_driver. If no driver is attached, then the - * genphy_driver is used. The phy_device is given a ptr to + * to the phy_driver. If no driver is attached, then a + * generic driver is used. The phy_device is given a ptr to * the attaching device, and given a callback for link status * change. The phy_device is returned to the attaching driver. */ -static int phy_attach_direct(struct net_device *dev, struct phy_device *=
phydev,
quoted hunk ↗ jump to hunk
+int phy_attach_direct(struct net_device *dev, struct phy_device +*phydev, u32 flags, phy_interface_t interface) { struct device *d =3D &phydev->dev;@@ -535,12 +533,10 @@ static int phy_attach_direct(struct net_device *dev=
,
quoted hunk ↗ jump to hunk
struct phy_device *phydev, /* Assume that if there is no driver, that it doesn't * exist, and we should use the genphy driver. */ if (NULL =3D=3D d->driver) { - if (phydev->is_c45) { - pr_err("No driver for phy %x\n", phydev->phy_id); - return -ENODEV; - } - - d->driver =3D &genphy_driver.driver; + if (phydev->is_c45) + d->driver =3D &gen10g_driver.driver; + else + d->driver =3D &genphy_driver.driver; =20 err =3D d->driver->probe(d); if (err >=3D 0)@@ -573,6 +569,7 @@ static int phy_attach_direct(struct net_device *dev, =
struct
phy_device *phydev, =20 return err; } +EXPORT_SYMBOL(phy_attach_direct); =20 /** * phy_attach - attach a network device to a particular PHY device @@ -6=
23,6
quoted hunk ↗ jump to hunk
+620,8 @@ void phy_detach(struct phy_device *phydev) * real driver could be loaded */ if (phydev->dev.driver =3D=3D &genphy_driver.driver) device_release_driver(&phydev->dev); + else if (phydev->dev.driver =3D=3D &gen10g_driver.driver) + device_release_driver(&phydev->dev); } EXPORT_SYMBOL(phy_detach); =20diff --git a/include/linux/phy.h b/include/linux/phy.h index f864004..f36=
a6f6
quoted hunk ↗ jump to hunk
100644--- a/include/linux/phy.h +++ b/include/linux/phy.h@@ -575,6 +575,8 @@ int phy_init_hw(struct phy_device *phydev); structphy_device * phy_attach(struct net_device *dev, const char *bus_id, phy_interface_t interface); struct phy_device *phy_find_first(struct mii_bus *bus); +int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, + u32 flags, phy_interface_t interface); int phy_connect_direct(struct net_device *dev, struct phy_device *phydev=
,
void (*handler)(struct net_device *), phy_interface_t interface); -- 1.8.4.1