From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: Passing NAND mtdparts to OMAP2+ Kernel Date: Wed, 29 Mar 2017 15:18:37 +0200 Message-ID: <20170329151837.509c15c6@bbrezillon> References: <20170328215705.438d7af8@bbrezillon> <04afe149-24b2-daec-5ef0-2d662ed79040@ti.com> <20170329151002.26203f2c@bbrezillon> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170329151002.26203f2c@bbrezillon> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: Roger Quadros Cc: "Leto, Enrico" , linux-mtd@lists.infradead.org, linux-omap@vger.kernel.org, Adam Ford List-Id: linux-omap@vger.kernel.org T24gV2VkLCAyOSBNYXIgMjAxNyAxNToxMDowMiArMDIwMApCb3JpcyBCcmV6aWxsb24gPGJvcmlz LmJyZXppbGxvbkBmcmVlLWVsZWN0cm9ucy5jb20+IHdyb3RlOgoKPiBPbiBXZWQsIDI5IE1hciAy MDE3IDE1OjQxOjA3ICswMzAwCj4gUm9nZXIgUXVhZHJvcyA8cm9nZXJxQHRpLmNvbT4gd3JvdGU6 Cj4gCj4gPiBBZGFtLAo+ID4gCj4gPiBPbiAyOS8wMy8xNyAxNDozOSwgQWRhbSBGb3JkIHdyb3Rl OiAgCj4gPiA+IE9uIFR1ZSwgTWFyIDI4LCAyMDE3IGF0IDI6NTcgUE0sIEJvcmlzIEJyZXppbGxv bgo+ID4gPiA8Ym9yaXMuYnJlemlsbG9uQGZyZWUtZWxlY3Ryb25zLmNvbT4gd3JvdGU6ICAgIAo+ ID4gPj4gK1JvZ2VyIGFuZCBFbnJpY28KPiA+ID4+Cj4gPiA+PiBPbiBUdWUsIDI4IE1hciAyMDE3 IDEwOjQzOjAxIC0wNTAwCj4gPiA+PiBBZGFtIEZvcmQgPGFmb3JkMTczQGdtYWlsLmNvbT4gd3Jv dGU6Cj4gPiA+PiAgICAKPiA+ID4+PiBJIHBvc3RlZCB0aGlzIG9uIHRoZSBsaW51eC1vbWFwIGxp c3QsIGFuZCBJIHdhcyBhc2tlZCB0byBwb3N0IHRoaXMgb24KPiA+ID4+PiB0aGUgbGludXgtbXRk IGxpc3Q6Cj4gPiA+Pj4KPiA+ID4+Pgo+ID4gPj4+IEkgdHJpZWQgdG8gcmVtb3ZlIHRoZSBNVEQg cGFydGl0aW9ucyBmcm9tIHRoZSBMaW51eCBkZXZpY2UgdHJlZSwgYW5kIEkKPiA+ID4+PiBub3Rp Y2VkIHRoYXQgdGhlcmUgd2FzIG5vIHBhcnRpdGlvbiBpbmZvcm1hdGlvbiBiZWluZyBwdXNoZWQg YW55bW9yZQo+ID4gPj4+IHVubGVzcyBJIGNoYW5nZWQgdGhlIG10ZHBhcnRzIG5hbWUgaW4gVS1C b290Lgo+ID4gPj4+Cj4gPiA+Pj4gSXQgYXBwZWFycyBhcyBpZiB0aGUgTVREIGRyaXZlcnMgaGF2 ZSBjaGFuZ2VkIGEgYml0LiAgSSBmb3VuZCBhIGZldwo+ID4gPj4+IGUtbWFpbHMgZmxvYXRpbmcg YXJvdW5kIHRoYXQgYXR0ZW1wdCB0byBmaXggdGhpcwo+ID4gPj4+Cj4gPiA+Pj4gQ29tbWl0IGY3 YThlMzhmMDdhMTdiZTkwNzU4NSAoIm10ZDogbmFuZDogYXNzaWduIHJlYXNvbmFibGUgZGVmYXVs dAo+ID4gPj4+IG5hbWUgZm9yIE5BTkQgZHJpdmVycyIpIGF0dGVtcHRzIHRvIGFkZHJlc3MgdGhp cywgYW5kIHNvbWVvbmUgb3ZlciBhdAo+ID4gPj4+IGh0dHBzOi8vcGF0Y2h3b3JrLm96bGFicy5v cmcvcGF0Y2gvNzA3MDY1LyBhdHRlbXB0ZWQgdG8gYWRkcmVzcyBpdCBhcwo+ID4gPj4+IHdlbGwg aW4gYSBzbGlnaHRseSBkaWZmZXJlbnQgd2F5LiAgICAKPiA+ID4+Cj4gPiA+PiBDYW4geW91IHRl c3QgdGhlIHBhdGNoIGFuZCBsZXQgbWUga25vdyBpZiBzb2x2ZXMgdGhlIHByb2JsZW0uIElmIGl0 Cj4gPiA+PiBkb2VzLCBJJ2xsIHNlbmQgYSBjbGVhbiB2ZXJzaW9uIG9mIHRoZSBwYXRjaCBhbmQg cXVldWUgaXQgZm9yIDQuMTIuCj4gPiA+PiAgICAKPiA+ID4gCj4gPiA+IEkgdHJpZWQgdG8gYXBw bHkgdGhlIHBhdGNoIGRpcmVjdGx5LCBidXQgaXQgZmFpbGVkLiAgSSB0aGVuIG1hbnVhbGx5Cj4g PiA+IGNvcHktcGFzdGVkIGl0IGludG8gdGhlIHByb3BlciBwbGFjZSwgYnV0IGl0IGZhaWxzIHRv IGNvbXBpbGUuCj4gPiA+IAo+ID4gPiBkcml2ZXJzL210ZC9uYW5kL29tYXAyLmM6IEluIGZ1bmN0 aW9uIOKAmG9tYXBfbmFuZF9wcm9iZeKAmToKPiA+ID4gZHJpdmVycy9tdGQvbmFuZC9vbWFwMi5j OjE4NTk6MTQ6IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBvZgo+ID4gPiBmdW5jdGlvbiDi gJhkZXZtX2thc3ByaW5m4oCZIFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0aW9u XQo+ID4gPiAgIG10ZC0+bmFtZSA9IGRldm1fa2FzcHJpbmYoJnBkZXYtPmRldiwgIm9tYXAyLW5h bmQuJWQiLCBpbmZvLT5ncG1jX2NzKTsKPiA+ID4gICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+ Cj4gPiA+IGRyaXZlcnMvbXRkL25hbmQvb21hcDIuYzoxODU5OjEyOiB3YXJuaW5nOiBhc3NpZ25t ZW50IG1ha2VzIHBvaW50ZXIKPiA+ID4gZnJvbSBpbnRlZ2VyIHdpdGhvdXQgYSBjYXN0IFstV2lu dC1jb252ZXJzaW9uXQo+ID4gPiAgIG10ZC0+bmFtZSA9IGRldm1fa2FzcHJpbmYoJnBkZXYtPmRl diwgIm9tYXAyLW5hbmQuJWQiLCBpbmZvLT5ncG1jX2NzKTsKPiA+ID4gICAgICAgICAgICAgXgo+ ID4gPiBjYzE6IHNvbWUgd2FybmluZ3MgYmVpbmcgdHJlYXRlZCBhcyBlcnJvcnMKPiA+ID4gCj4g PiA+IEkgdXNlIGJ1aWxkcm9vdCB0byBidWlsZCBteSB0b29sY2hhaW4gYW5kIEkgYW0gdXNpbmcg Z2NjIHZlcnNpb24gNi4zLjAKPiA+ID4gd2l0aCBnbGliYyAyLjI0LiAgSXMgdGhlcmUgc3VwcG9z ZWQgdG8gYmUgYW4gaW5jbHVkZSBzb21ld2hlcmU/ICBJIGFtCj4gPiA+IG5vdCBmYW1pbGlhciB3 aXRoIGRldm1fa2FzcHJpbmYuICAKPiAKPiBJdCdzIGEgdHlwbzogcy9kZXZtX2thc3ByaW5mL2Rl dm1fa2FzcHJpbnRmLy4KPiAKPiA+ID4gCj4gPiA+ICAgICAKPiA+IAo+ID4gRG9lcyB0aGUgYmVs b3cgcGF0Y2ggd29yayBmb3IgeW91PyAgCj4gCj4gU2hvdWxkIHdvcmsgaW5kZWVkLgo+IAo+IEkg aGFkIGEgY2xvc2VyIGxvb2sgYW5kIGl0IHNlZW1zIHRoYXQgdGhlIGJ1ZyB3YXMgYWN0dWFsbHkg aW50cm9kdWNlZAo+IGJ5IGM5NzExZWM1MjUwYiBtdGQ6IG5hbmQ6IG9tYXA6IENsZWFuIHVwIGRl dmljZSB0cmVlCj4gc3VwcG9ydC4KPiBUaGUgcGFyZW50IGRldmljZSBuYW1lIGhhcyBjaGFuZ2Vk IHdoZW4gc3dpdGNoaW5nIHRvIHRoZSBuZXcgRFQKPiByZXByZXNlbnRhdGlvbjogb21hcDItbmFu ZC4wICh3aGVyZSAwIGlzIHRoZSBjb250cm9sbGVyIGluc3RhbmNlKSBiZWNhbWUKPiAzMDAwMDAw MC5uYW5kICh3aGVyZSAzMDAwMDAwMCBpcyB0aGUgYmFzZSByZWcgYWRkcmVzcyBpbiB0aGUgcGh5 c2ljYWwKPiBhZGRyZXNzIHNwYWNlKS4gV2hpY2ggbWVhbnMgbXkgcHJvcG9zYWwgd2FzIGluY29y cmVjdCAoMCBpcyBub3QgdGhlIENTCj4gbGluZSwgaXQncyB0aGUgTkFORCBjb250cm9sbGVyIGlu c3RhbmNlIG51bWJlciksIHNvIHdlJ2QgYmV0dGVyCj4gc3RhdGljYWxseSBzZXQgaXQgdG8gIm9t YXAyLW5hbmQuMCIuCgpDaGFuZ2luZyBteSBtaW5kIChhZ2FpbiA6KSkuIEFjY29yZGluZyB0byBb MV0sIHRoZSBpbnN0YW5jZSBpZCBpcwpyZWxhdGVkIHRvIHRoZSBDUyBsaW5lLCBzbyBkZXZtX2th c3ByaW50ZigpIGlzIHRoZSByaWdodCBzb2x1dGlvbi4KClNvcnJ5IGZvciB0aGUgbm9pc2UuCgo+ IAo+ID4gCj4gPiBjaGVlcnMsCj4gPiAtcm9nZXIKPiA+IAo+ID4gLS0tCj4gPiAgZHJpdmVycy9t dGQvbmFuZC9vbWFwMi5jIHwgNyArKysrKysrCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0 aW9ucygrKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9vbWFwMi5jIGIv ZHJpdmVycy9tdGQvbmFuZC9vbWFwMi5jCj4gPiBpbmRleCAyYTUyMTAxLi5mNjkzYjhkIDEwMDY0 NAo+ID4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9vbWFwMi5jCj4gPiArKysgYi9kcml2ZXJzL210 ZC9uYW5kL29tYXAyLmMKPiA+IEBAIC0xODU2LDYgKzE4NTYsMTMgQEAgc3RhdGljIGludCBvbWFw X25hbmRfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiA+ICAJbmFuZF9jaGlw LT5lY2MucHJpdgk9IE5VTEw7Cj4gPiAgCW5hbmRfc2V0X2ZsYXNoX25vZGUobmFuZF9jaGlwLCBk ZXYtPm9mX25vZGUpOwo+ID4gICAgCj4gCj4gbmFuZF9zZXRfZmxhc2hfbm9kZSgpIGlzIG5vdyB0 YWtpbmcgdGhlICJsYWJlbCIgRFQgcHJvcGVydHkgaW50byBhY2NvdW50Cj4gYW5kIGFzc2lnbmlu ZyBtdGQtPm5hbWUgdG8gdGhpcyB2YWx1ZSBpZiBwcmVzZW50LiBJJ2QgcmVjb21tZW5kIGRvaW5n Cj4gCj4gCWlmICghbXRkLT5uYW1lKQo+IAkJbXRkLT5uYW1lID0gIm9tYXAyLW5hbmQuMCI7CgpU aGlzIGNvbW1lbnQgc3RpbGwgc3RhbmRzLCBleGNlcHQgaXQgc2hvdWxkIGJlOgoKCWlmICghbXRk LT5uYW1lKQoJCW10ZC0+bmFtZSA9IGRldm1fa2FzcHJpbnRmKCZwZGV2LT5kZXYsIEdGUF9LRVJO RUwsCgkJCQkJICAgIm9tYXAyLW5hbmQuJWQiLCBpbmZvLT5ncG1jX2NzKTsKCglpZiAoIW10ZC0+ bmFtZSkgewoJCWRldl9lcnIoJnBkZXYtPmRldiwgIkZhaWxlZCB0byBzZXQgTVREIG5hbWVcbiIp OwoJCXJldHVybiAtRU5PTUVNOwoJfQoKUmVnYXJkcywKCkJvcmlzCgpbMV1odHRwOi8vbHhyLmZy ZWUtZWxlY3Ryb25zLmNvbS9zb3VyY2UvYXJjaC9hcm0vbWFjaC1vbWFwMi9ncG1jLW5hbmQuYz92 PTQuNiNMMTMzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KTGludXggTVREIGRpc2N1c3Npb24gbWFpbGluZyBsaXN0Cmh0dHA6Ly9saXN0cy5p bmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbXRkLwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctDVH-0003Kj-Ti for linux-mtd@lists.infradead.org; Wed, 29 Mar 2017 13:19:16 +0000 Date: Wed, 29 Mar 2017 15:18:37 +0200 From: Boris Brezillon To: Roger Quadros Cc: Adam Ford , "Leto, Enrico" , linux-omap@vger.kernel.org, linux-mtd@lists.infradead.org Subject: Re: Passing NAND mtdparts to OMAP2+ Kernel Message-ID: <20170329151837.509c15c6@bbrezillon> In-Reply-To: <20170329151002.26203f2c@bbrezillon> References: <20170328215705.438d7af8@bbrezillon> <04afe149-24b2-daec-5ef0-2d662ed79040@ti.com> <20170329151002.26203f2c@bbrezillon> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 29 Mar 2017 15:10:02 +0200 Boris Brezillon wrote: > On Wed, 29 Mar 2017 15:41:07 +0300 > Roger Quadros wrote: >=20 > > Adam, > >=20 > > On 29/03/17 14:39, Adam Ford wrote: =20 > > > On Tue, Mar 28, 2017 at 2:57 PM, Boris Brezillon > > > wrote: =20 > > >> +Roger and Enrico > > >> > > >> On Tue, 28 Mar 2017 10:43:01 -0500 > > >> Adam Ford wrote: > > >> =20 > > >>> I posted this on the linux-omap list, and I was asked to post this = on > > >>> the linux-mtd list: > > >>> > > >>> > > >>> I tried to remove the MTD partitions from the Linux device tree, an= d I > > >>> noticed that there was no partition information being pushed anymore > > >>> unless I changed the mtdparts name in U-Boot. > > >>> > > >>> It appears as if the MTD drivers have changed a bit. I found a few > > >>> e-mails floating around that attempt to fix this > > >>> > > >>> Commit f7a8e38f07a17be907585 ("mtd: nand: assign reasonable default > > >>> name for NAND drivers") attempts to address this, and someone over = at > > >>> https://patchwork.ozlabs.org/patch/707065/ attempted to address it = as > > >>> well in a slightly different way. =20 > > >> > > >> Can you test the patch and let me know if solves the problem. If it > > >> does, I'll send a clean version of the patch and queue it for 4.12. > > >> =20 > > >=20 > > > I tried to apply the patch directly, but it failed. I then manually > > > copy-pasted it into the proper place, but it fails to compile. > > >=20 > > > drivers/mtd/nand/omap2.c: In function =E2=80=98omap_nand_probe=E2=80= =99: > > > drivers/mtd/nand/omap2.c:1859:14: error: implicit declaration of > > > function =E2=80=98devm_kasprinf=E2=80=99 [-Werror=3Dimplicit-function= -declaration] > > > mtd->name =3D devm_kasprinf(&pdev->dev, "omap2-nand.%d", info->gpmc= _cs); > > > ^~~~~~~~~~~~~ > > > drivers/mtd/nand/omap2.c:1859:12: warning: assignment makes pointer > > > from integer without a cast [-Wint-conversion] > > > mtd->name =3D devm_kasprinf(&pdev->dev, "omap2-nand.%d", info->gpmc= _cs); > > > ^ > > > cc1: some warnings being treated as errors > > >=20 > > > I use buildroot to build my toolchain and I am using gcc version 6.3.0 > > > with glibc 2.24. Is there supposed to be an include somewhere? I am > > > not familiar with devm_kasprinf. =20 >=20 > It's a typo: s/devm_kasprinf/devm_kasprintf/. >=20 > > >=20 > > > =20 > >=20 > > Does the below patch work for you? =20 >=20 > Should work indeed. >=20 > I had a closer look and it seems that the bug was actually introduced > by c9711ec5250b mtd: nand: omap: Clean up device tree > support. > The parent device name has changed when switching to the new DT > representation: omap2-nand.0 (where 0 is the controller instance) became > 30000000.nand (where 30000000 is the base reg address in the physical > address space). Which means my proposal was incorrect (0 is not the CS > line, it's the NAND controller instance number), so we'd better > statically set it to "omap2-nand.0". Changing my mind (again :)). According to [1], the instance id is related to the CS line, so devm_kasprintf() is the right solution. Sorry for the noise. >=20 > >=20 > > cheers, > > -roger > >=20 > > --- > > drivers/mtd/nand/omap2.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > >=20 > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > > index 2a52101..f693b8d 100644 > > --- a/drivers/mtd/nand/omap2.c > > +++ b/drivers/mtd/nand/omap2.c > > @@ -1856,6 +1856,13 @@ static int omap_nand_probe(struct platform_devic= e *pdev) > > nand_chip->ecc.priv =3D NULL; > > nand_set_flash_node(nand_chip, dev->of_node); > > =20 >=20 > nand_set_flash_node() is now taking the "label" DT property into account > and assigning mtd->name to this value if present. I'd recommend doing >=20 > if (!mtd->name) > mtd->name =3D "omap2-nand.0"; This comment still stands, except it should be: if (!mtd->name) mtd->name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "omap2-nand.%d", info->gpmc_cs); if (!mtd->name) { dev_err(&pdev->dev, "Failed to set MTD name\n"); return -ENOMEM; } Regards, Boris [1]http://lxr.free-electrons.com/source/arch/arm/mach-omap2/gpmc-nand.c?v= =3D4.6#L133