Message ID | 1349374497-9540-2-git-send-email-monstr@monstr.eu |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote: > Allow user to access the MDIO from userspace. > > Signed-off-by: Michal Simek <monstr@monstr.eu> > CC: Anirudha Sarangi <anirudh@xilinx.com> > CC: John Linn <John.Linn@xilinx.com> > CC: Grant Likely <grant.likely@secretlab.ca> > CC: Rob Herring <rob.herring@calxeda.com> > CC: David S. Miller <davem@davemloft.net> > --- > drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > index 50167ab..a5b41cd 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev) > } > #endif > > +/* Ioctl MII Interface */ > +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) > +{ > + struct axienet_local *priv = netdev_priv(dev); > + > + if (!netif_running(dev)) > + return -EINVAL; Not sure this is the appropriate error code. > + if (!priv->phy_dev) > + return -ENODEV; Error code should be EOPNOTSUPP - the device is present but just doesn't support MDIO. Ben. > + return phy_mii_ioctl(priv->phy_dev, rq, cmd); > +} > + > static const struct net_device_ops axienet_netdev_ops = { > .ndo_open = axienet_open, > .ndo_stop = axienet_stop, > @@ -1061,6 +1075,7 @@ static const struct net_device_ops axienet_netdev_ops = { > .ndo_set_mac_address = netdev_set_mac_address, > .ndo_validate_addr = eth_validate_addr, > .ndo_set_rx_mode = axienet_set_multicast_list, > + .ndo_do_ioctl = axienet_ioctl, > #ifdef CONFIG_NET_POLL_CONTROLLER > .ndo_poll_controller = axienet_poll_controller, > #endif
On 10/04/2012 09:17 PM, Ben Hutchings wrote: > On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote: >> Allow user to access the MDIO from userspace. >> >> Signed-off-by: Michal Simek <monstr@monstr.eu> >> CC: Anirudha Sarangi <anirudh@xilinx.com> >> CC: John Linn <John.Linn@xilinx.com> >> CC: Grant Likely <grant.likely@secretlab.ca> >> CC: Rob Herring <rob.herring@calxeda.com> >> CC: David S. Miller <davem@davemloft.net> >> --- >> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++ >> 1 files changed, 15 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >> index 50167ab..a5b41cd 100644 >> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >> @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev) >> } >> #endif >> >> +/* Ioctl MII Interface */ >> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) >> +{ >> + struct axienet_local *priv = netdev_priv(dev); >> + >> + if (!netif_running(dev)) >> + return -EINVAL; > > Not sure this is the appropriate error code. > >> + if (!priv->phy_dev) >> + return -ENODEV; > > Error code should be EOPNOTSUPP - the device is present but just doesn't > support MDIO. ok. Thanks will fix it. Thanks, Michal
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 50167ab..a5b41cd 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev) } #endif +/* Ioctl MII Interface */ +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +{ + struct axienet_local *priv = netdev_priv(dev); + + if (!netif_running(dev)) + return -EINVAL; + + if (!priv->phy_dev) + return -ENODEV; + + return phy_mii_ioctl(priv->phy_dev, rq, cmd); +} + static const struct net_device_ops axienet_netdev_ops = { .ndo_open = axienet_open, .ndo_stop = axienet_stop, @@ -1061,6 +1075,7 @@ static const struct net_device_ops axienet_netdev_ops = { .ndo_set_mac_address = netdev_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = axienet_set_multicast_list, + .ndo_do_ioctl = axienet_ioctl, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = axienet_poll_controller, #endif
Allow user to access the MDIO from userspace. Signed-off-by: Michal Simek <monstr@monstr.eu> CC: Anirudha Sarangi <anirudh@xilinx.com> CC: John Linn <John.Linn@xilinx.com> CC: Grant Likely <grant.likely@secretlab.ca> CC: Rob Herring <rob.herring@calxeda.com> CC: David S. Miller <davem@davemloft.net> --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)