From patchwork Mon Jun 29 13:11:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 216918 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF174C433E1 for ; Mon, 29 Jun 2020 19:33:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C08902076C for ; Mon, 29 Jun 2020 19:33:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="UBIplL3j"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="Pu7S1DV6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733236AbgF2Tcp (ORCPT ); Mon, 29 Jun 2020 15:32:45 -0400 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:52985 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733186AbgF2Tc1 (ORCPT ); Mon, 29 Jun 2020 15:32:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593459147; x=1624995147; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=Qs69Z30JUOWLzXq7gWzy7d4CyTdtgAJq6V2MjQlqXgQ=; b=UBIplL3jSaH7PJlX3rv+u4qys0dhwm/3PeTVWl2hKJDIf6EqXNr+Nw3x 6/T6UUdoisaCh2Fv2syc/sHNPNS5GD4svYiIi9ymmJzMtwWXu3usRfB8f 7Sf+LNoLf6WR7D3HA7rgY+fcSZAZkCcSmWRDf3/eUKAp8KbecvfZENMmo bga11fFAn31Mu7WGdJDzERmcxcawWLHZupIySapqjKqZBMCj8Mv1R9N4h THhB7SjJ9UpcHprHxqPXEerW2s0pTC0XcfFh0UnzsqkAB8FjzkC0Dv6c8 RUWCwm69yz1TBR2jvOvKyRIReZeFfsZRnyFVqt2c5gq9fp5gwY7ENtDCe Q==; IronPort-SDR: 2kzJjTw4Yw69CkgRfkC8sG6tkeIPaGCqRWDUYVFU97n7zYSMmId13PfVnF4AHjuhhejc6DRSu/ Cg3LSaTyqMrcx0kxAMCa4VqMPOSS4Wa2ClhHaKqADnE8zLANAaDSvZjRkof3clI3/r7blBstBz AS3nxs2Ba0kZWBIVmpi/JBtjpIQQEdIqeUq9/O782Or2GOpiwr0dbAMjUX+Snt5xKtbeCDVDXS XPj9DxD/BRA3/0xrxhqP4sYnJeC68Vki+80uo4AB4ij0hd7wEk2ry8prQz4zx/gOCecIU6ZNiv Qz8= X-IronPort-AV: E=Sophos;i="5.75,294,1589266800"; d="scan'208";a="78141735" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Jun 2020 06:11:49 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 29 Jun 2020 06:11:49 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Mon, 29 Jun 2020 06:11:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IoYv9qaK/c4QN+q8B74SUviLNcN7KJbdW31q6WbaMfQ4gbuSc5qlNz+iMuXcSLuUhhV0DYY2JEP7we89yVUtZH0NPyH5nLwl4v09fBPdsvGtf0BjALZcMnCRgxa+Mt+PoJ79EQScQnwr6TvlzkmY3yAUtoVbJDGjB0j8X6ZdTEpzJZwwB/V2GQSBaZApWWDODcW5gz068DEPfNjCShmRwxz79yN5AEneEnBKXXpyU1fOpwf62B6w2rTQwVWkykqB3ANMoYsSrFe1LlrYi651pEoln7LnEcmRrpwLUtbqZhGVho1yTW6Sdb+gk9gEza+EcLrpbCLyS59a9O6quQAEFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qs69Z30JUOWLzXq7gWzy7d4CyTdtgAJq6V2MjQlqXgQ=; b=cKP1x63jYj9SpJ5iqWgsISVDodpsY/EeAZQoFwaydSAcAzGJOthqKVp2Vfdy6OP+0/LEAtw8iDSRHbpZAEC1mhMwoR3V4cz5NN8IBaKZ8OIAajaJCxijOLbgl9ynGryPWGdOBA3OJ0+kvT5WMpwpx5CdnVK4N/21g/WzPJRFmbW7g3OLIKfttHlgs5r0lVOUR/gnk3OMHbE0GBoE3SS/HXQiiiltkFRt0gA6S7EpBlNBRZpTWk09l3H4H73ebePh61R+8YI+ZVIqgse5Tz0qCCRKUlcWJOeAhiQVR9LhU1TxchDSzFXPt7kUaUPdDMiT6XPcImmzNhQY3DbKGScBhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qs69Z30JUOWLzXq7gWzy7d4CyTdtgAJq6V2MjQlqXgQ=; b=Pu7S1DV6BUa0tEvO44PxLbqve0hTpyaqKF03PU+nHkvASfru2OU1V7WOFgkPSFW9QZMb4bIsDno/c9aBC6Wuq/xSDtu/DMqDOnqyVDkzq7Gl4Ty0ADDgwL+glnaDhWJOkg2VfZuxdbnJNedADKyQNFqNrV0IiY7xMkfiQZ4niUI= Received: from BY5PR11MB3927.namprd11.prod.outlook.com (2603:10b6:a03:186::21) by BY5PR11MB4434.namprd11.prod.outlook.com (2603:10b6:a03:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Mon, 29 Jun 2020 13:11:47 +0000 Received: from BY5PR11MB3927.namprd11.prod.outlook.com ([fe80::5993:d0ac:9849:d311]) by BY5PR11MB3927.namprd11.prod.outlook.com ([fe80::5993:d0ac:9849:d311%7]) with mapi id 15.20.3131.027; Mon, 29 Jun 2020 13:11:47 +0000 From: To: , , CC: Subject: [PATCH net-next 4/8] smsc95xx: remove redundant link status checking Thread-Topic: [PATCH net-next 4/8] smsc95xx: remove redundant link status checking Thread-Index: AQHWThbXr+B0X4aF20usRiS6Eln+hw== Date: Mon, 29 Jun 2020 13:11:47 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.36.3 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [93.202.178.57] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ab5c3853-c57c-4c84-6083-08d81c2dfa63 x-ms-traffictypediagnostic: BY5PR11MB4434: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:1303; x-forefront-prvs: 044968D9E1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: B0+bCMrl6Ni8m9pWwv8KCFQvqc1ToZh9wzC2SADa0SnQnvfY6WDR67anK65KPk1BZVXRgpgex2gP1BqeMbkF/uux0bSZNpKGiwoBXaYL7JqoSKLgRz1/Dtn88pf4lkf6Ggg0frPm2NeF1MY4mmm+mYog/WnsS4dME16H76ddvBa0G/dDz1alTGJu9ouKFGwqf7/WY5hkzwNtAVeKUdCH/KybAtXeWfSN2J2HeoAEvUXXDweyhAP/1DGqAImiZBaDDKPVnus/m4ShWtiV8Iv9zVWlQDRftJkE5CK7YasIDOnCnu5vhTX4h3FV+xmOkUIs x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR11MB3927.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(396003)(366004)(136003)(39860400002)(346002)(376002)(83380400001)(6512007)(8676002)(8936002)(5660300002)(36756003)(110136005)(4326008)(316002)(2906002)(6486002)(107886003)(66946007)(6506007)(2616005)(76116006)(91956017)(66476007)(66556008)(64756008)(66446008)(186003)(26005)(478600001)(86362001)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: fzneRlh9dq0FK7/fLCBB/oDAwF1iEVFZqrtDwWDlLmYuxAdqjlhvoRDFwHhdyOohR98NV6kAglIXCYIUmsW8s8h4cwD8kN8W51aqIT6ZS2T8cg1nlYfmnbwswE/5AZiFfY7IdrlyDbziR9DX3aLcY+ZpNJyrulcpm0QFVVguykhD6PLsJxiftkcWNHmcbjPMNTM0YDy8bt3CRckYupSbawASKr7zAYyxX3XVD8YgD/B16MgTHToo1Tu5DrAxdoBw0K/hclUcAbq0V5QdLYN/77gbR8NouO1WyjpMYsRmjtCfr+f8f5KCdjLLxDPQeMDMIDZwneR2LAUelrxVRCA/pOu6IQ23YZNmNPcP/A+QJUVfK0QFvCsxzZPCrACVptYKfyN8Rw7GBGAAESYvlySt/0ifoCETBGWPvnSV3IB9fDHzSNmlGfe1QahM5eU4nmWGBxbZmd1njKqRPbG+1mlVUISxN+2Zpcp/XI9Om7bOZ6s= Content-ID: <81E1262AD1C35C43A83B4BE298672966@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3927.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab5c3853-c57c-4c84-6083-08d81c2dfa63 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 13:11:47.1598 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9oFUVv5wH8tdjs6MkWRvdNoUPopUU2Oik9Qx0EfhtfGvlaCJ6cRCu2waVVpJxO9qRwBQ5UjXSSSBm2iJbmC3xStZi+K1lgXCphjV6kS8TSU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4434 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Current driver supports PAL that does link status checking anyway. Signed-off-by: Andre Edich --- drivers/net/usb/smsc95xx.c | 55 -------------------------------------- 1 file changed, 55 deletions(-) u32 chip_id; u32 mac_cr; @@ -64,8 +62,6 @@ struct smsc95xx_priv { u8 suspend_flags; u8 mdix_ctrl; bool link_ok; - struct delayed_work carrier_check; - struct usbnet *dev; struct mii_bus *mdiobus; struct phy_device *phydev; }; @@ -636,44 +632,6 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb) intdata); } -static void set_carrier(struct usbnet *dev, bool link) -{ - struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev- >data[0]); - - if (pdata->link_ok == link) - return; - - pdata->link_ok = link; - - if (link) - usbnet_link_change(dev, 1, 0); - else - usbnet_link_change(dev, 0, 0); -} - -static void check_carrier(struct work_struct *work) -{ - struct smsc95xx_priv *pdata = container_of(work, struct smsc95xx_priv, - carrier_check.work); - struct usbnet *dev = pdata->dev; - int ret; - - if (pdata->suspend_flags != 0) - return; - - ret = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMSR); - if (ret < 0) { - netdev_warn(dev->net, "Failed to read MII_BMSR\n"); - return; - } - if (ret & BMSR_LSTATUS) - set_carrier(dev, 1); - else - set_carrier(dev, 0); - - schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY); -} - /* Enable or disable Tx & Rx checksum offload engines */ static int smsc95xx_set_features(struct net_device *netdev, netdev_features_t features) @@ -1363,11 +1321,6 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->min_mtu = ETH_MIN_MTU; dev->net->max_mtu = ETH_DATA_LEN; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; - - pdata->dev = dev; - INIT_DELAYED_WORK(&pdata->carrier_check, check_carrier); - schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY); - return 0; unregister_mdio: @@ -1386,7 +1339,6 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf) struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev- >data[0]); if (pdata) { - cancel_delayed_work_sync(&pdata->carrier_check); mdiobus_unregister(pdata->mdiobus); mdiobus_free(pdata->mdiobus); netif_dbg(dev, ifdown, dev->net, "free pdata\n"); @@ -1651,8 +1603,6 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message) return ret; } - cancel_delayed_work_sync(&pdata->carrier_check); - if (pdata->suspend_flags) { netdev_warn(dev->net, "error during last resume\n"); pdata->suspend_flags = 0; @@ -1896,10 +1846,6 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message) if (ret && PMSG_IS_AUTO(message)) usbnet_resume(intf); - if (ret) - schedule_delayed_work(&pdata->carrier_check, - CARRIER_CHECK_DELAY); - return ret; } @@ -1919,7 +1865,6 @@ static int smsc95xx_resume(struct usb_interface *intf) /* do this first to ensure it's cleared even in error case */ pdata->suspend_flags = 0; - schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY); if (suspend_flags & SUSPEND_ALLMODES) { /* clear wake-up sources */ diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index fbb80a7aef32..3b8f7e439f44 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -51,8 +51,6 @@ #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) -#define CARRIER_CHECK_DELAY (2 * HZ) - struct smsc95xx_priv {