diff mbox series

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

Message ID 20200723115507.26194-6-andre.edich@microchip.com
State Changes Requested
Delegated to: David Miller
Headers show
Series Add PAL support to smsc95xx | expand

Commit Message

Andre Edich July 23, 2020, 11:55 a.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 | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

Comments

kernel test robot July 25, 2020, 7:30 p.m. UTC | #1 
Hi Andre,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]

url:    https://github.com/0day-ci/linux/commits/Andre-Edich/Add-PAL-support-to-smsc95xx/20200723-195824
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 7fc3b978a8971305d456b32d3f2ac13191f5a0d7
config: x86_64-randconfig-a016-20200724 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
reproduce (this is a W=1 build):
        # save the attached .config to linux build tree
        make W=1 ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_disconnect_phy':
   drivers/net/usb/smsc95xx.c:1338: undefined reference to `phy_stop'
   ld: drivers/net/usb/smsc95xx.c:1339: undefined reference to `phy_disconnect'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_unbind':
   drivers/net/usb/smsc95xx.c:1302: undefined reference to `mdiobus_unregister'
   ld: drivers/net/usb/smsc95xx.c:1303: undefined reference to `mdiobus_free'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_write':
>> include/linux/phy.h:844: undefined reference to `mdiobus_write'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_write':
>> include/linux/phy.h:844: undefined reference to `mdiobus_write'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_write':
>> include/linux/phy.h:844: undefined reference to `mdiobus_write'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_write':
>> include/linux/phy.h:844: undefined reference to `mdiobus_write'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_write':
>> include/linux/phy.h:844: undefined reference to `mdiobus_write'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
>> ld: include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_start_phy':
   drivers/net/usb/smsc95xx.c:1323: undefined reference to `phy_connect_direct'
   ld: drivers/net/usb/smsc95xx.c:1331: undefined reference to `phy_attached_info'
   ld: drivers/net/usb/smsc95xx.c:1332: undefined reference to `phy_start'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_resume':
   drivers/net/usb/smsc95xx.c:1887: undefined reference to `phy_init_hw'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_handle_link_change':
   drivers/net/usb/smsc95xx.c:1310: undefined reference to `phy_print_status'
   ld: drivers/net/usb/smsc95xx.o: in function `mdiobus_alloc':
   include/linux/phy.h:318: undefined reference to `mdiobus_alloc_size'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_bind':
   drivers/net/usb/smsc95xx.c:1242: undefined reference to `__mdiobus_register'
   ld: drivers/net/usb/smsc95xx.c:1248: undefined reference to `phy_find_first'
   ld: drivers/net/usb/smsc95xx.o: in function `phy_read':
>> include/linux/phy.h:804: undefined reference to `mdiobus_read'
   ld: drivers/net/usb/smsc95xx.o: in function `smsc95xx_bind':
   drivers/net/usb/smsc95xx.c:1288: undefined reference to `mdiobus_unregister'
   ld: drivers/net/usb/smsc95xx.c:1291: undefined reference to `mdiobus_free'

vim +804 include/linux/phy.h

8c5e850c0ce597 Russell King      2017-12-29  792  
2e888103295f47 Lennert Buytenhek 2008-09-29  793  /**
2e888103295f47 Lennert Buytenhek 2008-09-29  794   * phy_read - Convenience function for reading a given PHY register
2e888103295f47 Lennert Buytenhek 2008-09-29  795   * @phydev: the phy_device struct
2e888103295f47 Lennert Buytenhek 2008-09-29  796   * @regnum: register number to read
2e888103295f47 Lennert Buytenhek 2008-09-29  797   *
2e888103295f47 Lennert Buytenhek 2008-09-29  798   * NOTE: MUST NOT be called from interrupt context,
2e888103295f47 Lennert Buytenhek 2008-09-29  799   * because the bus read/write functions may wait for an interrupt
2e888103295f47 Lennert Buytenhek 2008-09-29  800   * to conclude the operation.
2e888103295f47 Lennert Buytenhek 2008-09-29  801   */
abf35df21513c5 Jason Gunthorpe   2010-03-09  802  static inline int phy_read(struct phy_device *phydev, u32 regnum)
2e888103295f47 Lennert Buytenhek 2008-09-29  803  {
e5a03bfd873c29 Andrew Lunn       2016-01-06 @804  	return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, regnum);
2e888103295f47 Lennert Buytenhek 2008-09-29  805  }
2e888103295f47 Lennert Buytenhek 2008-09-29  806  
fcbd30d09ba053 Dejin Zheng       2020-03-23  807  #define phy_read_poll_timeout(phydev, regnum, val, cond, sleep_us, \
fcbd30d09ba053 Dejin Zheng       2020-03-23  808  				timeout_us, sleep_before_read) \
fcbd30d09ba053 Dejin Zheng       2020-03-23  809  ({ \
fcbd30d09ba053 Dejin Zheng       2020-03-23  810  	int __ret = read_poll_timeout(phy_read, val, (cond) || val < 0, \
fcbd30d09ba053 Dejin Zheng       2020-03-23  811  		sleep_us, timeout_us, sleep_before_read, phydev, regnum); \
fcbd30d09ba053 Dejin Zheng       2020-03-23  812  	if (val <  0) \
fcbd30d09ba053 Dejin Zheng       2020-03-23  813  		__ret = val; \
fcbd30d09ba053 Dejin Zheng       2020-03-23  814  	if (__ret) \
fcbd30d09ba053 Dejin Zheng       2020-03-23  815  		phydev_err(phydev, "%s failed: %d\n", __func__, __ret); \
fcbd30d09ba053 Dejin Zheng       2020-03-23  816  	__ret; \
fcbd30d09ba053 Dejin Zheng       2020-03-23  817  })
fcbd30d09ba053 Dejin Zheng       2020-03-23  818  
fcbd30d09ba053 Dejin Zheng       2020-03-23  819  
788f9933db6172 Russell King      2018-01-02  820  /**
788f9933db6172 Russell King      2018-01-02  821   * __phy_read - convenience function for reading a given PHY register
788f9933db6172 Russell King      2018-01-02  822   * @phydev: the phy_device struct
788f9933db6172 Russell King      2018-01-02  823   * @regnum: register number to read
788f9933db6172 Russell King      2018-01-02  824   *
788f9933db6172 Russell King      2018-01-02  825   * The caller must have taken the MDIO bus lock.
788f9933db6172 Russell King      2018-01-02  826   */
788f9933db6172 Russell King      2018-01-02  827  static inline int __phy_read(struct phy_device *phydev, u32 regnum)
788f9933db6172 Russell King      2018-01-02  828  {
788f9933db6172 Russell King      2018-01-02  829  	return __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, regnum);
788f9933db6172 Russell King      2018-01-02  830  }
788f9933db6172 Russell King      2018-01-02  831  
2e888103295f47 Lennert Buytenhek 2008-09-29  832  /**
2e888103295f47 Lennert Buytenhek 2008-09-29  833   * phy_write - Convenience function for writing a given PHY register
2e888103295f47 Lennert Buytenhek 2008-09-29  834   * @phydev: the phy_device struct
2e888103295f47 Lennert Buytenhek 2008-09-29  835   * @regnum: register number to write
2e888103295f47 Lennert Buytenhek 2008-09-29  836   * @val: value to write to @regnum
2e888103295f47 Lennert Buytenhek 2008-09-29  837   *
2e888103295f47 Lennert Buytenhek 2008-09-29  838   * NOTE: MUST NOT be called from interrupt context,
2e888103295f47 Lennert Buytenhek 2008-09-29  839   * because the bus read/write functions may wait for an interrupt
2e888103295f47 Lennert Buytenhek 2008-09-29  840   * to conclude the operation.
2e888103295f47 Lennert Buytenhek 2008-09-29  841   */
abf35df21513c5 Jason Gunthorpe   2010-03-09  842  static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
2e888103295f47 Lennert Buytenhek 2008-09-29  843  {
e5a03bfd873c29 Andrew Lunn       2016-01-06 @844  	return mdiobus_write(phydev->mdio.bus, phydev->mdio.addr, regnum, val);
2e888103295f47 Lennert Buytenhek 2008-09-29  845  }
2e888103295f47 Lennert Buytenhek 2008-09-29  846  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 8731724bf2c5..8add7109e661 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -582,22 +582,20 @@  static int smsc95xx_link_reset(struct usbnet *dev)
 
 	if (pdata->internal_phy) {
 		/* 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;
 
-		smsc95xx_mdio_write(dev->net, mii->phy_id, PHY_INT_MASK,
-				    PHY_INT_MASK_DEFAULT_);
+		ret = phy_write(pdata->phydev, PHY_INT_MASK,
+				PHY_INT_MASK_DEFAULT_);
+		if (ret < 0)
+			return ret;
 	}
 
 	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);
-
-	netif_dbg(dev, link, dev->net,
-		  "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
-		  ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
+	lcladv = phy_read(pdata->phydev, MII_ADVERTISE);
+	rmtadv = phy_read(pdata->phydev, MII_LPA);
 
 	spin_lock_irqsave(&pdata->mac_cr_lock, flags);
 	if (ecmd.duplex != DUPLEX_FULL) {
@@ -761,10 +759,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 = dev->driver_priv;
 	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;
@@ -790,39 +789,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;
 }