From mboxrd@z Thu Jan 1 00:00:00 1970 From: ezequiel.garcia@free-electrons.com (Ezequiel Garcia) Date: Tue, 16 Jul 2013 09:56:02 -0300 Subject: [PATCH] ARM: Kirkwood: Fix the internal register ranges translation In-Reply-To: <51E5145A.90404@keymile.com> References: <1371569479-31498-1-git-send-email-ezequiel.garcia@free-electrons.com> <51E5145A.90404@keymile.com> Message-ID: <20130716125531.GD2317@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Gerlando, On Tue, Jul 16, 2013 at 11:37:30AM +0200, Gerlando Falauto wrote: > > apologies in advance for commenting on an already-merged patch. Sure, no problem. > > On 06/18/2013 05:31 PM, Ezequiel Garcia wrote: > > Although the internal register window size is 1 MiB, the previous > > ranges translation for the internal register space had a size of > > 0x4000000. This was done to allow the crypto and nand node to access > > the corresponding 'sram' and 'nand' decoding windows. > > > > In order to describe the hardware more accurately, we declare the > > real 1 MiB internal register space in the ranges, and add a translation > > entry for the nand node to access the 'nand' window. > > > > This commit will make future improvements on the MBus DT binding easier. > > > > Signed-off-by: Ezequiel Garcia > > --- > > Tested on Plathome Openblocks A6 board. > > > > arch/arm/boot/dts/kirkwood.dtsi | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi > > index 8a1e3bb..910fabc 100644 > > --- a/arch/arm/boot/dts/kirkwood.dtsi > > +++ b/arch/arm/boot/dts/kirkwood.dtsi > > @@ -38,7 +38,8 @@ > > > > ocp at f1000000 { > > compatible = "simple-bus"; > > - ranges = <0x00000000 0xf1000000 0x4000000 > > + ranges = <0x00000000 0xf1000000 0x0100000 > > + 0xf4000000 0xf4000000 0x0000400 > > 0xf5000000 0xf5000000 0x0000400>; > > Apart from "consistency" with the following range (0xf5000000) used by > the crypto node, is there any reason why you did not do something like > this instead (which Valentin suggested, but I will take the blame for): > I'm not sure the reason is "consistency with the crypto node". There's an MBus window at 0xf4000000 for NAND, and that is what is described in the snippet above; and this is a better reason. That said, technically speaking, you can have any translation scheme you want, as long as it ends up in 0xf4000000. > - ranges = <0x00000000 0xf1000000 0x4000000 > + ranges = <0x00000000 0xf1000000 0x0100000 > + 0x03000000 0xf4000000 0x0000400 > 0xf5000000 0xf5000000 0x0000400>; > > This would keep a consistent addressing within the child device bus, and Could you explain how this "keeps a consistent addressing"? Frankly, I don't understand why you choose 0x3000000 ... am I missing something? Also, speaking of "device bus" this nand node should be behind a devicebus node. ranges = ; devbus { status = "okay"; ranges = <0 MBUS_ID(0x01, 0x2f) 0 0x400>; /* nand */ nand { compatible = "marvell,orion-nand"; reg = <0 0x400>; }; }; (notice this will allow you to relocate the base address of the NAND windows easily if it conflicts with your PCIe needs). > avoid a later incosistency between the "unit-address" and the first > "reg" address: > > > #address-cells = <1>; > > #size-cells = <1>; > > @@ -171,7 +172,7 @@ > > nand at 3000000 { > ^^^^^^^ Oh, this should be fixed. I just missed it, and nobody noticed either. -- Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ezequiel Garcia Subject: Re: [PATCH] ARM: Kirkwood: Fix the internal register ranges translation Date: Tue, 16 Jul 2013 09:56:02 -0300 Message-ID: <20130716125531.GD2317@localhost> References: <1371569479-31498-1-git-send-email-ezequiel.garcia@free-electrons.com> <51E5145A.90404@keymile.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <51E5145A.90404-SkAbAL50j+5BDgjK7y7TUQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: Gerlando Falauto Cc: Lior Amsalem , Andrew Lunn , Jason Cooper , "Longchamp, Valentin" , "devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" , Jason Gunthorpe , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , Sebastian Hesselbarth List-Id: devicetree@vger.kernel.org SGkgR2VybGFuZG8sCgpPbiBUdWUsIEp1bCAxNiwgMjAxMyBhdCAxMTozNzozMEFNICswMjAwLCBH ZXJsYW5kbyBGYWxhdXRvIHdyb3RlOgo+IAo+IGFwb2xvZ2llcyBpbiBhZHZhbmNlIGZvciBjb21t ZW50aW5nIG9uIGFuIGFscmVhZHktbWVyZ2VkIHBhdGNoLgoKU3VyZSwgbm8gcHJvYmxlbS4KCj4g Cj4gT24gMDYvMTgvMjAxMyAwNTozMSBQTSwgRXplcXVpZWwgR2FyY2lhIHdyb3RlOgo+ID4gQWx0 aG91Z2ggdGhlIGludGVybmFsIHJlZ2lzdGVyIHdpbmRvdyBzaXplIGlzIDEgTWlCLCB0aGUgcHJl dmlvdXMKPiA+IHJhbmdlcyB0cmFuc2xhdGlvbiBmb3IgdGhlIGludGVybmFsIHJlZ2lzdGVyIHNw YWNlIGhhZCBhIHNpemUgb2YKPiA+IDB4NDAwMDAwMC4gVGhpcyB3YXMgZG9uZSB0byBhbGxvdyB0 aGUgY3J5cHRvIGFuZCBuYW5kIG5vZGUgdG8gYWNjZXNzCj4gPiB0aGUgY29ycmVzcG9uZGluZyAn c3JhbScgYW5kICduYW5kJyBkZWNvZGluZyB3aW5kb3dzLgo+ID4KPiA+IEluIG9yZGVyIHRvIGRl c2NyaWJlIHRoZSBoYXJkd2FyZSBtb3JlIGFjY3VyYXRlbHksIHdlIGRlY2xhcmUgdGhlCj4gPiBy ZWFsIDEgTWlCIGludGVybmFsIHJlZ2lzdGVyIHNwYWNlIGluIHRoZSByYW5nZXMsIGFuZCBhZGQg YSB0cmFuc2xhdGlvbgo+ID4gZW50cnkgZm9yIHRoZSBuYW5kIG5vZGUgdG8gYWNjZXNzIHRoZSAn bmFuZCcgd2luZG93Lgo+ID4KPiA+IFRoaXMgY29tbWl0IHdpbGwgbWFrZSBmdXR1cmUgaW1wcm92 ZW1lbnRzIG9uIHRoZSBNQnVzIERUIGJpbmRpbmcgZWFzaWVyLgo+ID4KPiA+IFNpZ25lZC1vZmYt Ynk6IEV6ZXF1aWVsIEdhcmNpYSA8ZXplcXVpZWwuZ2FyY2lhLXdpMSs1NVNjSlV0S0ViNTcvM2ZK VE5CUFIxbEg0Q1Y4QHB1YmxpYy5nbWFuZS5vcmc+Cj4gPiAtLS0KPiA+IFRlc3RlZCBvbiBQbGF0 aG9tZSBPcGVuYmxvY2tzIEE2IGJvYXJkLgo+ID4KPiA+ICAgYXJjaC9hcm0vYm9vdC9kdHMva2ly a3dvb2QuZHRzaSB8IDUgKysrLS0KPiA+ICAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMv a2lya3dvb2QuZHRzaSBiL2FyY2gvYXJtL2Jvb3QvZHRzL2tpcmt3b29kLmR0c2kKPiA+IGluZGV4 IDhhMWUzYmIuLjkxMGZhYmMgMTAwNjQ0Cj4gPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9raXJr d29vZC5kdHNpCj4gPiArKysgYi9hcmNoL2FybS9ib290L2R0cy9raXJrd29vZC5kdHNpCj4gPiBA QCAtMzgsNyArMzgsOCBAQAo+ID4KPiA+ICAgCW9jcEBmMTAwMDAwMCB7Cj4gPiAgIAkJY29tcGF0 aWJsZSA9ICJzaW1wbGUtYnVzIjsKPiA+IC0JCXJhbmdlcyA9IDwweDAwMDAwMDAwIDB4ZjEwMDAw MDAgMHg0MDAwMDAwCj4gPiArCQlyYW5nZXMgPSA8MHgwMDAwMDAwMCAweGYxMDAwMDAwIDB4MDEw MDAwMAo+ID4gKwkJICAgICAgICAgIDB4ZjQwMDAwMDAgMHhmNDAwMDAwMCAweDAwMDA0MDAKPiA+ ICAgCQkgICAgICAgICAgMHhmNTAwMDAwMCAweGY1MDAwMDAwIDB4MDAwMDQwMD47Cj4gCj4gQXBh cnQgZnJvbSAiY29uc2lzdGVuY3kiIHdpdGggdGhlIGZvbGxvd2luZyByYW5nZSAoMHhmNTAwMDAw MCkgdXNlZCBieSAKPiB0aGUgY3J5cHRvIG5vZGUsIGlzIHRoZXJlIGFueSByZWFzb24gd2h5IHlv dSBkaWQgbm90IGRvIHNvbWV0aGluZyBsaWtlIAo+IHRoaXMgaW5zdGVhZCAod2hpY2ggVmFsZW50 aW4gc3VnZ2VzdGVkLCBidXQgSSB3aWxsIHRha2UgdGhlIGJsYW1lIGZvcik6Cj4gCgpJJ20gbm90 IHN1cmUgdGhlIHJlYXNvbiBpcyAiY29uc2lzdGVuY3kgd2l0aCB0aGUgY3J5cHRvIG5vZGUiLgpU aGVyZSdzIGFuIE1CdXMgd2luZG93IGF0IDB4ZjQwMDAwMDAgZm9yIE5BTkQsIGFuZCB0aGF0IGlz IHdoYXQgaXMgZGVzY3JpYmVkCmluIHRoZSBzbmlwcGV0IGFib3ZlOyBhbmQgdGhpcyBpcyBhIGJl dHRlciByZWFzb24uCgpUaGF0IHNhaWQsIHRlY2huaWNhbGx5IHNwZWFraW5nLCB5b3UgY2FuIGhh dmUgYW55IHRyYW5zbGF0aW9uIHNjaGVtZSB5b3Ugd2FudCwKYXMgbG9uZyBhcyBpdCBlbmRzIHVw IGluIDB4ZjQwMDAwMDAuCgo+IC0JCXJhbmdlcyA9IDwweDAwMDAwMDAwIDB4ZjEwMDAwMDAgMHg0 MDAwMDAwCj4gKwkJcmFuZ2VzID0gPDB4MDAwMDAwMDAgMHhmMTAwMDAwMCAweDAxMDAwMDAKPiAr CQkgICAgICAgICAgMHgwMzAwMDAwMCAweGY0MDAwMDAwIDB4MDAwMDQwMAo+ICAgIAkJICAgICAg ICAgIDB4ZjUwMDAwMDAgMHhmNTAwMDAwMCAweDAwMDA0MDA+Owo+IAo+IFRoaXMgd291bGQga2Vl cCBhIGNvbnNpc3RlbnQgYWRkcmVzc2luZyB3aXRoaW4gdGhlIGNoaWxkIGRldmljZSBidXMsIGFu ZCAKCkNvdWxkIHlvdSBleHBsYWluIGhvdyB0aGlzICJrZWVwcyBhIGNvbnNpc3RlbnQgYWRkcmVz c2luZyI/CkZyYW5rbHksIEkgZG9uJ3QgdW5kZXJzdGFuZCB3aHkgeW91IGNob29zZSAweDMwMDAw MDAgLi4uIGFtIEkgbWlzc2luZyBzb21ldGhpbmc/CgpBbHNvLCBzcGVha2luZyBvZiAiZGV2aWNl IGJ1cyIgdGhpcyBuYW5kIG5vZGUgc2hvdWxkIGJlIGJlaGluZCBhIGRldmljZWJ1cyBub2RlLgoK CQlyYW5nZXMgPSA8TUJVU19JRCgweGYwLCAweDAxKSAwIDAgMHhmMTAwMDAwMCAweDEwMDAwMCAg IC8qIGludGVybmFsLXJlZ3MgKi8KCQkJICBNQlVTX0lEKDB4MDEsIDB4MmYpIDAgMCAweGY0MDAw MDAwIDB4NDAwPjsKCgkJZGV2YnVzIHsKCQkJc3RhdHVzID0gIm9rYXkiOwoJCQlyYW5nZXMgPSA8 MCBNQlVTX0lEKDB4MDEsIDB4MmYpIDAgMHg0MDA+OwoKCQkJLyogbmFuZCAqLwoJCQluYW5kIHsK CQkJCWNvbXBhdGlibGUgPSAibWFydmVsbCxvcmlvbi1uYW5kIjsKCQkJCXJlZyA9IDwwIDB4NDAw PjsKCQkJfTsKCQl9OwoKKG5vdGljZSB0aGlzIHdpbGwgYWxsb3cgeW91IHRvIHJlbG9jYXRlIHRo ZSBiYXNlIGFkZHJlc3Mgb2YgdGhlIE5BTkQgd2luZG93cwplYXNpbHkgaWYgaXQgY29uZmxpY3Rz IHdpdGggeW91ciBQQ0llIG5lZWRzKS4KCj4gYXZvaWQgYSBsYXRlciBpbmNvc2lzdGVuY3kgYmV0 d2VlbiB0aGUgInVuaXQtYWRkcmVzcyIgYW5kIHRoZSBmaXJzdCAKPiAicmVnIiBhZGRyZXNzOgo+ IAo+ID4gICAJCSNhZGRyZXNzLWNlbGxzID0gPDE+Owo+ID4gICAJCSNzaXplLWNlbGxzID0gPDE+ Owo+ID4gQEAgLTE3MSw3ICsxNzIsNyBAQAo+ICA+ICAgCQluYW5kQDMwMDAwMDAgewo+IAkJICAg ICBeXl5eXl5eCgpPaCwgdGhpcyBzaG91bGQgYmUgZml4ZWQuIEkganVzdCBtaXNzZWQgaXQsIGFu ZCBub2JvZHkgbm90aWNlZCBlaXRoZXIuCgotLSAKRXplcXVpZWwgR2FyY8OtYSwgRnJlZSBFbGVj dHJvbnMKRW1iZWRkZWQgTGludXgsIEtlcm5lbCBhbmQgQW5kcm9pZCBFbmdpbmVlcmluZwpodHRw Oi8vZnJlZS1lbGVjdHJvbnMuY29tCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRldmljZXRyZWUtZGlzY3VzcyBtYWlsaW5nIGxpc3QKZGV2aWNldHJlZS1k aXNjdXNzQGxpc3RzLm96bGFicy5vcmcKaHR0cHM6Ly9saXN0cy5vemxhYnMub3JnL2xpc3RpbmZv L2RldmljZXRyZWUtZGlzY3Vzcwo=