From patchwork Mon Jun 17 00:04:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Healy X-Patchwork-Id: 251751 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 BCDAF2C008E for ; Mon, 17 Jun 2013 10:04:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755527Ab3FQAEx (ORCPT ); Sun, 16 Jun 2013 20:04:53 -0400 Received: from mail-ob0-f176.google.com ([209.85.214.176]:47361 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959Ab3FQAEw (ORCPT ); Sun, 16 Jun 2013 20:04:52 -0400 Received: by mail-ob0-f176.google.com with SMTP id v19so2513166obq.21 for ; Sun, 16 Jun 2013 17:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=nVdGRvLxQps6Ul9K2td9Rz3wdjEkxN5HqgC0gAbNSbk=; b=Mbyi0VE+mvaxTCyuo1dmAPLbYXWfjZFi9p1vxr1NWNDZQnHkjMMaQAuEz2eKbtbukr WvWT/JCRprsgEm8sdvEcDv5AZSr7QWZpzT6ptuVjdqTsf+uMnOSsApIBP5HH37CCpjHk DTnDjwjEGN4OI4uT32gQ4tp0S+2sSG9iagKroZuE7gVfNWbVJKkwowD9B0yAEVWb1NXA UApwaswMQkokLzG5pWxR+Fuew3YVOyYunSpRMJn6SpWUJZ72LcW7aLsH++1UQiArROvL vZjFkBcMlHqbvNzgZ92mYSRMKSzhzoL5kI3iz+V5gN4/TEZQx2JylxipsYtMODTB0jpr 2djQ== X-Received: by 10.60.138.234 with SMTP id qt10mr7484561oeb.118.1371427491464; Sun, 16 Jun 2013 17:04:51 -0700 (PDT) Received: from cphealy-desktop.gateway.2wire.net (99-73-211-50.lightspeed.irvnca.sbcglobal.net. [99.73.211.50]) by mx.google.com with ESMTPSA id z5sm14038852obw.4.2013.06.16.17.04.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Jun 2013 17:04:51 -0700 (PDT) From: cphealy@gmail.com To: "David S. Miller" , Fabio Estevam , Frank Li , Shawn Guo , Jim Baxter , netdev@vger.kernel.org Cc: Chris Subject: [PATCH 1/1] fec: Add support to restart autonegotiate Date: Sun, 16 Jun 2013 17:04:38 -0700 Message-Id: <1371427478-25902-1-git-send-email-cphealy@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Chris Add ethtool operation to restart autonegotiation via the PHY. Also cleanup two whitespace errors that break kernel guidelines. Tested on i.MX28EVK. Signed-off-by: Chris --- drivers/net/ethernet/freescale/fec_main.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index a667015..c6be728 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -150,7 +150,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #define FEC_FLASHMAC 0xf0006000 #elif defined(CONFIG_CANCam) #define FEC_FLASHMAC 0xf0020000 -#elif defined (CONFIG_M5272C3) +#elif defined(CONFIG_M5272C3) #define FEC_FLASHMAC (0xffe04000 + 4) #elif defined(CONFIG_MOD5272) #define FEC_FLASHMAC 0xffc0406b @@ -1206,8 +1206,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) { phy_dev->supported &= PHY_GBIT_FEATURES; phy_dev->supported |= SUPPORTED_Pause; - } - else + } else phy_dev->supported &= PHY_BASIC_FEATURES; phy_dev->advertising = phy_dev->supported; @@ -1436,6 +1435,17 @@ static int fec_enet_set_pauseparam(struct net_device *ndev, return 0; } +static int fec_enet_nway_reset(struct net_device *dev) +{ + struct fec_enet_private *fep = netdev_priv(dev); + struct phy_device *phydev = fep->phy_dev; + + if (!phydev) + return -ENODEV; + + return genphy_restart_aneg(phydev); +} + static const struct ethtool_ops fec_enet_ethtool_ops = { .get_pauseparam = fec_enet_get_pauseparam, .set_pauseparam = fec_enet_set_pauseparam, @@ -1444,6 +1454,7 @@ static const struct ethtool_ops fec_enet_ethtool_ops = { .get_drvinfo = fec_enet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ts_info = fec_enet_get_ts_info, + .nway_reset = fec_enet_nway_reset, }; static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)