From patchwork Mon Jun 29 20:01:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 216907 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=-4.2 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,UNWANTED_LANGUAGE_BODY 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 1514AC433E0 for ; Mon, 29 Jun 2020 20:02:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D91A320672 for ; Mon, 29 Jun 2020 20:02:23 +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="A30kY/dn"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="F7bteOrZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388676AbgF2UCV (ORCPT ); Mon, 29 Jun 2020 16:02:21 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:16407 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731899AbgF2UCM (ORCPT ); Mon, 29 Jun 2020 16:02:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593460932; x=1624996932; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=EB+APyaleRVmPJVAGCa5i+yCnTzlPa1QLxtKMqPwPJU=; b=A30kY/dncR1FRoTCBuF4rN26zeyGbf5lnvWu0tBRR45M3Jwl68rhrrjA l3IwfCQ6TMe7al2bhKyAn1Fv3BqxOaKbcP2jw4VRNRkZDPQYXRjyp668n t5S/koDdAMJnHprF6vw3ixs1vaHadirhW/WGrXv66sTCdekNrWqQ0OT4E ATA0dl3wf8Uh1I1SaKBypfxNF6xDKenmaNy56RHaITTV3ftSZenaN2/Fj tuS2jmunBB4wnmfO26+8avjDg/O3UpCdrTPwo6CWq9huFi+WpKEnnW3fm lJmCG88q6uyJN8Nlszhl2TXC+H7+OLKLgkn94kXFABs1rnrc2iF4Avrfz g==; IronPort-SDR: s2A854RC44Ng6FSMBB+VDmYLYbaKI8leO6uH5HlLjf8IdKHgJt4WOCU2fdna+fWCCFLZdTXgSN LLOeVyXPpXcT2cvKb6AP2HrsMrlzZgAFKK4Ewm1STF5+FBQ5FbntASeICNkGUQPIgVVN9Grv4+ m9BYzpP8SN47TNe1kCa7xWy/P8p8slaZ9K2IezOydBVkMFlnfLjzYAlh+ZoY/C5zpDHVBSVU+R jyB2DPTnNiCO5cM13y6jEf2qpze/H6L1mwy4qf+YRbRLjOcmBn5SMLFpMFbKwT4jwSKYPs8mPB FyQ= X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="85542655" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Jun 2020 13:01:53 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) 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 13:01:53 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) 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:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wsb+uyZ86sPf4VGj0ayDoXO+QBzSMDtOsy9kWYOf97Z1QeOKwt6OY4TXv83ENF3TJOBYk6kUGbQTeGwirEGDVPv2xdMedrha1Ry19qXXfz+jYJgnucsmv6EyqjlHhK83cqKGN3fi2wRDVfCYe5AyfFFVTmycA/r3n7ru6x9n+05Ro9doOly404YlU8L03490FVJu4eJTF54Zflbnv4kIeRG9YZkfNs/CsTvyg2QQDnQMvI4893KfxYCRSWbwKWrQYkUyLjM9a/wamT4uo3iJTt6/X6y6CNOneHgVpEQTwb+vdSFSnhFoWzM86y6xZCRAIIGex9zrx81npUxLc1T8RQ== 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=EB+APyaleRVmPJVAGCa5i+yCnTzlPa1QLxtKMqPwPJU=; b=bChGzZ8DIW8cUkAiBc1vRL1ZXGwVlvsRAt+D6+AgDAEChKiwHtE6y4ZAWz//29YUc5FTkLs0/aQVr/IWb5PLx5IrfZj9LJ7n9QktMuvKFi0u7OR2FEwehi75N4TfLEndJ82Dp+UdxVC+bxYDKzrvqJ+rN7MqU7O75kdKlti/PS+Fye/y1cUeZdg6IRtIdqECJjjpLKnqXBTzRES76LA96zwTQl9mN/civ5ZGpruWDwfQ7YyGQ6WWLIxT3GhOhsHco9YSm5ytwhSwqu7/aq0HR0ZApfXCjezMr2EAvTCu/aTRKCxNnfPu7jIkvJvckkDSTxfBVpYOd9/wKYEVEAw4kA== 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=EB+APyaleRVmPJVAGCa5i+yCnTzlPa1QLxtKMqPwPJU=; b=F7bteOrZ2hJ3bWyJEIXb+NtXZ+NnL4TPpKe4QLHadup23lJcgMbNf8AFdHWOPDMveujl6HcPAPbmD2EnMQjn+XH7uAIcM3JuPd0rXtMtOx8rPjrUfLHJ3QOQVI5R3xv29lL6b7WAvFjvfHVKn1nqWESYBBjBWI9TN1xj4fSYkvE= 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:50 +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:50 +0000 From: To: , , CC: Subject: [PATCH net-next 5/8] smsc95xx: use PAL framework read/write functions Thread-Topic: [PATCH net-next 5/8] smsc95xx: use PAL framework read/write functions Thread-Index: AQHWTlAgCd9g40loA0yzf+9zUiDr1w== Date: Mon, 29 Jun 2020 20:01:50 +0000 Message-ID: <1042a3a5a592b489ca803fadc5ddbb8d7b8ad82f.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: 7586f594-51c6-44c6-5769-08d81c67433a x-ms-traffictypediagnostic: BYAPR11MB2792: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:255; x-forefront-prvs: 044968D9E1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OcoYKK2GI303+cC3nSo/Da9ilPORpL8LTpNpjkrFudZhWvWR8a5dTYxLcP+I5kScna9+S2QtAobQrAn4R/Pcg3oc0RvUlatPyFaEkSByU1EJ472j0IAGLWm9Q73adVPgIKkeP/BVo4+DzDifQZDB+QpAjY2r+HbsIiAiXDhfhB7x1in4NTfqNgl2ens9VSFK8j9jLdIkDlzggEPVdeoEyHNKTG61HfIzY95U1x4yJM3TV/KarCdWH4Egsd3nvsoZIl0CZoOQr034QVT9/C8Bzo0QXhLNKFq8PADrltmlYNqvclKso6/+65mmMRm6Kdqy8cubS/bINvQ+lk7bhGieuw== 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: KHOvojJl8F2X6GAhrSfbWfGpMC2MkZrfQFdMIyz6afxwood+nSGIfgwViXc+U5eQs6Kc9enF+sO1wZNRFaaPedwWRotapL5bWQNP3KkyGLk2kx/qxZAwbmoiacKApF+m57ZimxNXvlbEMgCvskC8yCYYUs6BUjYHxuYue2yLTWrHbAk8gvwkM68Uon2IRxEGlnVi+njRcegQkSTKYWj9Pq4yEIYfT+k5rtmMniklTXqoi+5FgA+ITFKrELysmbqMa79iCDNVCW5gJfXFvMHlejcD5fZpHWuHulTEIGzRQKdGf9Y9uF+zeNHGPl0Juc8RmTRCRF2R76s0H52rx3baI6HuPMqWPpEerv3NqZalh0XPpNlbBcVJoGtt2guGgjl/jfKHmQ91xoL313cvPZDPc5t09n+L6bs6Xt0LTCGiwFoPd0nVAzvGOiSovTAwetd0wy1sv6hODG86QVvQYCtmX0DFAAFBJSiP9x8QapWw1odTB7npyKWU5RsQ2xdl1hva Content-ID: <405BC85156EFD644B6F786613ED5185A@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: 7586f594-51c6-44c6-5769-08d81c67433a X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 20:01:50.5932 (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: mvx7zjApsWCZ/7ND9BlNlx8ZeXM9TjA6E9k8OGzbUyjCAAmvYGo+yYjZc1MXD9FCr2cQV55FNjXvoyb+D9zrTw8SX4hkgEQJX6XeF+ktR3w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use functions phy_read and phy_write instead of smsc95xx_mdio_read and smsc95xx_mdio_write respectively. Signed-off-by: Andre Edich --- drivers/net/usb/smsc95xx.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n", @@ -753,10 +753,11 @@ static int smsc95xx_ethtool_set_wol(struct net_device *net, static int get_mdix_status(struct net_device *net) { struct usbnet *dev = netdev_priv(net); + struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev- > data[0]); u32 val; int buf; - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, SPECIAL_CTRL_STS); + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS); if (buf & SPECIAL_CTRL_STS_OVRRD_AMDIX_) { if (buf & SPECIAL_CTRL_STS_AMDIX_ENABLE_) return ETH_TP_MDI_AUTO; @@ -782,39 +783,31 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl) (pdata->chip_id == ID_REV_CHIP_ID_89530_) || (pdata->chip_id == ID_REV_CHIP_ID_9730_)) { /* Extend Manual AutoMDIX timer for 9500A/9500Ai */ - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, - PHY_EDPD_CONFIG); + buf = phy_read(pdata->phydev, PHY_EDPD_CONFIG); buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_; - smsc95xx_mdio_write(dev->net, dev->mii.phy_id, - PHY_EDPD_CONFIG, buf); + phy_write(pdata->phydev, PHY_EDPD_CONFIG, buf); } if (mdix_ctrl == ETH_TP_MDI) { - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS); + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS); buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_; buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | SPECIAL_CTRL_STS_AMDIX_STATE_); - smsc95xx_mdio_write(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS, buf); + phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf); } else if (mdix_ctrl == ETH_TP_MDI_X) { - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS); + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS); buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_; buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | SPECIAL_CTRL_STS_AMDIX_STATE_); buf |= SPECIAL_CTRL_STS_AMDIX_STATE_; - smsc95xx_mdio_write(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS, buf); + phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf); } else if (mdix_ctrl == ETH_TP_MDI_AUTO) { - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS); + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS); buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_; buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | SPECIAL_CTRL_STS_AMDIX_STATE_); buf |= SPECIAL_CTRL_STS_AMDIX_ENABLE_; - smsc95xx_mdio_write(dev->net, dev->mii.phy_id, - SPECIAL_CTRL_STS, buf); + phy_write(pdata->phydev, SPECIAL_CTRL_STS, buf); } pdata->mdix_ctrl = mdix_ctrl; } diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 3b8f7e439f44..11af5d5ece60 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -574,7 +574,7 @@ static int smsc95xx_link_reset(struct usbnet *dev) int ret; /* clear interrupt status */ - ret = smsc95xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC); + ret = phy_read(pdata->phydev, PHY_INT_SRC); if (ret < 0) return ret; @@ -584,8 +584,8 @@ static int smsc95xx_link_reset(struct usbnet *dev) mii_check_media(mii, 1, 1); mii_ethtool_gset(&dev->mii, &ecmd); - lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE); - rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA); + lcladv = phy_read(pdata->phydev, MII_ADVERTISE); + rmtadv = phy_read(pdata->phydev, MII_LPA); netif_dbg(dev, link, dev->net,