From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Subject: Re: [PATCH 10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Date: Fri, 4 Jan 2019 03:19:01 +0100 Message-ID: <65fa6691-eafb-d8ba-c7f9-28f7cf19396b@denx.de> References: <20190103011040.25974-1-marex@denx.de> <20190103011040.25974-11-marex@denx.de> <20190103133912.GC21849@lunn.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, "David S . Miller" , Nisar Sayed , Woojung Huh , Florian Fainelli , linux-usb@vger.kernel.org To: Andrew Lunn Return-path: Received: from mail-out.m-online.net ([212.18.0.9]:35655 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbfADCys (ORCPT ); Thu, 3 Jan 2019 21:54:48 -0500 In-Reply-To: <20190103133912.GC21849@lunn.ch> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 1/3/19 2:39 PM, Andrew Lunn wrote: >> 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; >> @@ -793,7 +794,7 @@ 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, >> + buf = phy_read(pdata->phydev, >> PHY_EDPD_CONFIG); >> buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_; >> smsc95xx_mdio_write(dev->net, dev->mii.phy_id, >> @@ -801,7 +802,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl) >> } >> >> if (mdix_ctrl == ETH_TP_MDI) { >> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, >> + buf = phy_read(pdata->phydev, >> SPECIAL_CTRL_STS); >> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_; >> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | >> @@ -809,7 +810,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl) >> smsc95xx_mdio_write(dev->net, dev->mii.phy_id, >> SPECIAL_CTRL_STS, buf); >> } else if (mdix_ctrl == ETH_TP_MDI_X) { >> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, >> + buf = phy_read(pdata->phydev, >> SPECIAL_CTRL_STS); >> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_; >> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | >> @@ -818,7 +819,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl) >> smsc95xx_mdio_write(dev->net, dev->mii.phy_id, >> SPECIAL_CTRL_STS, buf); >> } else if (mdix_ctrl == ETH_TP_MDI_AUTO) { >> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, >> + buf = phy_read(pdata->phydev, >> SPECIAL_CTRL_STS); >> buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_; >> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ | >> @@ -968,6 +969,7 @@ static void smsc95xx_adjust_link(struct net_device *netdev) > > All this crossover code should be moved into the PHY driver. Fine, this can be done in a subsequent patch though, right ? I'd like to keep the changes small, so if something breaks, it could be bisected easily. -- Best regards, Marek Vasut From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() From: Marek Vasut Message-Id: <65fa6691-eafb-d8ba-c7f9-28f7cf19396b@denx.de> Date: Fri, 4 Jan 2019 03:19:01 +0100 To: Andrew Lunn Cc: netdev@vger.kernel.org, "David S . Miller" , Nisar Sayed , Woojung Huh , Florian Fainelli , linux-usb@vger.kernel.org List-ID: T24gMS8zLzE5IDI6MzkgUE0sIEFuZHJldyBMdW5uIHdyb3RlOgo+PiAgc3RhdGljIGludCBnZXRf bWRpeF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCkKPj4gIHsKPj4gIAlzdHJ1Y3QgdXNi bmV0ICpkZXYgPSBuZXRkZXZfcHJpdihuZXQpOwo+PiArCXN0cnVjdCBzbXNjOTV4eF9wcml2ICpw ZGF0YSA9IChzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqKShkZXYtPmRhdGFbMF0pOwo+PiAgCXUzMiB2 YWw7Cj4+ICAJaW50IGJ1ZjsKPj4gIAo+PiAtCWJ1ZiA9IHNtc2M5NXh4X21kaW9fcmVhZChkZXYt Pm5ldCwgZGV2LT5taWkucGh5X2lkLCBTUEVDSUFMX0NUUkxfU1RTKTsKPj4gKwlidWYgPSBwaHlf cmVhZChwZGF0YS0+cGh5ZGV2LCBTUEVDSUFMX0NUUkxfU1RTKTsKPj4gIAlpZiAoYnVmICYgU1BF Q0lBTF9DVFJMX1NUU19PVlJSRF9BTURJWF8pIHsKPj4gIAkJaWYgKGJ1ZiAmIFNQRUNJQUxfQ1RS TF9TVFNfQU1ESVhfRU5BQkxFXykKPj4gIAkJCXJldHVybiBFVEhfVFBfTURJX0FVVE87Cj4+IEBA IC03OTMsNyArNzk0LDcgQEAgc3RhdGljIHZvaWQgc2V0X21kaXhfc3RhdHVzKHN0cnVjdCBuZXRf ZGV2aWNlICpuZXQsIF9fdTggbWRpeF9jdHJsKQo+PiAgCSAgICAocGRhdGEtPmNoaXBfaWQgPT0g SURfUkVWX0NISVBfSURfODk1MzBfKSB8fAo+PiAgCSAgICAocGRhdGEtPmNoaXBfaWQgPT0gSURf UkVWX0NISVBfSURfOTczMF8pKSB7Cj4+ICAJCS8qIEV4dGVuZCBNYW51YWwgQXV0b01ESVggdGlt ZXIgZm9yIDk1MDBBLzk1MDBBaSAqLwo+PiAtCQlidWYgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2 LT5uZXQsIGRldi0+bWlpLnBoeV9pZCwKPj4gKwkJYnVmID0gcGh5X3JlYWQocGRhdGEtPnBoeWRl diwKPj4gIAkJCQkJIFBIWV9FRFBEX0NPTkZJRyk7Cj4+ICAJCWJ1ZiB8PSBQSFlfRURQRF9DT05G SUdfRVhUX0NST1NTT1ZFUl87Cj4+ICAJCXNtc2M5NXh4X21kaW9fd3JpdGUoZGV2LT5uZXQsIGRl di0+bWlpLnBoeV9pZCwKPj4gQEAgLTgwMSw3ICs4MDIsNyBAQCBzdGF0aWMgdm9pZCBzZXRfbWRp eF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwgX191OCBtZGl4X2N0cmwpCj4+ICAJfQo+ PiAgCj4+ICAJaWYgKG1kaXhfY3RybCA9PSBFVEhfVFBfTURJKSB7Cj4+IC0JCWJ1ZiA9IHNtc2M5 NXh4X21kaW9fcmVhZChkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAo+PiArCQlidWYgPSBwaHlf cmVhZChwZGF0YS0+cGh5ZGV2LAo+PiAgCQkJCQkgU1BFQ0lBTF9DVFJMX1NUUyk7Cj4+ICAJCWJ1 ZiB8PSBTUEVDSUFMX0NUUkxfU1RTX09WUlJEX0FNRElYXzsKPj4gIAkJYnVmICY9IH4oU1BFQ0lB TF9DVFJMX1NUU19BTURJWF9FTkFCTEVfIHwKPj4gQEAgLTgwOSw3ICs4MTAsNyBAQCBzdGF0aWMg dm9pZCBzZXRfbWRpeF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwgX191OCBtZGl4X2N0 cmwpCj4+ICAJCXNtc2M5NXh4X21kaW9fd3JpdGUoZGV2LT5uZXQsIGRldi0+bWlpLnBoeV9pZCwK Pj4gIAkJCQkgICAgU1BFQ0lBTF9DVFJMX1NUUywgYnVmKTsKPj4gIAl9IGVsc2UgaWYgKG1kaXhf Y3RybCA9PSBFVEhfVFBfTURJX1gpIHsKPj4gLQkJYnVmID0gc21zYzk1eHhfbWRpb19yZWFkKGRl di0+bmV0LCBkZXYtPm1paS5waHlfaWQsCj4+ICsJCWJ1ZiA9IHBoeV9yZWFkKHBkYXRhLT5waHlk ZXYsCj4+ICAJCQkJCSBTUEVDSUFMX0NUUkxfU1RTKTsKPj4gIAkJYnVmIHw9IFNQRUNJQUxfQ1RS TF9TVFNfT1ZSUkRfQU1ESVhfOwo+PiAgCQlidWYgJj0gfihTUEVDSUFMX0NUUkxfU1RTX0FNRElY X0VOQUJMRV8gfAo+PiBAQCAtODE4LDcgKzgxOSw3IEBAIHN0YXRpYyB2b2lkIHNldF9tZGl4X3N0 YXR1cyhzdHJ1Y3QgbmV0X2RldmljZSAqbmV0LCBfX3U4IG1kaXhfY3RybCkKPj4gIAkJc21zYzk1 eHhfbWRpb193cml0ZShkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAo+PiAgCQkJCSAgICBTUEVD SUFMX0NUUkxfU1RTLCBidWYpOwo+PiAgCX0gZWxzZSBpZiAobWRpeF9jdHJsID09IEVUSF9UUF9N RElfQVVUTykgewo+PiAtCQlidWYgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQsIGRldi0+ bWlpLnBoeV9pZCwKPj4gKwkJYnVmID0gcGh5X3JlYWQocGRhdGEtPnBoeWRldiwKPj4gIAkJCQkJ IFNQRUNJQUxfQ1RSTF9TVFMpOwo+PiAgCQlidWYgJj0gflNQRUNJQUxfQ1RSTF9TVFNfT1ZSUkRf QU1ESVhfOwo+PiAgCQlidWYgJj0gfihTUEVDSUFMX0NUUkxfU1RTX0FNRElYX0VOQUJMRV8gfAo+ PiBAQCAtOTY4LDYgKzk2OSw3IEBAIHN0YXRpYyB2b2lkIHNtc2M5NXh4X2FkanVzdF9saW5rKHN0 cnVjdCBuZXRfZGV2aWNlICpuZXRkZXYpCj4gIAo+IEFsbCB0aGlzIGNyb3Nzb3ZlciBjb2RlIHNo b3VsZCBiZSBtb3ZlZCBpbnRvIHRoZSBQSFkgZHJpdmVyLgoKRmluZSwgdGhpcyBjYW4gYmUgZG9u ZSBpbiBhIHN1YnNlcXVlbnQgcGF0Y2ggdGhvdWdoLCByaWdodCA/IEknZCBsaWtlIHRvCmtlZXAg dGhlIGNoYW5nZXMgc21hbGwsIHNvIGlmIHNvbWV0aGluZyBicmVha3MsIGl0IGNvdWxkIGJlIGJp c2VjdGVkIGVhc2lseS4K