From patchwork Mon Jun 29 13:12: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: 1319036 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=xk/csrET; 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=hgEVNH6p; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49wcZB3tQJz9sDX for ; Tue, 30 Jun 2020 05:12:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731062AbgF2TMd (ORCPT ); Mon, 29 Jun 2020 15:12:33 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:33140 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728045AbgF2TMa (ORCPT ); Mon, 29 Jun 2020 15:12:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593457950; x=1624993950; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=9v0NonQR+jd0mWEGjtTii8ov6prejkupZ4PNCmplmEQ=; b=xk/csrETvkiCrG/TQs1dhAawdWP/i2w5Ny5n9W0ZCZaATGoH15uerIxU VzQM4muKweLyHkodsKAimSJ//ecgxNCoggWS8u3q2isET95lLiMntaZCP 4oXf5stZp6of462c8wFNFvwZIB2WxYwH+zJQPBRDYJKwtMe69Z2Ed3GG8 +j+lfIpFhRZ6G6PeFqYJEiq6MzQjWB34CpEeUgsYey0lkFHQ3sY4XE+HD C17o4mnrTr7I8RsVSVNqVGjARSJCiGE8g3keei3xTq+iTfstq9CCuS+Z1 X+abDrPIHRsgw2Hhhd0LbI0TdMsctC+aH90cdQcNUCf6IgJikFY4zVHs/ A==; IronPort-SDR: UxPJI7sB2Tihrc+ahM18kSkoNy9TUt83SKYkh85hnQcHIGYnLnkkQ9poH6lbOu8gPLrz34yFWZ CF9u1bsBczYouxjsWHNvaadaLqyPmLxWnbjnQapCCXWOv8Ac82diRfM1Ko3aSryzyO9E2mpNbk P4Xsj7Be5nvhNRfue4MNeC6iIZYOx5Qo+Jo+mHuYL3Oivrqbq3c8MPobutgZUL8uxIiV1MoQa0 VpOTqplX58ff2QCwRuTE++c2guWgOxYVr+PhTnd/RWx7v03mfwlXgekXNbYb+WNokq8krlfikA s78= X-IronPort-AV: E=Sophos;i="5.75,294,1589266800"; d="scan'208";a="81221189" 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 06:12:40 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) 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:12:21 -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:12:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UzuJYTDNewD7zwAF/KHUUFzWua4FdQv25oKYNzxr+QxrKSPuAx+He//KF/fAFkO0Km+09uV3QIZnrBPkgPXAA1zzveZlrY0wUArd3EPR5A3pfg5YUwJTIvYZfiQNBygsYnJQ24Y/p6tr6JT4Eu/xFilQZTR4SDRXeOorBYoQg9LLTGobbJ0kWOBxab45+qUidPg4Hsi6o2uODY8UgC6fTtBu69DEPNC4n5iPWM7BtGQC5QYiA3K0Pz5XOjPKq/oFBG+uFKL9yClzMhwlc50U01QDWyKjS5NKeFgX3HP3/6Um0kag+8JqsV+wbivTw7cjcNO/M9at88fIYwu90QZalQ== 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=9v0NonQR+jd0mWEGjtTii8ov6prejkupZ4PNCmplmEQ=; b=TtwUejN88ntNp/ertWHTBLqNPG4QNmgERCGJBQftc8SzyxLMjlU26rBjBZWoiw53qt43Z8RPNr8JbybKaoIDoZzgJ09+FCWX6kVsHajssi8jtZOg2UivCuiZWzP6lQhXTsyh9ErM6Yj8aBAPdr9CZulE3yrnbIX/RkVXsK4/DEpu5AHR+s5Ut4+hxoLEeOc6u0xqF/AveijE0zU9U3Hp2AR83c08mhOaKsxX7nzT1k1tbvqyvla72jVYdRTQ/0EVoD1y1yV6Wupy3rjClnWXc59PUkIb9xpDqjRApq/raxEOTyXgwxrLQgSoJrJpWs2+QCjp9hn3SXvv99I4ie79Pw== 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=9v0NonQR+jd0mWEGjtTii8ov6prejkupZ4PNCmplmEQ=; b=hgEVNH6p77MUoL0ZJgPYzRkqoy3FncpQEm3pr9m3/HP0tDcYeaxdRiVwvJcfuST1VS5PMOSTFJMHSWzfaKQtQd3w9ilLJaFoO4ar3ysHg/8rchwZe8vrm74/q4Vg7KjmY/CJhznZLdbxt5GOb2xlomd6QnBvzyFBiTKgARtjsgY= 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:12: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 13:12:37 +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: AQHWThb1dhSsqe9GF0Cc+vjioDDITQ== Date: Mon, 29 Jun 2020 13:12:37 +0000 Message-ID: <574a2386c1b9ed6c18ce0f20d7afbae0826faaae.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: e61ebb11-e31e-4f2b-69fa-08d81c2e1836 x-ms-traffictypediagnostic: BY5PR11MB4434: 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: 9a69o0CHuKLo+dTjRQ0ptbUAS9ZjzpsHxHuoI531d31JLw6uqOgy2F8b86uBnI+bhz8stitN4/zz7k4vNRWbof3WRzzB4K0lg/lBGt31ut1ipK+2xwu0CWQsSOxIwlGDzapFCCM8YkOxB3+J8n3U4E2lusJKPOabU1dQdRde8EI2aGB4XTLwOmzhATHkLPsnX+CA7M2QAEjMVtPSqZ+/njyMhdBpcXdZwZaN1XWQahLGDaQHOX6sBoBzEX0hGGrSvJPJCQPkeuFKaebU+Tm2CR0mPc/7HbuwP5UotE6CbwiXE/HfWmv8QAHAYad+3yRcmNoCWFbpawOgP7WtWejlCw== 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: xqDm45XLn9J+BdHnOmnBSG18vFoko5NdgWB4XFl5lLY/Cozi/Jdy+TOZJLTN/il1Ct3wHlovsimjoPAqMbScvz6qEjxjwhPPvYTGyM4x1/9w+b30sjAFog2ywb1kXB4utk3+2NNpcOe3D4CVgxqNwi3+Ezdun1xwJQAFLAk3bFnrs4OLAJzlL9sH0WkjMEvOelzl8nFbkzRYg4/KjiJERLpihn5iSP77WTSnBqifRt6HuDZGvllqikkAgcuENXL2sjZMd16U/QvKjBUphu9lDfQCIcTD2fENSfoFTu2Si+ZPlFEw5aa3XSLQu16og1D1WbmKvCYwx0K8KLPTWK9r9iR38DhEw1/EvDZy6bGt0PbG6A8e+sFh+GGkIuhp/drtt03W3mlTijCtbOvg8jDTXUQ9ZlIDYFHxAOWj+daTCpmLYm+pI1iPMEjwjtTgCN0mriJlG0bsztD/ffK4eYi7zOXIA/4s1q3tk/UaR//Z2aLuoRSFehnMsvMEL4nNR7Yq Content-ID: <4F92DBBDCB4C98499C62D5C4FF37AB96@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: e61ebb11-e31e-4f2b-69fa-08d81c2e1836 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 13:12:37.1608 (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: BzSxLzh5sPEerYpDAq3iL/GE9dqq6IrBQ6JUWPeG4VrBWFe6WNkVRqvKFn9B+0ZoH8qgPmriSWkL2I6ZJYD17siti5C3bPfE0rOZUPk/8MU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4434 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,