Skip to contentSkip to conversation

net: convert suitable drivers to use phy_do_ioctl_running

PATCH Applied Heiner Kallweit 5 participants 7 messages Jan 21, 2020 – Jan 24, 2020

Subsystems (17)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: convert suitable drivers to use phy_do_ioctl_running

Convert suitable drivers to use new helper phy_do_ioctl_running.

---
v2: I forgot the netdev mailing list

---
 drivers/net/ethernet/allwinner/sun4i-emac.c    | 15 +--------------
 drivers/net/ethernet/amd/au1000_eth.c          | 13 +------------
 drivers/net/ethernet/arc/emac_main.c           | 14 +-------------
 drivers/net/ethernet/broadcom/bgmac.c          | 10 +---------
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 14 +-------------
 drivers/net/ethernet/dnet.c                    | 15 +--------------
 .../ethernet/freescale/fs_enet/fs_enet-main.c  | 10 +---------
 drivers/net/ethernet/hisilicon/hisi_femac.c    | 14 +-------------
 drivers/net/ethernet/hisilicon/hns/hns_enet.c  | 16 +---------------
 drivers/net/ethernet/nxp/lpc_eth.c             | 15 +--------------
 drivers/net/ethernet/qualcomm/emac/emac.c      | 14 +-------------
 drivers/net/ethernet/renesas/sh_eth.c          | 18 ++----------------
 drivers/net/ethernet/smsc/smsc911x.c           | 11 +----------
 drivers/net/ethernet/smsc/smsc9420.c           | 11 +----------
 drivers/net/ethernet/ti/cpmac.c                | 12 +-----------
 drivers/net/ethernet/toshiba/tc35815.c         | 12 +-----------
 drivers/net/ethernet/xilinx/ll_temac_main.c    | 13 +------------
 drivers/net/usb/ax88172a.c                     | 13 +------------
 drivers/net/usb/lan78xx.c                      | 10 +---------
 19 files changed, 20 insertions(+), 230 deletions(-)
drivers/net/ethernet/allwinner/sun4i-emac.c +1 -14
index 5ea806423..22cadfbee 100644
@@ -207,19 +207,6 @@ static void emac_inblk_32bit(void __iomem *reg, void *data, int count)
 	readsl(reg, data, round_up(count, 4) / 4);
 }
 
-static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	struct phy_device *phydev = dev->phydev;
-
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(phydev, rq, cmd);
-}
-
 /* ethtool ops */
 static void emac_get_drvinfo(struct net_device *dev,
 			      struct ethtool_drvinfo *info)
@@ -791,7 +778,7 @@ static const struct net_device_ops emac_netdev_ops = {
 	.ndo_start_xmit		= emac_start_xmit,
 	.ndo_tx_timeout		= emac_timeout,
 	.ndo_set_rx_mode	= emac_set_rx_mode,
-	.ndo_do_ioctl		= emac_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= emac_set_mac_address,
 #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/amd/au1000_eth.c +1 -12
index 6acf5aa99..089a4fbc6 100644
@@ -1053,23 +1053,12 @@ static void au1000_multicast_list(struct net_device *dev)
 	writel(reg, &aup->mac->control);
 }
 
-static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!dev->phydev)
-		return -EINVAL; /* PHY not controllable */
-
-	return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 static const struct net_device_ops au1000_netdev_ops = {
 	.ndo_open		= au1000_open,
 	.ndo_stop		= au1000_close,
 	.ndo_start_xmit		= au1000_tx,
 	.ndo_set_rx_mode	= au1000_multicast_list,
-	.ndo_do_ioctl		= au1000_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_tx_timeout		= au1000_tx_timeout,
 	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
drivers/net/ethernet/arc/emac_main.c +1 -13
index 6f2c86778..17bda4e8c 100644
@@ -781,18 +781,6 @@ static int arc_emac_set_address(struct net_device *ndev, void *p)
 	return 0;
 }
 
