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: [07/19] usbnet: smsc95xx: Split the reset function From: Oliver Neukum Message-Id: <1546859136.3037.23.camel@suse.com> Date: Mon, 07 Jan 2019 12:05:36 +0100 To: Marek Vasut , netdev@vger.kernel.org Cc: "David S . Miller" , Florian Fainelli , Andrew Lunn , Nisar Sayed , Woojung Huh , linux-usb@vger.kernel.org List-ID: T24gRG8sIDIwMTktMDEtMDMgYXQgMDI6MTAgKzAxMDAsIE1hcmVrIFZhc3V0IHdyb3RlOgo+IFRo ZSBzbXNjOTV4eF9yZXNldCgpIGlzIGNhbGxlZCBlaXRoZXIgZHVyaW5nIGJpbmQgb3IgbGF0ZXIg ZHVyaW5nCj4gdGhlIGRyaXZlciBvcGVyYXRpb24uIEhvd2V2ZXIsIHRoZSBNSUkgc3RydWN0dXJl IGNhbiBiZSBwb3B1bGF0ZWQKPiBvbmx5IG9uY2UsIHdoZW4gdGhlIHNtc2M5NXh4X3Jlc2V0KCkg aXMgY2FsbGVkIGZyb20gdGhlIGRyaXZlcnMKPiBiaW5kIGZ1bmN0aW9uLgo+IAo+IFNwbGl0IHRo ZSByZXNldCBmdW5jdGlvbiB0byBhbGxvdyBmaWxsaW5nIHRoZSBNSUkgc3RydWN0dXJlIG9ubHkK PiBvbmNlLiBUaGlzIGlzIGRvbmUgaW4gcHJlcGFyYXRpb24gb2YgcGh5ZGV2IGNvbnZlcnNpb24s IHdoZXJlIHRoZQo+IGNvZGUgd2lsbCBjb25uZWN0IHRvIFBIWSBiZXR3ZWVuIHRob3NlIHR3byBo YWx2ZXMgb2YgdGhlIHJlc2V0Cj4gZnVuY3Rpb24uCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFyZWsg VmFzdXQgPG1hcmV4QGRlbnguZGU+Cj4gQ2M6IERhdmlkIFMuIE1pbGxlciA8ZGF2ZW1AZGF2ZW1s b2Z0Lm5ldD4KPiBDYzogTmlzYXIgU2F5ZWQgPE5pc2FyLlNheWVkQG1pY3JvY2hpcC5jb20+Cj4g Q2M6IFdvb2p1bmcgSHVoIDxXb29qdW5nLkh1aEBtaWNyb2NoaXAuY29tPgo+IENjOiBBbmRyZXcg THVubiA8YW5kcmV3QGx1bm4uY2g+Cj4gQ2M6IEZsb3JpYW4gRmFpbmVsbGkgPGYuZmFpbmVsbGlA Z21haWwuY29tPgo+IENjOiBsaW51eC11c2JAdmdlci5rZXJuZWwub3JnCj4gVG86IG5ldGRldkB2 Z2VyLmtlcm5lbC5vcmcKPiAtLS0KPiAgZHJpdmVycy9uZXQvdXNiL3Ntc2M5NXh4LmMgfCAzNiAr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI3 IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv bmV0L3VzYi9zbXNjOTV4eC5jIGIvZHJpdmVycy9uZXQvdXNiL3Ntc2M5NXh4LmMKPiBpbmRleCA1 NTFkMDVlYjI1OGUuLmU0MGNkZTQ5MGE0MiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL25ldC91c2Iv c21zYzk1eHguYwo+ICsrKyBiL2RyaXZlcnMvbmV0L3VzYi9zbXNjOTV4eC5jCj4gQEAgLTk0NCwx NCArOTQ0LDYgQEAgc3RhdGljIGludCBzbXNjOTV4eF9waHlfaW5pdGlhbGl6ZShzdHJ1Y3QgdXNi bmV0ICpkZXYpCj4gIHsKPiAgCWludCBibWNyLCByZXQsIHRpbWVvdXQgPSAwOwo+ICAKPiAtCS8q IEluaXRpYWxpemUgTUlJIHN0cnVjdHVyZSAqLwo+IC0JZGV2LT5taWkuZGV2ID0gZGV2LT5uZXQ7 Cj4gLQlkZXYtPm1paS5tZGlvX3JlYWQgPSBzbXNjOTV4eF9tZGlvX3JlYWQ7Cj4gLQlkZXYtPm1p aS5tZGlvX3dyaXRlID0gc21zYzk1eHhfbWRpb193cml0ZTsKPiAtCWRldi0+bWlpLnBoeV9pZF9t YXNrID0gMHgxZjsKPiAtCWRldi0+bWlpLnJlZ19udW1fbWFzayA9IDB4MWY7Cj4gLQlkZXYtPm1p aS5waHlfaWQgPSBTTVNDOTVYWF9JTlRFUk5BTF9QSFlfSUQ7Cj4gLQo+ICAJLyogcmVzZXQgcGh5 IGFuZCB3YWl0IGZvciByZXNldCB0byBjb21wbGV0ZSAqLwo+ICAJc21zYzk1eHhfbWRpb193cml0 ZShkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLCBNSUlfQk1DUiwgQk1DUl9SRVNFVCk7Cj4gIAo+ IEBAIC05ODUsNyArOTc3LDcgQEAgc3RhdGljIGludCBzbXNjOTV4eF9waHlfaW5pdGlhbGl6ZShz dHJ1Y3QgdXNibmV0ICpkZXYpCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBz bXNjOTV4eF9yZXNldChzdHJ1Y3QgdXNibmV0ICpkZXYpCj4gK3N0YXRpYyBpbnQgc21zYzk1eHhf cmVzZXRfcHJlKHN0cnVjdCB1c2JuZXQgKmRldikKCkhpLAoKbWF5IEkgcmVxdWVzdCB0aGF0IHlv dSBjaG9vc2UgZGlmZmVyZW50IG5hbWVzPyBUaGVzZSBuYW1lcyBzdWdnZXN0IGEKY29ubmVjdGlv biB3aXRoIHRoZSBwcmVfcmVzZXQoKSBhbmQgcG9zdF9yZXNldCgpIG1ldGhvZHMgb2YgYSBVU0IK ZHJpdmVyLgoKCVJlZ2FyZHMKCQlPbGl2ZXIK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Neukum Subject: Re: [PATCH 07/19] usbnet: smsc95xx: Split the reset function Date: Mon, 07 Jan 2019 12:05:36 +0100 Message-ID: <1546859136.3037.23.camel@suse.com> References: <20190103011040.25974-1-marex@denx.de> <20190103011040.25974-8-marex@denx.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: "David S . Miller" , Florian Fainelli , Andrew Lunn , Nisar Sayed , Woojung Huh , linux-usb@vger.kernel.org To: Marek Vasut , netdev@vger.kernel.org Return-path: Received: from mx2.suse.de ([195.135.220.15]:43220 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726921AbfAGLFi (ORCPT ); Mon, 7 Jan 2019 06:05:38 -0500 In-Reply-To: <20190103011040.25974-8-marex@denx.de> Sender: netdev-owner@vger.kernel.org List-ID: On Do, 2019-01-03 at 02:10 +0100, Marek Vasut wrote: > The smsc95xx_reset() is called either during bind or later during > the driver operation. However, the MII structure can be populated > only once, when the smsc95xx_reset() is called from the drivers > bind function. > > Split the reset function to allow filling the MII structure only > once. This is done in preparation of phydev conversion, where the > code will connect to PHY between those two halves of the reset > function. > > Signed-off-by: Marek Vasut > Cc: David S. Miller > Cc: Nisar Sayed > Cc: Woojung Huh > Cc: Andrew Lunn > Cc: Florian Fainelli > Cc: linux-usb@vger.kernel.org > To: netdev@vger.kernel.org > --- > drivers/net/usb/smsc95xx.c | 36 +++++++++++++++++++++++++++--------- > 1 file changed, 27 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c > index 551d05eb258e..e40cde490a42 100644 > --- a/drivers/net/usb/smsc95xx.c > +++ b/drivers/net/usb/smsc95xx.c > @@ -944,14 +944,6 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) > { > int bmcr, ret, timeout = 0; > > - /* Initialize MII structure */ > - dev->mii.dev = dev->net; > - dev->mii.mdio_read = smsc95xx_mdio_read; > - dev->mii.mdio_write = smsc95xx_mdio_write; > - dev->mii.phy_id_mask = 0x1f; > - dev->mii.reg_num_mask = 0x1f; > - dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID; > - > /* reset phy and wait for reset to complete */ > smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET); > > @@ -985,7 +977,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) > return 0; > } > > -static int smsc95xx_reset(struct usbnet *dev) > +static int smsc95xx_reset_pre(struct usbnet *dev) Hi, may I request that you choose different names? These names suggest a connection with the pre_reset() and post_reset() methods of a USB driver. Regards Oliver