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: Andrew Lunn Message-Id: <20190103133912.GC21849@lunn.ch> Date: Thu, 3 Jan 2019 14:39:12 +0100 To: Marek Vasut Cc: netdev@vger.kernel.org, "David S . Miller" , Nisar Sayed , Woojung Huh , Florian Fainelli , linux-usb@vger.kernel.org List-ID: PiAgc3RhdGljIGludCBnZXRfbWRpeF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCkKPiAg ewo+ICAJc3RydWN0IHVzYm5ldCAqZGV2ID0gbmV0ZGV2X3ByaXYobmV0KTsKPiArCXN0cnVjdCBz bXNjOTV4eF9wcml2ICpwZGF0YSA9IChzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqKShkZXYtPmRhdGFb MF0pOwo+ICAJdTMyIHZhbDsKPiAgCWludCBidWY7Cj4gIAo+IC0JYnVmID0gc21zYzk1eHhfbWRp b19yZWFkKGRldi0+bmV0LCBkZXYtPm1paS5waHlfaWQsIFNQRUNJQUxfQ1RSTF9TVFMpOwo+ICsJ YnVmID0gcGh5X3JlYWQocGRhdGEtPnBoeWRldiwgU1BFQ0lBTF9DVFJMX1NUUyk7Cj4gIAlpZiAo YnVmICYgU1BFQ0lBTF9DVFJMX1NUU19PVlJSRF9BTURJWF8pIHsKPiAgCQlpZiAoYnVmICYgU1BF Q0lBTF9DVFJMX1NUU19BTURJWF9FTkFCTEVfKQo+ICAJCQlyZXR1cm4gRVRIX1RQX01ESV9BVVRP Owo+IEBAIC03OTMsNyArNzk0LDcgQEAgc3RhdGljIHZvaWQgc2V0X21kaXhfc3RhdHVzKHN0cnVj dCBuZXRfZGV2aWNlICpuZXQsIF9fdTggbWRpeF9jdHJsKQo+ICAJICAgIChwZGF0YS0+Y2hpcF9p ZCA9PSBJRF9SRVZfQ0hJUF9JRF84OTUzMF8pIHx8Cj4gIAkgICAgKHBkYXRhLT5jaGlwX2lkID09 IElEX1JFVl9DSElQX0lEXzk3MzBfKSkgewo+ICAJCS8qIEV4dGVuZCBNYW51YWwgQXV0b01ESVgg dGltZXIgZm9yIDk1MDBBLzk1MDBBaSAqLwo+IC0JCWJ1ZiA9IHNtc2M5NXh4X21kaW9fcmVhZChk ZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAo+ICsJCWJ1ZiA9IHBoeV9yZWFkKHBkYXRhLT5waHlk ZXYsCj4gIAkJCQkJIFBIWV9FRFBEX0NPTkZJRyk7Cj4gIAkJYnVmIHw9IFBIWV9FRFBEX0NPTkZJ R19FWFRfQ1JPU1NPVkVSXzsKPiAgCQlzbXNjOTV4eF9tZGlvX3dyaXRlKGRldi0+bmV0LCBkZXYt Pm1paS5waHlfaWQsCj4gQEAgLTgwMSw3ICs4MDIsNyBAQCBzdGF0aWMgdm9pZCBzZXRfbWRpeF9z dGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwgX191OCBtZGl4X2N0cmwpCj4gIAl9Cj4gIAo+ ICAJaWYgKG1kaXhfY3RybCA9PSBFVEhfVFBfTURJKSB7Cj4gLQkJYnVmID0gc21zYzk1eHhfbWRp b19yZWFkKGRldi0+bmV0LCBkZXYtPm1paS5waHlfaWQsCj4gKwkJYnVmID0gcGh5X3JlYWQocGRh dGEtPnBoeWRldiwKPiAgCQkJCQkgU1BFQ0lBTF9DVFJMX1NUUyk7Cj4gIAkJYnVmIHw9IFNQRUNJ QUxfQ1RSTF9TVFNfT1ZSUkRfQU1ESVhfOwo+ICAJCWJ1ZiAmPSB+KFNQRUNJQUxfQ1RSTF9TVFNf QU1ESVhfRU5BQkxFXyB8Cj4gQEAgLTgwOSw3ICs4MTAsNyBAQCBzdGF0aWMgdm9pZCBzZXRfbWRp eF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwgX191OCBtZGl4X2N0cmwpCj4gIAkJc21z Yzk1eHhfbWRpb193cml0ZShkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAo+ICAJCQkJICAgIFNQ RUNJQUxfQ1RSTF9TVFMsIGJ1Zik7Cj4gIAl9IGVsc2UgaWYgKG1kaXhfY3RybCA9PSBFVEhfVFBf TURJX1gpIHsKPiAtCQlidWYgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQsIGRldi0+bWlp LnBoeV9pZCwKPiArCQlidWYgPSBwaHlfcmVhZChwZGF0YS0+cGh5ZGV2LAo+ICAJCQkJCSBTUEVD SUFMX0NUUkxfU1RTKTsKPiAgCQlidWYgfD0gU1BFQ0lBTF9DVFJMX1NUU19PVlJSRF9BTURJWF87 Cj4gIAkJYnVmICY9IH4oU1BFQ0lBTF9DVFJMX1NUU19BTURJWF9FTkFCTEVfIHwKPiBAQCAtODE4 LDcgKzgxOSw3IEBAIHN0YXRpYyB2b2lkIHNldF9tZGl4X3N0YXR1cyhzdHJ1Y3QgbmV0X2Rldmlj ZSAqbmV0LCBfX3U4IG1kaXhfY3RybCkKPiAgCQlzbXNjOTV4eF9tZGlvX3dyaXRlKGRldi0+bmV0 LCBkZXYtPm1paS5waHlfaWQsCj4gIAkJCQkgICAgU1BFQ0lBTF9DVFJMX1NUUywgYnVmKTsKPiAg CX0gZWxzZSBpZiAobWRpeF9jdHJsID09IEVUSF9UUF9NRElfQVVUTykgewo+IC0JCWJ1ZiA9IHNt c2M5NXh4X21kaW9fcmVhZChkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAo+ICsJCWJ1ZiA9IHBo eV9yZWFkKHBkYXRhLT5waHlkZXYsCj4gIAkJCQkJIFNQRUNJQUxfQ1RSTF9TVFMpOwo+ICAJCWJ1 ZiAmPSB+U1BFQ0lBTF9DVFJMX1NUU19PVlJSRF9BTURJWF87Cj4gIAkJYnVmICY9IH4oU1BFQ0lB TF9DVFJMX1NUU19BTURJWF9FTkFCTEVfIHwKPiBAQCAtOTY4LDYgKzk2OSw3IEBAIHN0YXRpYyB2 b2lkIHNtc2M5NXh4X2FkanVzdF9saW5rKHN0cnVjdCBuZXRfZGV2aWNlICpuZXRkZXYpCiAKQWxs IHRoaXMgY3Jvc3NvdmVyIGNvZGUgc2hvdWxkIGJlIG1vdmVkIGludG8gdGhlIFBIWSBkcml2ZXIu CgogICAgQW5kcmV3Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: Re: [PATCH 10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Date: Thu, 3 Jan 2019 14:39:12 +0100 Message-ID: <20190103133912.GC21849@lunn.ch> References: <20190103011040.25974-1-marex@denx.de> <20190103011040.25974-11-marex@denx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, "David S . Miller" , Nisar Sayed , Woojung Huh , Florian Fainelli , linux-usb@vger.kernel.org To: Marek Vasut Return-path: Received: from vps0.lunn.ch ([185.16.172.187]:32948 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729077AbfACNjR (ORCPT ); Thu, 3 Jan 2019 08:39:17 -0500 Content-Disposition: inline In-Reply-To: <20190103011040.25974-11-marex@denx.de> Sender: netdev-owner@vger.kernel.org List-ID: > 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. Andrew