From patchwork Wed Jun 27 00:06:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Burton X-Patchwork-Id: 935178 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mips.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=wavesemi.onmicrosoft.com header.i=@wavesemi.onmicrosoft.com header.b="Jla57Lz0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41FjrN6Yg6z9s0n for ; Wed, 27 Jun 2018 10:06:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964780AbeF0AGm (ORCPT ); Tue, 26 Jun 2018 20:06:42 -0400 Received: from mail-eopbgr700099.outbound.protection.outlook.com ([40.107.70.99]:11034 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754676AbeF0AGj (ORCPT ); Tue, 26 Jun 2018 20:06:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wavesemi.onmicrosoft.com; s=selector1-wavecomp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Be79Sr6b4oPvjIygfbgy5nfQ93jNinLzL9FWJwuTtR0=; b=Jla57Lz07l4QlWhxGkK7TqPzBv8wccbkGas4dhJK5ka9clvd2brWndx7Hg0S8mEIi98CyAsTGEHhWsgQGieZQUSMr8DDXY3mRV+lmey4dysJRvgsLloUp2iT5rrgdKo3Cb1j/m7+cEPwNfSGkVzL9s1fahS85TDYhYjPLlAGHHs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=pburton@wavecomp.com; Received: from pburton-laptop.mipstec.com (4.16.204.77) by DM6PR08MB4940.namprd08.prod.outlook.com (2603:10b6:5:4b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.21; Wed, 27 Jun 2018 00:06:34 +0000 From: Paul Burton To: netdev@vger.kernel.org Cc: "David S . Miller" , Andrew Lunn , paul.burton@mips.com Subject: [PATCH v7 05/11] net: pch_gbe: Move pch_gbe_watchdog lower in pch_gbe_main.c Date: Tue, 26 Jun 2018 17:06:06 -0700 Message-Id: <20180627000612.27263-6-paul.burton@mips.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180627000612.27263-1-paul.burton@mips.com> References: <20180627000612.27263-1-paul.burton@mips.com> MIME-Version: 1.0 X-Originating-IP: [4.16.204.77] X-ClientProxiedBy: MWHPR1701CA0014.namprd17.prod.outlook.com (2603:10b6:301:14::24) To DM6PR08MB4940.namprd08.prod.outlook.com (2603:10b6:5:4b::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb300aa2-bad8-420e-c8db-08d5dbc1d827 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR08MB4940; X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 3:rACsh21PxRcD4zmuxHlBg20gvI0aH9msO3aVeSVrrpiw4HQJznI9wL7pybaHkYaeRhKyCHrk4IInpZ9zq0MO7vKr6XA1T6+UlqGbI9yxiAB/W+6vfyx3pKlFNZDGDQ922vJH2XE8PAsRHRKYFvI4KSMDzKYLlImLdvBWvlFgL52oN67F6rIa+a/ZeQR+Y0W+yPK3290//IeMsd6U87pQO7MKFlqsyAcXGKOE0PZZTMLmy/K+oBPrrqj5D/ivOua5; 25:xWgw2W9b9t6bCgZdw4MuvldyphyLzMF/c8sSgqbkq+2CHxzko4gmaY/Qb+DHPjaGmHWzBbNQIy7fOLVHtYDzqUnE9/dMwIVd6opu4dp1qMKRWOtKBAymLI1wnx7WfOTUthPV/ZBqAUyAbI59XCW58j06oQJu01c2hwJJ4wEkZNcEz+aZCeum/wzFPNFuypROKE8DpYWdSspq64uLTu1QCnZgUKx1g1JWZrW5/GC3SGHlkLenkO+O9iGGbH39v7hzux0Rl5ZvaZ88yziI3Esl+DQ92dMMmOSGMYRL/ovMBaaCJ/wLPoGMgzfxlupCey2lTICHpHmKeaRXNMLOH+M89w==; 31:Hea1o9XM3nXyQsICjEjN0QKT2boDsIIg7VQLmSdK5lC3bC8XjUY0tiRCFqjvUCyj0lgznbL7vcihX4o5QBHC0L+9epQM6aRiIweF7Z1EjxGjbLi2kWs5XiSdCT5tAjabNX72mzsiFCH5US1O+cCN0hismKRc0/F1PvCySRXY3P9KnYrjgd0O4EYfQImh4RCJbU9AzPJlDLUBuqNzeEBZwQ6MTgMPHKfyMBDqiVjmRnU= X-MS-TrafficTypeDiagnostic: DM6PR08MB4940: X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 20:PHp3j+4C9Ju4ws+9Mv2ZWAuizAeJIpPi/ryHp0uEi32qkf4JaP2Xu2A1/KT7FCYlppQXpxlZuXLTUhzFRsrOGjx2FDRBYaBcu1tmraUTuXkrT9pnu3k5SNM4cPTGsQFn02RAIF/CN6DLPnVqgatAASDluLfUbkyz/LbcJmEKp+fzWg3FydFjn7ko7BmUuQdNsgwYR4PuRt3d+KJS9PUxOFGCa51r8FgUHcZOE8HCQbfNn8J/cFQ+I//7bCjEMbhb; 4:2OG+LvMFjdH3N4dA2JZ25yxtqq0teVeW3ybcxW2G3VMcFFicIUKtlKwJozlvBlDsjqGHD4jOFsROVsxRKscy1dtyw+0fu4aDE3HB0cP2vo4dm8DmHe/bUGaFLVLyoBS6paYxjPGc2q8NKqhm67qjOFdYPqW1UyJWQqZC9Ecwq5Z+AyN7X9rlmnKQqETwpXFXJwTxGss2NikDIvyYgpluy2OuXg5yb8KV4LtsxF8nu9hCJTVzvrN65oEzp7egdrWMhSwMeC7pNhfstl9P6LgV9xYlTs35bHre8+N2XWpsI3ctNTCL0JNCUyIfOnQf3atY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(2016111802025)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(6043046)(6072148)(201708071742011)(7699016); SRVR:DM6PR08MB4940; BCL:0; PCL:0; RULEID:; SRVR:DM6PR08MB4940; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(136003)(39840400004)(376002)(396003)(199004)(189003)(52116002)(36756003)(6666003)(5660300001)(16526019)(51416003)(66066001)(6916009)(2351001)(42882007)(14444005)(316002)(386003)(53416004)(54906003)(47776003)(26005)(76176011)(6506007)(186003)(16586007)(6486002)(2361001)(48376002)(486006)(6116002)(8936002)(956004)(476003)(50466002)(3846002)(446003)(1076002)(6512007)(69596002)(2906002)(25786009)(4326008)(81156014)(8676002)(50226002)(107886003)(7736002)(2616005)(44832011)(106356001)(11346002)(97736004)(68736007)(105586002)(305945005)(478600001)(81166006)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR08MB4940; H:pburton-laptop.mipstec.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: wavecomp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 23:Tu1xM0kqMAoLEaqBkg98hJN7dFu0Ma7XlAV7/n5ytGu+weKGRjKlT91mx15456K1rVVEPDTh7OJcXF+95rIKvJ/ueGV8jz96b3sDYAUid6vzgP1HU4UkFdMeWchzCyKdqp1t/osouS7jnpi+aW2+grxn4uqQ5Q8X2ivS+8VOdusCVH1YLNBwG76+8/OKeadpw36poY9NK6dBSNjV0tPLF44PPWwzyjfWTt2q8DtC9knmK15x8H5q9sx00408sDfBAaqOtSOcSg2nQf6Z3gJ8uhwfuYRYYCTvAg3vWTyUUoAtXBT3+vtJUrpxsIFpdvw2+rdr7klUdC7HbGH2B2FNAUS1HkM2/ufFz2WA21l+P4V1oo6jcvXoPlEARL/yMgWQ5rUma1c2qc/AXBlq2wzNaWwFVeA6zU+MjOGUTOz/pZ0GveAv7Rg6ZPVSUWZzEktvVtbbPYW3soy1IeLlo9yL+UGbyB/yTwvyBx5zmdYzHr8ladx+HQZXAV/8G1EwYeO2vWFTkLKdnt5zVI3H/FiHDnF40nLd+/ZTWQXEJhpOe8CibbVjLqOUsb81xj+3frNuvrQC9PYHXijmJx9pYbA7NAhAG8vddwX4mMmPpBT6A2hyGoWwQ6YENOLypCSfL7KLIPzzUAKGYnWhiDFoekLbFz1AcBdfbqkcdZ4zny0tsMf5y6yalwxOSsyRufXD5Xhe8+hsqdOd92o4yWCb3srX3q6QyL4dODX+FsSDwcp7O8LlrY3dRBueQ4mCUfbxrwZuUkXXN9SxFB1B9/BhcLzjaAZ1NMaJKiXItRtMh2gLIGawAZUWumaueEg6xk5YRQvhNDSJNza3D5XMYMRmqwncQNcWV+U+lnPbVJ8W/BHB0HNeUg6R3L+9hQvhtobdrBjB3EXI++0HBsq6Qy0rX4Q2wh2OX/cSs8YpfuPe6T543DPbF8WLbo3zKUNX90JsjqOSU522stgOmsnPFm/SFiqkEVj2Yrq+xGM7golmytTBHYWQF651qknf33I5S/F3IgIY7LaPuuloJL78mzetdmvlGd45yuxhHoZvB6enQJFyopNHT2IiWa6VS9KZL0x+vVx+FAikywPXzWlhIHrQWZwMzYRoJMCtB7QJfk+GFYpqzgNWlwLFL/+wYBt3nforOPWmMW8+xlaX8B8Z0XG4XbX1vVoPhLKPEEP2VkQ5GNDRb3cKV+bor9LAILk8oHXbPbqS4+R+B8whf8UwwGUmzatkJ1BZ6gil3Ypc9s5hSMoruX+tn2gpr13WThv2oQaeQfa9zJNixqt7vCEPtVduF03HYEv1b9KM1Crig1GbFU5B0rwP0lSKc7Tyof+SeBA4ZOTr6QKDzasm6/GVhX15xrmAkQ== X-Microsoft-Antispam-Message-Info: tg+0Dg1bVEYMq3XRJtOokJ3p5dOmFC7BlwirkAlpECWCyku82aXv6SE+1BBZko80bIoXYfG0OvkALUUOGI2ptXDoABD0ZI/PT8z6MCg9HAL7/tiYcZSm1ObBGx5EcnNBEgje4UtWpIs2xNqpfjPySW7caF1fe9Zp0sezm6ThN7JkXPglmEo4d5LmtfkMYwSCqCuu1dYZifR+aA9e8767mviQXPFKELNbTQr3CIkSQUoNZnvoYhbyCdnTMvQBFLHLwepq8OKYL3m0aR5EvIK3gPfEXuKeF0nKC2hKe3DagTOLCg4xq7DxczgK/SGDCihUfV7Z22MKn7YwvRMmInYVtcGz53qkcUVsmF7+f6AobxU= X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 6:vfUDH5zi5hOFtO+4UftbxJQKEXD9ZL+qTP20oHbxU2s8x+9fEAWFdjB26WLsAv7n3nlb5BR4RKEciCwC9ccA3YJm0iJQTMswI78h/Q1LaW7THbw/mjZMZmbOf5WBk1BsCKueNWWJiZcI4MIG3LY0z0f2/edrK5HQPOpOfVpuv7vgjPZZWLl5XvbrjT3QZmW8OFSQxMjSVAEu9YcQw3oVfW7TejJA84JZoxOC/TjPr6Q/a+WY6G69+kDryxtSHVWNDg8WxuarNssKDOL1Hjz/yoNv818liHoxQuqNSNhMEBrjp0BqGnzsYdgt1WVSfHguID0xN/KSLdrL2zlXxg12R/sEGRgAHKRXeRr71iYeLJagggbVFd4keDNP4+X9wmrmHGgqJ9GVIDZ+QakpoU78YYUF68Qoi0gJL6FN6TxvvzuALJVC7Juqfo+wbfmcgAtFWTklUI0ZUiDEg+lWaWZLdA==; 5:H3LMUVwiBdItgxHYUGYyIyE2Bc2SY2GtTkT2ajgEp84/OOzZi0OQauExcQTxLjrAQp2ruy7GtDAgrGh5IyY3DZhYbzILkGvkTwd/VnDiAD/0ogmby8nprFZASS66N8cPDxAcD/2AAT6+u5xV1lvhViuEmI9Nf0XHoWUJmbKEiHI=; 24:tu84uVtAagI6Xn4drpqgq0+m9bo72mYa1QmaHNYgr8Hanu5yy9HBBM+qRsNxP6EXxVUqi/NBBQ2IT8YCt8Z/qFltAdOsVfIMLFJtin1hzN8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR08MB4940; 7:HsFgZRo+cMgmOBq4ITmpXeONNQXBcNxFMLNTJn4qE3E5KWYls19nX9NdPPVuY7UMsZ46Vk2DqoVgKBS146Tw2wBC5V86c7NzJV4dD9VBwdBCXCSWYv1x37ibYC8y8TKBcnwnqcGnExeO2LcjtkVTvUZh/jAUfnfwGbcKL2feyfQgIDDZ6HufeqZFrrw7V9f6DGGc5c1Efk6FLhQYCLvjVigMjHRs3tqYBsqreyERFpsJ0FabFlIDUVo5GVDiHIQS X-OriginatorOrg: mips.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 00:06:34.0657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb300aa2-bad8-420e-c8db-08d5dbc1d827 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 463607d3-1db3-40a0-8a29-970c56230104 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR08MB4940 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch moves the pch_gbe_watchdog() function lower in pch_gbe_main.c in order to allow use of other functions in the next patch, without requiring lots of forward declarations. Doing this as a separate patch makes it clearer what actually changed in the next patch. The function is unmodified except for whitespace changes to satisfy checkpatch. Signed-off-by: Paul Burton Cc: Andrew Lunn Cc: David S. Miller Cc: netdev@vger.kernel.org Reviewed-by: Andrew Lunn --- Changes in v7: New patch .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 103 +++++++++--------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index ee38bba8b9ce..eb290c1edce0 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -1046,57 +1046,6 @@ static void pch_gbe_set_mode(struct pch_gbe_adapter *adapter, u16 speed, iowrite32(mode, &hw->reg->MODE); } -/** - * pch_gbe_watchdog - Watchdog process - * @data: Board private structure - */ -static void pch_gbe_watchdog(struct timer_list *t) -{ - struct pch_gbe_adapter *adapter = from_timer(adapter, t, - watchdog_timer); - struct net_device *netdev = adapter->netdev; - struct pch_gbe_hw *hw = &adapter->hw; - - netdev_dbg(netdev, "right now = %ld\n", jiffies); - - pch_gbe_update_stats(adapter); - if ((mii_link_ok(&adapter->mii)) && (!netif_carrier_ok(netdev))) { - struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET }; - netdev->tx_queue_len = adapter->tx_queue_len; - /* mii library handles link maintenance tasks */ - if (mii_ethtool_gset(&adapter->mii, &cmd)) { - netdev_err(netdev, "ethtool get setting Error\n"); - mod_timer(&adapter->watchdog_timer, - round_jiffies(jiffies + - PCH_GBE_WATCHDOG_PERIOD)); - return; - } - hw->mac.link_speed = ethtool_cmd_speed(&cmd); - hw->mac.link_duplex = cmd.duplex; - /* Set the RGMII control. */ - pch_gbe_set_rgmii_ctrl(adapter, hw->mac.link_speed, - hw->mac.link_duplex); - /* Set the communication mode */ - pch_gbe_set_mode(adapter, hw->mac.link_speed, - hw->mac.link_duplex); - netdev_dbg(netdev, - "Link is Up %d Mbps %s-Duplex\n", - hw->mac.link_speed, - cmd.duplex == DUPLEX_FULL ? "Full" : "Half"); - netif_carrier_on(netdev); - netif_wake_queue(netdev); - } else if ((!mii_link_ok(&adapter->mii)) && - (netif_carrier_ok(netdev))) { - netdev_dbg(netdev, "NIC Link is Down\n"); - hw->mac.link_speed = SPEED_10; - hw->mac.link_duplex = DUPLEX_HALF; - netif_carrier_off(netdev); - netif_stop_queue(netdev); - } - mod_timer(&adapter->watchdog_timer, - round_jiffies(jiffies + PCH_GBE_WATCHDOG_PERIOD)); -} - /** * pch_gbe_tx_queue - Carry out queuing of the transmission data * @adapter: Board private structure @@ -1973,6 +1922,58 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter) rx_ring->rx_buff_pool = NULL; } +/** + * pch_gbe_watchdog - Watchdog process + * @data: Board private structure + */ +static void pch_gbe_watchdog(struct timer_list *t) +{ + struct pch_gbe_adapter *adapter = from_timer(adapter, t, + watchdog_timer); + struct net_device *netdev = adapter->netdev; + struct pch_gbe_hw *hw = &adapter->hw; + + netdev_dbg(netdev, "right now = %ld\n", jiffies); + + pch_gbe_update_stats(adapter); + if ((mii_link_ok(&adapter->mii)) && (!netif_carrier_ok(netdev))) { + struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET }; + + netdev->tx_queue_len = adapter->tx_queue_len; + /* mii library handles link maintenance tasks */ + if (mii_ethtool_gset(&adapter->mii, &cmd)) { + netdev_err(netdev, "ethtool get setting Error\n"); + mod_timer(&adapter->watchdog_timer, + round_jiffies(jiffies + + PCH_GBE_WATCHDOG_PERIOD)); + return; + } + hw->mac.link_speed = ethtool_cmd_speed(&cmd); + hw->mac.link_duplex = cmd.duplex; + /* Set the RGMII control. */ + pch_gbe_set_rgmii_ctrl(adapter, hw->mac.link_speed, + hw->mac.link_duplex); + /* Set the communication mode */ + pch_gbe_set_mode(adapter, hw->mac.link_speed, + hw->mac.link_duplex); + netdev_dbg(netdev, + "Link is Up %d Mbps %s-Duplex\n", + hw->mac.link_speed, + cmd.duplex == DUPLEX_FULL ? "Full" : "Half"); + netif_carrier_on(netdev); + netif_wake_queue(netdev); + } else if ((!mii_link_ok(&adapter->mii)) && + (netif_carrier_ok(netdev))) { + netdev_dbg(netdev, "NIC Link is Down\n"); + hw->mac.link_speed = SPEED_10; + hw->mac.link_duplex = DUPLEX_HALF; + netif_carrier_off(netdev); + netif_stop_queue(netdev); + } + mod_timer(&adapter->watchdog_timer, + round_jiffies(jiffies + PCH_GBE_WATCHDOG_PERIOD)); +} + /** * pch_gbe_sw_init - Initialize general software structures (struct pch_gbe_adapter) * @adapter: Board private structure to initialize