diff mbox series

[net-next,5/8] smsc95xx: use PAL framework read/write functions

Message ID 574a2386c1b9ed6c18ce0f20d7afbae0826faaae.camel@microchip.com
State Changes Requested
Delegated to: David Miller
Headers show
Series [net-next,1/8] smsc95xx: check return value of smsc95xx_reset | expand

Commit Message

Andre Edich June 29, 2020, 1:12 p.m. UTC 
Use functions phy_read and phy_write instead of smsc95xx_mdio_read and
smsc95xx_mdio_write respectively.

Signed-off-by: Andre Edich <andre.edich@microchip.com>
---
 drivers/net/usb/smsc95xx.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

 		  "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
@@ -753,10 +753,11 @@ static int smsc95xx_ethtool_set_wol(struct
net_device *net,
 static int get_mdix_status(struct net_device *net)
 {
 	struct usbnet *dev = netdev_priv(net);
+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-
>data[0]);
 	u32 val;
 	int buf;
 
-	buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
SPECIAL_CTRL_STS);
+	buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
 	if (buf & SPECIAL_CTRL_STS_OVRRD_AMDIX_) {
 		if (buf & SPECIAL_CTRL_STS_AMDIX_ENABLE_)
 			return ETH_TP_MDI_AUTO;
@@ -782,39 +783,31 @@ static void set_mdix_status(struct net_device
*net, __u8 mdix_ctrl)
 	    (pdata->chip_id == ID_REV_CHIP_ID_89530_) ||
 	    (pdata->chip_id == ID_REV_CHIP_ID_9730_)) {
 		/* Extend Manual AutoMDIX timer for 9500A/9500Ai */
-		buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
-					 PHY_EDPD_CONFIG);
+		buf = phy_read(pdata->phydev, PHY_EDPD_CONFIG);
 		buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_;
-		smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
-				    PHY_EDPD_CONFIG, buf);
+		phy_write(pdata->phydev, PHY_EDPD_CONFIG, buf);
 	}
 
 	if (mdix_ctrl == ETH_TP_MDI) {
-		buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
-					 SPECIAL_CTRL_STS);
+		buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
 		buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
 		buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
 			 SPECIAL_CTRL_STS_AMDIX_STATE_);
-		smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
-				    SPECIAL_CTRL_STS, buf);
+		phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf);
 	} else if (mdix_ctrl == ETH_TP_MDI_X) {
-		buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
-					 SPECIAL_CTRL_STS);
+		buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
 		buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
 		buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
 			 SPECIAL_CTRL_STS_AMDIX_STATE_);
 		buf |= SPECIAL_CTRL_STS_AMDIX_STATE_;
-		smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
-				    SPECIAL_CTRL_STS, buf);
+		phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf);
 	} else if (mdix_ctrl == ETH_TP_MDI_AUTO) {
-		buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
-					 SPECIAL_CTRL_STS);
+		buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
 		buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_;
 		buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
 			 SPECIAL_CTRL_STS_AMDIX_STATE_);
 		buf |= SPECIAL_CTRL_STS_AMDIX_ENABLE_;
-		smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
-				    SPECIAL_CTRL_STS, buf);
+		phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf);
 	}
 	pdata->mdix_ctrl = mdix_ctrl;
 }

Comments

Andrew Lunn June 30, 2020, 1:26 a.m. UTC | #1 
On Mon, Jun 29, 2020 at 01:12:37PM +0000, Andre.Edich@microchip.com wrote:
> Use functions phy_read and phy_write instead of smsc95xx_mdio_read and
> smsc95xx_mdio_write respectively.
> 
> Signed-off-by: Andre Edich <andre.edich@microchip.com>
> ---
>  drivers/net/usb/smsc95xx.c | 33 +++++++++++++--------------------
>  1 file changed, 13 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
> index 3b8f7e439f44..11af5d5ece60 100644
> --- a/drivers/net/usb/smsc95xx.c
> +++ b/drivers/net/usb/smsc95xx.c
> @@ -574,7 +574,7 @@ static int smsc95xx_link_reset(struct usbnet *dev)
>  	int ret;
>  
>  	/* clear interrupt status */
> -	ret = smsc95xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC);
> +	ret = phy_read(pdata->phydev, PHY_INT_SRC);
>  	if (ret < 0)
>  		return ret;

The PHY driver should be clearing the interrupt status before it
enables interrupts.

>  
> @@ -584,8 +584,8 @@ static int smsc95xx_link_reset(struct usbnet *dev)
>  
>  	mii_check_media(mii, 1, 1);
>  	mii_ethtool_gset(&dev->mii, &ecmd);
> -	lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id,
> MII_ADVERTISE);
> -	rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
> +	lcladv = phy_read(pdata->phydev, MII_ADVERTISE);
> +	rmtadv = phy_read(pdata->phydev, MII_LPA);
>  
>  	netif_dbg(dev, link, dev->net,
>  		  "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",

One of your previous patches added a link change handler which prints
the current speed, duplex, etc. I think you can remove this code.

> @@ -753,10 +753,11 @@ static int smsc95xx_ethtool_set_wol(struct
> net_device *net,
>  static int get_mdix_status(struct net_device *net)
>  {

The PHY driver should be providing this information, not the MAC.

When using phylib, the MAC driver should never need to directly access
the PHY. The PHY driver does all the work. The MAC driver might need
to call into phylib to request the work is done.

   Andrew
diff mbox series

Patch

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 3b8f7e439f44..11af5d5ece60 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -574,7 +574,7 @@  static int smsc95xx_link_reset(struct usbnet *dev)
 	int ret;
 
 	/* clear interrupt status */
-	ret = smsc95xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC);
+	ret = phy_read(pdata->phydev, PHY_INT_SRC);
 	if (ret < 0)
 		return ret;
 
@@ -584,8 +584,8 @@  static int smsc95xx_link_reset(struct usbnet *dev)
 
 	mii_check_media(mii, 1, 1);
 	mii_ethtool_gset(&dev->mii, &ecmd);
-	lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id,
MII_ADVERTISE);
-	rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
+	lcladv = phy_read(pdata->phydev, MII_ADVERTISE);
+	rmtadv = phy_read(pdata->phydev, MII_LPA);
 
 	netif_dbg(dev, link, dev->net,