From patchwork Mon Jun 29 20:01:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 1319128 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=ONgSBqX0; dkim=pass (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-microchiptechnology-onmicrosoft-com header.b=HNj+2+8L; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49wdfx2XxWz9sTG for ; Tue, 30 Jun 2020 06:01:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388485AbgF2UBo (ORCPT ); Mon, 29 Jun 2020 16:01:44 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:37694 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388663AbgF2UBk (ORCPT ); Mon, 29 Jun 2020 16:01:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593460900; x=1624996900; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=GuKqolz5JdJf4NWj/t5ROC5tWY4P7hBzorVaD0wUBR0=; b=ONgSBqX0WA+aPrucbIUV4Hw8FU48DVvTzJsSoshXqFE/SCXcyw4ACCL9 MdiCK60njCc+ZQC3TLkJHeEWHFyfG3v2LGYR+V8ZtXvuJ+0CnRS+UagG1 8+eh4aSTnQUZPISlH+arBm0OZR5gGC4bZih3jJQoDLoApmkShx321W4hg ON/QrOQw7cKYFkBbtNxrgKb5/IxIe7pDdDDDBFol0dU0YvKiKMIfrnlyL vZEQnmsoIwsis3DFcItZAxbsBcHu+dEsjkfC66b1XzfuJ/Fv/aA60Tpf3 OxVBBwlUTvBFbh6GycC7twcs0HMlkM5KFsg0Z7ZLyItCZTGm3I93NTTWM w==; IronPort-SDR: DG4Q2CbTr8Z3dwStGRTe3WENELPH4Eg0B8a4UPDE5O/pHlTERkUG+ZCG2buHq0CB0Dumcu5Ap1 ONjixcK0sflLz136wqUrNmhL97ri0Pc51LLaKCcLB0TAs7VHyK8d+5SvnajUoyfWNdCOx5QGqC Yw71afDWoEqBqj6qzieFDLlQFgpLZ/PPa8v1hpRlD/4N5Yci3RXJGhbc4Zrm9U/KoRAkWK9cKf 6nlWjhc37UwUHZKWqrEE2uXCrHfZfgAC78rpejocoPrJtAV2/1ost/ft+MCfLIYAV/qlqFPSNX 4IA= X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="81282299" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Jun 2020 13:01:40 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) 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 13:01:39 -0700 Received: from NAM11-DM6-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 13:01:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c2mW6AgvpZVmEkx4yA8IB8DKMeRRMhpgUttJW1u41OU/USUwulTKiJmBKQmcNgy3g2rxxFU4UTcI5VReGPRy6c+NJ3DDrLtJiJfPJ67OlNYZYssGHlu740I4lRr6tOVq0GXLEbJA05G+M+Pj9kEj1/scyH2Jne6ANXjFj2Akv5hJHlkoUS88boIwIXUyiOqfTOraUpXgpm/6Z5h/A/tfBYpeXMJpKH9p3awmnOzr69NsJhPIDKGXGgtFhF3FXppGLSRSits6OKmVbQLwZ+0q3l19nMqwdVDaiCj5YHiqqAnX6UnV4UQQoTVjP3TXoi7bgLIkEfJst6K7pY7L9+FQaA== 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=GuKqolz5JdJf4NWj/t5ROC5tWY4P7hBzorVaD0wUBR0=; b=NE4kZmaos4IMN0cYcjSHwCF0rRB1HPFsyDCf2dnwGLlw1yE60QM95/OiEyacrCKrUXhBj/9Znc6J6j3YuOS0vFuqNKRtnO2VTbMYkG2k10Cscg91ZqufHc8KjpbRNnaKx5a7PQV4CEsooGGbns1z2yveWKhRTbCbJpih3qGAGg/BBLPgpLTeJccqbXagT/9rcbJfW3b6jqINPFY1EY2lyughKJHClletmKHe4R5yQmHxddM2YteN/kz6Lx4MJ4wpgd7E0wZX2EtM3rfi3B4al2xbd1ZTzfdwNfzpgWfw+unRNl3pljZG4LIWwo36W8KxHzCpLsd5tiejtA54r5lUJg== 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=GuKqolz5JdJf4NWj/t5ROC5tWY4P7hBzorVaD0wUBR0=; b=HNj+2+8LDZJJpzwsK9m7KD9m8Hu2dgCunyGORDLL1lP0lztc+7vmDzi7XkIPyVzbwx1R9ptaPevRUuwFNeDgfbzLa75EGNoL3k3G6oC+X4vH93kYAVhPHX2PKvgB/FnerNUpYQf5Kjy6SmkY9iES0tKNInweEEKk6HEqVPeSp5g= Received: from BY5PR11MB3927.namprd11.prod.outlook.com (2603:10b6:a03:186::21) by BYAPR11MB2792.namprd11.prod.outlook.com (2603:10b6:a02:c3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.24; Mon, 29 Jun 2020 20:01:37 +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 20:01:37 +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: AQHWTlAYtCMdiBWdTkmrUkiuLo/zjQ== Date: Mon, 29 Jun 2020 20:01:37 +0000 Message-ID: <5aa823eedf590bd7a3e27de5223aa1204bb3d811.camel@microchip.com> 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: 9c64c2a7-324b-44f8-032e-08d81c673b39 x-ms-traffictypediagnostic: BYAPR11MB2792: 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: EgyOgoC0nCBiWR7XnF4ZSxLKZ2/dhUkk7hd2gMw5TzESEnRNb5MQwkf2RM97uAyB7OioGFSaFAW96hyRl62Yrf+RHhMydrGudk4wojXCj0guZIrtJZZXPdhh+Er3fsYRWaTqaYDIlndooun5bbi6JYdThTTPXQAsA0Wwv1X86oEakipQUZR9N6gPFqYdZ8kK++RSNT04MEklmZpdX7BNYSmRaQQJe+pZOINArbUCEE+rX93+FF61QEbh0rOt17w3Cw+C1f+AXR5P3WtAVn5XZfexZBHZZibl9PxJwV/xpIRib81S9BpqlPDttepGNSHs 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:(366004)(376002)(346002)(396003)(136003)(39860400002)(6506007)(4326008)(110136005)(478600001)(2616005)(2906002)(8676002)(316002)(8936002)(36756003)(6512007)(186003)(86362001)(83380400001)(71200400001)(26005)(6486002)(76116006)(107886003)(91956017)(5660300002)(66446008)(64756008)(66946007)(66556008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: hOmZqn/EZX26KJPmcQPpRMKMJjO5pQ/dI482pPLRF/N1J6EE8mo04Nc6T0cUlTVBbwULKo6d4QxAXdu8WjxI/+NJmmAatKnMJdtShkwKFT71cZjihpV0/ALoSSOBj/yJWO8AyBki+JmBYrAuBo9EHnKfIQC2FSgpUy/japou3nbH5qZXfy8UP5M1aE3B5qhkfdLr8gsjvwWGQgZQpjMN+SirhqlpWk2UItplRaRy4TizI4/+Ncm7kQK+g4uD8g5qW8Yin8YNs6x/cLVmWZj0kCG88sH4z2s/2t+xMQJLuLHpX4/hQf9z9EpLMvAfkl9UGzRymrM8muKKws3qS7fEultEjqvvPtuSPD/GOzs3J3Jmns3NQ949nxo/kaa7yDciqgkUO/SwoW3VGyUeAxYp9k+EKehgsNgTwRZoM5B1cheslv1sspLiLDAoDfqAamtjUkyWYGF534xJwXKMy+SRX/iQU5eYY7fweik7dSNUVptsSYd+/mJACnhGF3OKjLS/ Content-ID: <98A003E78B4D304BA1238DF22741617F@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: 9c64c2a7-324b-44f8-032e-08d81c673b39 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 20:01:37.1807 (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: ML49XZPM3zYIxQpBiXrfnKPV+cRacflxTHq/2dpD+MChqtV5PoRr3vfi+5m0vMB5gbyTNokk8SMWUfi3uQ9LU9lijcDkVjDPlK8iVENcOZk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 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 {