-static int arc_emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!dev->phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
-
 /**
  * arc_emac_restart - Restart EMAC
  * @ndev:	Pointer to net_device structure.
@@ -857,7 +845,7 @@ static const struct net_device_ops arc_emac_netdev_ops = {
 	.ndo_set_mac_address	= arc_emac_set_address,
 	.ndo_get_stats		= arc_emac_stats,
 	.ndo_set_rx_mode	= arc_emac_set_rx_mode,
-	.ndo_do_ioctl		= arc_emac_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= arc_emac_poll_controller,
 #endif
drivers/net/ethernet/broadcom/bgmac.c +1 -9
index 148734b16..1bb07a5d8 100644
@@ -1248,14 +1248,6 @@ static int bgmac_set_mac_address(struct net_device *net_dev, void *addr)
 	return 0;
 }
 
-static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
-{
-	if (!netif_running(net_dev))
-		return -EINVAL;
-
-	return phy_mii_ioctl(net_dev->phydev, ifr, cmd);
-}
-
 static const struct net_device_ops bgmac_netdev_ops = {
 	.ndo_open		= bgmac_open,
 	.ndo_stop		= bgmac_stop,
@@ -1263,7 +1255,7 @@ static const struct net_device_ops bgmac_netdev_ops = {
 	.ndo_set_rx_mode	= bgmac_set_rx_mode,
 	.ndo_set_mac_address	= bgmac_set_mac_address,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_do_ioctl           = bgmac_ioctl,
+	.ndo_do_ioctl           = phy_do_ioctl_running,
 };
 
 /**************************************************
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -13
index 3ee7917e3..013959285 100644
@@ -1225,18 +1225,6 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,
 	}
 }
 
-/* ioctl handle special commands that are not present in ethtool. */
-static int bcmgenet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!dev->phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,
 					 struct bcmgenet_tx_ring *ring)
 {
@@ -3222,7 +3210,7 @@ static const struct net_device_ops bcmgenet_netdev_ops = {
 	.ndo_tx_timeout		= bcmgenet_timeout,
 	.ndo_set_rx_mode	= bcmgenet_set_rx_mode,
 	.ndo_set_mac_address	= bcmgenet_set_mac_addr,
-	.ndo_do_ioctl		= bcmgenet_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_features	= bcmgenet_set_features,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= bcmgenet_poll_controller,
drivers/net/ethernet/dnet.c +1 -14
index e24979010..5f8fa1145 100644
@@ -725,19 +725,6 @@ static struct net_device_stats *dnet_get_stats(struct net_device *dev)
 	return nstat;
 }
 
-static int dnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	struct phy_device *phydev = dev->phydev;
-
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(phydev, rq, cmd);
-}
-
 static void dnet_get_drvinfo(struct net_device *dev,
 			     struct ethtool_drvinfo *info)
 {
@@ -759,7 +746,7 @@ static const struct net_device_ops dnet_netdev_ops = {
 	.ndo_stop		= dnet_close,
 	.ndo_get_stats		= dnet_get_stats,
 	.ndo_start_xmit		= dnet_start_xmit,
-	.ndo_do_ioctl		= dnet_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 };
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -9
index 80903cd58..add61fed3 100644
@@ -882,14 +882,6 @@ static const struct ethtool_ops fs_ethtool_ops = {
 	.set_tunable = fs_set_tunable,
 };
 
-static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 extern int fs_mii_connect(struct net_device *dev);
 extern void fs_mii_disconnect(struct net_device *dev);
 
@@ -907,7 +899,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
 	.ndo_start_xmit		= fs_enet_start_xmit,
 	.ndo_tx_timeout		= fs_timeout,
 	.ndo_set_rx_mode	= fs_set_multicast_list,
-	.ndo_do_ioctl		= fs_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= eth_mac_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/hisilicon/hisi_femac.c +1 -13
index 90ab7ade4..57c3bc4f7 100644
@@ -675,18 +675,6 @@ static void hisi_femac_net_set_rx_mode(struct net_device *dev)
 	}
 }
 
