From patchwork Mon Dec 3 13:49:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Luebbe X-Patchwork-Id: 203358 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 51E1E2C007C for ; Tue, 4 Dec 2012 00:49:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754899Ab2LCNtv (ORCPT ); Mon, 3 Dec 2012 08:49:51 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:53710 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754480Ab2LCNtu (ORCPT ); Mon, 3 Dec 2012 08:49:50 -0500 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1TfWP1-0000iE-Ia; Mon, 03 Dec 2012 14:49:43 +0100 Received: from jlu by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1TfWP0-0001db-4k; Mon, 03 Dec 2012 14:49:42 +0100 From: Jan Luebbe To: netdev@vger.kernel.org Cc: "David S. Miller" , Mugunthan V N , Vaibhav Hiremath , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Jan Luebbe Subject: [PATCH 3/3] net: cpsw: implement ioctl for MII Date: Mon, 3 Dec 2012 14:49:29 +0100 Message-Id: <1354542569-6165-3-git-send-email-jlu@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354542569-6165-1-git-send-email-jlu@pengutronix.de> References: <1354542569-6165-1-git-send-email-jlu@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: jlu@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This allows using tools like mii-diag on CPSW. Signed-off-by: Jan Luebbe --- drivers/net/ethernet/ti/cpsw.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 8de3e92..f476c03 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -629,6 +629,20 @@ static void cpsw_ndo_change_rx_flags(struct net_device *ndev, int flags) dev_err(&ndev->dev, "multicast traffic cannot be filtered!\n"); } +static int cpsw_ndo_do_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) +{ + struct cpsw_priv *priv = netdev_priv(ndev); + struct phy_device *phy = priv->slaves[0].phy; + + if (!netif_running(ndev)) + return -EINVAL; + + if (!phy) + return -ENODEV; + + return phy_mii_ioctl(phy, rq, cmd); +} + static void cpsw_ndo_tx_timeout(struct net_device *ndev) { struct cpsw_priv *priv = netdev_priv(ndev); @@ -670,6 +684,7 @@ static const struct net_device_ops cpsw_netdev_ops = { .ndo_start_xmit = cpsw_ndo_start_xmit, .ndo_change_rx_flags = cpsw_ndo_change_rx_flags, .ndo_validate_addr = eth_validate_addr, + .ndo_do_ioctl = cpsw_ndo_do_ioctl, .ndo_change_mtu = eth_change_mtu, .ndo_tx_timeout = cpsw_ndo_tx_timeout, .ndo_get_stats = cpsw_ndo_get_stats,