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: =?utf-8?q?Jan_L=C3=BCbbe?= X-Patchwork-Id: 1833121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 28365DF2F9 for ; Mon, 3 Dec 2012 13:52:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TfWPJ-0004Q1-5d; Mon, 03 Dec 2012 13:50:02 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TfWP7-0004ON-Dj for linux-arm-kernel@lists.infradead.org; Mon, 03 Dec 2012 13:49:50 +0000 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 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: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121203_084949_685206_A5DCF465 X-CRM114-Status: GOOD ( 14.24 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Mugunthan V N , Jan Luebbe , Vaibhav Hiremath , linux-omap@vger.kernel.org, "David S. Miller" , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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,