-static int hisi_femac_net_ioctl(struct net_device *dev,
-				struct ifreq *ifreq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-
-	if (!dev->phydev)
-		return -EINVAL;
-
-	return phy_mii_ioctl(dev->phydev, ifreq, cmd);
-}
-
 static const struct ethtool_ops hisi_femac_ethtools_ops = {
 	.get_link		= ethtool_op_get_link,
 	.get_link_ksettings	= phy_ethtool_get_link_ksettings,
@@ -697,7 +685,7 @@ static const struct net_device_ops hisi_femac_netdev_ops = {
 	.ndo_open		= hisi_femac_net_open,
 	.ndo_stop		= hisi_femac_net_close,
 	.ndo_start_xmit		= hisi_femac_net_xmit,
-	.ndo_do_ioctl		= hisi_femac_net_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_mac_address	= hisi_femac_set_mac_address,
 	.ndo_set_rx_mode	= hisi_femac_net_set_rx_mode,
 };
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -15
index e45553ec1..0c3b9b274 100644
@@ -1499,20 +1499,6 @@ static void hns_nic_net_timeout(struct net_device *ndev, unsigned int txqueue)
 	}
 }
 
-static int hns_nic_do_ioctl(struct net_device *netdev, struct ifreq *ifr,
-			    int cmd)
-{
-	struct phy_device *phy_dev = netdev->phydev;
-
-	if (!netif_running(netdev))
-		return -EINVAL;
-
-	if (!phy_dev)
-		return -ENOTSUPP;
-
-	return phy_mii_ioctl(phy_dev, ifr, cmd);
-}
-
 static netdev_tx_t hns_nic_net_xmit(struct sk_buff *skb,
 				    struct net_device *ndev)
 {
@@ -1960,7 +1946,7 @@ static const struct net_device_ops hns_nic_netdev_ops = {
 	.ndo_tx_timeout = hns_nic_net_timeout,
 	.ndo_set_mac_address = hns_nic_net_set_mac_address,
 	.ndo_change_mtu = hns_nic_change_mtu,
-	.ndo_do_ioctl = hns_nic_do_ioctl,
+	.ndo_do_ioctl = phy_do_ioctl_running,
 	.ndo_set_features = hns_nic_set_features,
 	.ndo_fix_features = hns_nic_fix_features,
 	.ndo_get_stats64 = hns_nic_get_stats64,
drivers/net/ethernet/nxp/lpc_eth.c +1 -14
index 656169214..d20cf03a3 100644
@@ -1149,19 +1149,6 @@ static void lpc_eth_set_multicast_list(struct net_device *ndev)
 	spin_unlock_irqrestore(&pldat->lock, flags);
 }
 
-static int lpc_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
-{
-	struct phy_device *phydev = ndev->phydev;
-
-	if (!netif_running(ndev))
-		return -EINVAL;
-
-	if (!phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(phydev, req, cmd);
-}
-
 static int lpc_eth_open(struct net_device *ndev)
 {
 	struct netdata_local *pldat = netdev_priv(ndev);
@@ -1229,7 +1216,7 @@ static const struct net_device_ops lpc_netdev_ops = {
 	.ndo_stop		= lpc_eth_close,
 	.ndo_start_xmit		= lpc_eth_hard_start_xmit,
 	.ndo_set_rx_mode	= lpc_eth_set_multicast_list,
-	.ndo_do_ioctl		= lpc_eth_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_mac_address	= lpc_set_mac_address,
 	.ndo_validate_addr	= eth_validate_addr,
 };
drivers/net/ethernet/qualcomm/emac/emac.c +1 -13
index 522fad4cb..18b0c7a2d 100644
@@ -289,18 +289,6 @@ static void emac_tx_timeout(struct net_device *netdev, unsigned int txqueue)
 	schedule_work(&adpt->work_thread);
 }
 
-/* IOCTL support for the interface */
-static int emac_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-	if (!netif_running(netdev))
-		return -EINVAL;
-
-	if (!netdev->phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(netdev->phydev, ifr, cmd);
-}
-
 /**
  * emac_update_hw_stats - read the EMAC stat registers
  *
@@ -387,7 +375,7 @@ static const struct net_device_ops emac_netdev_ops = {
 	.ndo_start_xmit		= emac_start_xmit,
 	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_change_mtu		= emac_change_mtu,
-	.ndo_do_ioctl		= emac_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_tx_timeout		= emac_tx_timeout,
 	.ndo_get_stats64	= emac_get_stats64,
 	.ndo_set_features       = emac_set_features,
drivers/net/ethernet/renesas/sh_eth.c +2 -16
index c922d7a55..58ca12651 100644
@@ -2647,20 +2647,6 @@ static int sh_eth_close(struct net_device *ndev)
 	return 0;
 }
 
-/* ioctl to device function */
-static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
-{
-	struct phy_device *phydev = ndev->phydev;
-
-	if (!netif_running(ndev))
-		return -EINVAL;
-
-	if (!phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(phydev, rq, cmd);
-}
-
 static int sh_eth_change_mtu(struct net_device *ndev, int new_mtu)
 {
 	if (netif_running(ndev))
@@ -3159,7 +3145,7 @@ static const struct net_device_ops sh_eth_netdev_ops = {
 	.ndo_get_stats		= sh_eth_get_stats,
 	.ndo_set_rx_mode	= sh_eth_set_rx_mode,
 	.ndo_tx_timeout		= sh_eth_tx_timeout,
-	.ndo_do_ioctl		= sh_eth_do_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_change_mtu		= sh_eth_change_mtu,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= eth_mac_addr,
@@ -3175,7 +3161,7 @@ static const struct net_device_ops sh_eth_netdev_ops_tsu = {
 	.ndo_vlan_rx_add_vid	= sh_eth_vlan_rx_add_vid,
 	.ndo_vlan_rx_kill_vid	= sh_eth_vlan_rx_kill_vid,
 	.ndo_tx_timeout		= sh_eth_tx_timeout,
-	.ndo_do_ioctl		= sh_eth_do_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_change_mtu		= sh_eth_change_mtu,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= eth_mac_addr,
drivers/net/ethernet/smsc/smsc911x.c +1 -10
index 6d90a097c..49a6a9167 100644
@@ -1943,15 +1943,6 @@ static int smsc911x_set_mac_address(struct net_device *dev, void *p)
 	return 0;
 }
 
-/* Standard ioctls for mii-tool */
-static int smsc911x_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-	if (!netif_running(dev) || !dev->phydev)
-		return -EINVAL;
-
-	return phy_mii_ioctl(dev->phydev, ifr, cmd);
-}
-
 static void smsc911x_ethtool_getdrvinfo(struct net_device *dev,
 					struct ethtool_drvinfo *info)
 {
@@ -2151,7 +2142,7 @@ static const struct net_device_ops smsc911x_netdev_ops = {
 	.ndo_start_xmit		= smsc911x_hard_start_xmit,
 	.ndo_get_stats		= smsc911x_get_stats,
 	.ndo_set_rx_mode	= smsc911x_set_multicast_list,
-	.ndo_do_ioctl		= smsc911x_do_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address 	= smsc911x_set_mac_address,
 #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/smsc/smsc9420.c +1 -10
index a6962a41c..7312e522c 100644
@@ -210,15 +210,6 @@ static int smsc9420_eeprom_reload(struct smsc9420_pdata *pd)
 	return -EIO;
 }
 
-/* Standard ioctls for mii-tool */
-static int smsc9420_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-	if (!netif_running(dev) || !dev->phydev)
-		return -EINVAL;
-
-	return phy_mii_ioctl(dev->phydev, ifr, cmd);
-}
-
 static void smsc9420_ethtool_get_drvinfo(struct net_device *netdev,
 					 struct ethtool_drvinfo *drvinfo)
 {
@@ -1504,7 +1495,7 @@ static const struct net_device_ops smsc9420_netdev_ops = {
 	.ndo_start_xmit		= smsc9420_hard_start_xmit,
 	.ndo_get_stats		= smsc9420_get_stats,
 	.ndo_set_rx_mode	= smsc9420_set_multicast_list,
-	.ndo_do_ioctl		= smsc9420_do_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address 	= eth_mac_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/ti/cpmac.c +1 -11
index 5e1b8292c..a530afe3c 100644
@@ -816,16 +816,6 @@ static void cpmac_tx_timeout(struct net_device *dev, unsigned int txqueue)
 	netif_tx_wake_all_queues(priv->dev);
 }
 
-static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-	if (!(netif_running(dev)))
-		return -EINVAL;
-	if (!dev->phydev)
-		return -EINVAL;
-
-	return phy_mii_ioctl(dev->phydev, ifr, cmd);
-}
-
 static void cpmac_get_ringparam(struct net_device *dev,
 						struct ethtool_ringparam *ring)
 {
@@ -1054,7 +1044,7 @@ static const struct net_device_ops cpmac_netdev_ops = {
 	.ndo_start_xmit		= cpmac_start_xmit,
 	.ndo_tx_timeout		= cpmac_tx_timeout,
 	.ndo_set_rx_mode	= cpmac_set_multicast_list,
-	.ndo_do_ioctl		= cpmac_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= eth_mac_addr,
 };
drivers/net/ethernet/toshiba/tc35815.c +1 -11
index 708de8262..3fd43d30b 100644
@@ -484,7 +484,6 @@ static int	tc35815_close(struct net_device *dev);
 static struct	net_device_stats *tc35815_get_stats(struct net_device *dev);
 static void	tc35815_set_multicast_list(struct net_device *dev);
 static void	tc35815_tx_timeout(struct net_device *dev, unsigned int txqueue);
-static int	tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void	tc35815_poll_controller(struct net_device *dev);
 #endif
@@ -751,7 +750,7 @@ static const struct net_device_ops tc35815_netdev_ops = {
 	.ndo_get_stats		= tc35815_get_stats,
 	.ndo_set_rx_mode	= tc35815_set_multicast_list,
 	.ndo_tx_timeout		= tc35815_tx_timeout,
-	.ndo_do_ioctl		= tc35815_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= eth_mac_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -2009,15 +2008,6 @@ static const struct ethtool_ops tc35815_ethtool_ops = {
 	.set_link_ksettings = phy_ethtool_set_link_ksettings,
 };
 
-static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(dev))
-		return -EINVAL;
-	if (!dev->phydev)
-		return -ENODEV;
-	return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 static void tc35815_chip_reset(struct net_device *dev)
 {
 	struct tc35815_regs __iomem *tr =
drivers/net/ethernet/xilinx/ll_temac_main.c +1 -12
index c66aab78d..6f11f52c9 100644
@@ -1080,17 +1080,6 @@ temac_poll_controller(struct net_device *ndev)
 }
 #endif
 
-static int temac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(ndev))
-		return -EINVAL;
-
-	if (!ndev->phydev)
-		return -EINVAL;
-
-	return phy_mii_ioctl(ndev->phydev, rq, cmd);
-}
-
 static const struct net_device_ops temac_netdev_ops = {
 	.ndo_open = temac_open,
 	.ndo_stop = temac_stop,
@@ -1098,7 +1087,7 @@ static const struct net_device_ops temac_netdev_ops = {
 	.ndo_set_rx_mode = temac_set_multicast_list,
 	.ndo_set_mac_address = temac_set_mac_address,
 	.ndo_validate_addr = eth_validate_addr,
-	.ndo_do_ioctl = temac_ioctl,
+	.ndo_do_ioctl = phy_do_ioctl_running,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller = temac_poll_controller,
 #endif
drivers/net/usb/ax88172a.c +1 -12
index af3994e08..4e514f5d7 100644
@@ -39,17 +39,6 @@ static int asix_mdio_bus_write(struct mii_bus *bus, int phy_id, int regnum,
 	return 0;
 }
 
-static int ax88172a_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(net))
-		return -EINVAL;
-
-	if (!net->phydev)
-		return -ENODEV;
-
-	return phy_mii_ioctl(net->phydev, rq, cmd);
-}
-
 /* set MAC link settings according to information from phylib */
 static void ax88172a_adjust_link(struct net_device *netdev)
 {
@@ -134,7 +123,7 @@ static const struct net_device_ops ax88172a_netdev_ops = {
 	.ndo_get_stats64	= usbnet_get_stats64,
 	.ndo_set_mac_address	= asix_set_mac_address,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_do_ioctl		= ax88172a_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_rx_mode        = asix_set_multicast,
 };
 
drivers/net/usb/lan78xx.c +1 -9
index c391f2521..d2d61f082 100644
@@ -1663,14 +1663,6 @@ static const struct ethtool_ops lan78xx_ethtool_ops = {
 	.get_regs	= lan78xx_get_regs,
 };
 
-static int lan78xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-{
-	if (!netif_running(netdev))
-		return -EINVAL;
-
-	return phy_mii_ioctl(netdev->phydev, rq, cmd);
-}
-
 static void lan78xx_init_mac_address(struct lan78xx_net *dev)
 {
 	u32 addr_lo, addr_hi;
@@ -3676,7 +3668,7 @@ static const struct net_device_ops lan78xx_netdev_ops = {
 	.ndo_change_mtu		= lan78xx_change_mtu,
 	.ndo_set_mac_address	= lan78xx_set_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_do_ioctl		= lan78xx_ioctl,
+	.ndo_do_ioctl		= phy_do_ioctl_running,
 	.ndo_set_rx_mode	= lan78xx_set_multicast,
 	.ndo_set_features	= lan78xx_set_features,
 	.ndo_vlan_rx_add_vid	= lan78xx_vlan_rx_add_vid,
Signature · 1 line
2.25.0
Acked-by on v2 1/1
#2 lore raw
In reply to Heiner Kallweit
Quoted 3 lines · Heiner Kallweit

Convert suitable drivers to use new helper phy_do_ioctl_running.

The vast majority of drivers that you are converting use the following convention:

- !netif_running -> return -EINVAL
- !dev->phydev -> return -ENODEV

so it may make sense to change the helper to accommodate the majority here, not that I believe this is going to make much practical difference, but if there were test cases that were specifically looking for such an error code, they could be failing after this changeset.

For bgmac.c, bcmgenet.c and cpmac.c:

Whether you decide to spin another version or not.

Signature · 1 line
Florian
#3 lore raw
Quoted 9 lines · Florian Fainelli
Quoted 3 lines · Heiner Kallweit

Convert suitable drivers to use new helper phy_do_ioctl_running.

The vast majority of drivers that you are converting use the following convention:

Quoted 8 lines

- !netif_running -> return -EINVAL
- !dev->phydev -> return -ENODEV

so it may make sense to change the helper to accommodate the majority here, not that I believe this is going to make much practical difference, but if there were test cases that were specifically looking for such an error code, they could be failing after this changeset.

Right, I also stumbled across the different error codes, mainly as you say -EINVAL. However there is no "wrong value", if netdev isn't running, then typically the PHY is not attached, and from a netdev point of view it's not there. So ENODEV seems to be best suited.
In kernel code the changed return code doesn't make a difference, but yes, in theory there could be userspace programs checking for -EINVAL. However such userspace programs should check for ENODEV too anyway to cover the second check that already returns -ENODEV.

Quoted 6 lines

For bgmac.c, bcmgenet.c and cpmac.c:

Whether you decide to spin another version or not.

Heiner

#5 lore raw
In reply to Heiner Kallweit
I love your patch! Yet something to improve:

Hi Heiner,

I love your patch! Yet something to improve:

[auto build test ERROR on next-20200121]
[cannot apply to net-next/master sunxi/sunxi/for-next xlnx/master net/master linus/master sparc-next/master v5.5-rc7 v5.5-rc6 v5.5-rc5 v5.5-rc7] [if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Heiner-Kallweit/net-convert-suitable-drivers-to-use-phy_do_ioctl_running/20200124-111523
base:    bc80e6ad8ee12b0ee6c7d05faf1ebd3f2fb8f1e5
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 7.5.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=m68k

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

>> drivers/net//ethernet/qualcomm/emac/emac.c:378:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

>> drivers/net/ethernet/arc/emac_main.c:848:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

>> drivers/net/ethernet/hisilicon/hisi_femac.c:688:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

>> drivers/net/ethernet/hisilicon/hns/hns_enet.c:1947:18: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

>> drivers/net/ethernet/nxp/lpc_eth.c:1219:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl

vim +378 drivers/net//ethernet/qualcomm/emac/emac.c

370
371 static const struct net_device_ops emac_netdev_ops = {
372 .ndo_open = emac_open,
373 .ndo_stop = emac_close,
374 .ndo_validate_addr = eth_validate_addr,
375 .ndo_start_xmit = emac_start_xmit,
376 .ndo_set_mac_address = eth_mac_addr,
377 .ndo_change_mtu = emac_change_mtu,

 > 378		.ndo_do_ioctl		= phy_do_ioctl_running,

379 .ndo_tx_timeout = emac_tx_timeout,
380 .ndo_get_stats64 = emac_get_stats64,
381 .ndo_set_features = emac_set_features,
382 .ndo_set_rx_mode = emac_rx_mode_set,
383 };
384

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

#6 lore raw
Quoted 65 lines · kbuild test robot

Hi Heiner,

I love your patch! Yet something to improve:

[auto build test ERROR on next-20200121]
[cannot apply to net-next/master sunxi/sunxi/for-next xlnx/master net/master linus/master sparc-next/master v5.5-rc7 v5.5-rc6 v5.5-rc5 v5.5-rc7] [if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Heiner-Kallweit/net-convert-suitable-drivers-to-use-phy_do_ioctl_running/20200124-111523
base:    bc80e6ad8ee12b0ee6c7d05faf1ebd3f2fb8f1e5
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 7.5.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=m68k

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

Quoted 1 line
Quoted 1 line

drivers/net//ethernet/qualcomm/emac/emac.c:378:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

Quoted 1 line
Quoted 1 line

drivers/net/ethernet/arc/emac_main.c:848:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

Quoted 1 line
Quoted 1 line

drivers/net/ethernet/hisilicon/hisi_femac.c:688:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

Quoted 1 line
Quoted 1 line

drivers/net/ethernet/hisilicon/hns/hns_enet.c:1947:18: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl
--

Quoted 1 line
Quoted 1 line

drivers/net/ethernet/nxp/lpc_eth.c:1219:19: error: 'phy_do_ioctl_running' undeclared here (not in a function); did you mean 'phy_do_ioctl'?

.ndo_do_ioctl = phy_do_ioctl_running,
^~~~~~~~~~~~~~~~~~~~
phy_do_ioctl

vim +378 drivers/net//ethernet/qualcomm/emac/emac.c

   370	
   371	static const struct net_device_ops emac_netdev_ops = {
   372		.ndo_open		= emac_open,
   373		.ndo_stop		= emac_close,
   374		.ndo_validate_addr	= eth_validate_addr,
   375		.ndo_start_xmit		= emac_start_xmit,
   376		.ndo_set_mac_address	= eth_mac_addr,
   377		.ndo_change_mtu		= emac_change_mtu,
Quoted 1 line

378 .ndo_do_ioctl = phy_do_ioctl_running,

379 .ndo_tx_timeout = emac_tx_timeout,
380 .ndo_get_stats64 = emac_get_stats64,
381 .ndo_set_features = emac_set_features,
382 .ndo_set_rx_mode = emac_rx_mode_set,

Quoted 7 lines
   383	};
   384	

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

Commit 3231e5d2228a2078ce5982d63ea9a617e4972c00 seems to be missing on this test system. It added phy_do_ioctl_running.

Heiner