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: [v8,2/3] dmaengine: fsl-edma: add edma version and configurable registers From: Angelo Dureghello Message-Id: <20180806203117.GB6092@jerusalem> Date: Mon, 6 Aug 2018 22:31:17 +0200 To: Krzysztof Kozlowski Cc: vinod.koul@linaro.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@vger.kernel.org, Stefan Agner List-ID: SGkgS3J6eXN6dG9mLAoKbWFueSB0aGFua3MgZm9yIHRlc3RpbmcuCgpPbiBNb24sIEF1ZyAwNiwg MjAxOCBhdCAwOTo1OTozNUFNICswMjAwLCBLcnp5c3p0b2YgS296bG93c2tpIHdyb3RlOgo+IE9u IDMgQXVndXN0IDIwMTggYXQgMjE6MzIsIEFuZ2VsbyBEdXJlZ2hlbGxvIDxhbmdlbG9Ac3lzYW0u aXQ+IHdyb3RlOgo+ID4gVGhpcyBwYXRjaCBhZGRzIGNvbmZpZ3VyYWJsZSByZWdpc3RlcnMgKHVz aW5nIF9faW9tZW0gYWRkcmVzc2VzKQo+ID4gdG8gYWxsb3cgdGhlIHVzZSBvZiBmc2wtZWRtYS1j b21tb24gY29kZSB3aXRoIHNsaWdodGx5IGRpZmZlcmVudAo+ID4gZWRtYSBtb2R1bGUgdmVyc2lv bnMsIGFzIFZ5YnJpZCAodjEpIGFuZCBDb2xkRmlyZSAodjIpIGFyZS4KPiA+Cj4gPiBSZW1vdmFs IG9mIG9sZCBtZW1iYXNlLXJlZmVyZW5jZWQgcmVnaXN0ZXJzLCBhbWQgc29tZSBmaXhlcyBvbgo+ ID4gbWFjcm9lcyBhcmUgaW5jbHVkZWQuCj4gPgo+ID4gU2lnbmVkLW9mZi1ieTogQW5nZWxvIER1 cmVnaGVsbG8gPGFuZ2Vsb0BzeXNhbS5pdD4KPiA+IC0tLQo+ID4gQ2hhbmdlcyBmcm9tIHY3Ogo+ ID4gLSBwYXRjaCByZXdyaXR0ZW4gZnJvbSBzY3JhdGNoLCB0aGlzIHBhdGNoICgyLzMpIGhhcyBq dXN0IGJlZW4gYWRkZWQuCj4gPiAtLS0KPiA+ICBkcml2ZXJzL2RtYS9mc2wtZWRtYS1jb21tb24u YyB8IDEzOCArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCj4gPiAgZHJpdmVycy9k bWEvZnNsLWVkbWEtY29tbW9uLmggfCAxMTUgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQo+ ID4gIGRyaXZlcnMvZG1hL2ZzbC1lZG1hLmMgICAgICAgIHwgIDMyICsrKystLS0tCj4gPiAgMyBm aWxlcyBjaGFuZ2VkLCAxODIgaW5zZXJ0aW9ucygrKSwgMTAzIGRlbGV0aW9ucygtKQo+ID4KPiA+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9mc2wtZWRtYS1jb21tb24uYyBiL2RyaXZlcnMvZG1h L2ZzbC1lZG1hLWNvbW1vbi5jCj4gPiBpbmRleCAwYWU3MDk0ZjQ3N2EuLjk0OGEzZWU1MWJiYiAx MDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZG1hL2ZzbC1lZG1hLWNvbW1vbi5jCj4gPiArKysgYi9k cml2ZXJzL2RtYS9mc2wtZWRtYS1jb21tb24uYwo+ID4gQEAgLTksNiArOSwzOCBAQAo+ID4KPiA+ ICAjaW5jbHVkZSAiZnNsLWVkbWEtY29tbW9uLmgiCj4gPgo+ID4gKyNkZWZpbmUgRURNQV9DUiAg ICAgICAgICAgICAgICAgICAgICAgIDB4MDAKPiA+ICsjZGVmaW5lIEVETUFfRVMgICAgICAgICAg ICAgICAgICAgICAgICAweDA0Cj4gPiArI2RlZmluZSBFRE1BX0VSUSAgICAgICAgICAgICAgIDB4 MEMKPiA+ICsjZGVmaW5lIEVETUFfRUVJICAgICAgICAgICAgICAgMHgxNAo+ID4gKyNkZWZpbmUg RURNQV9TRVJRICAgICAgICAgICAgICAweDFCCj4gPiArI2RlZmluZSBFRE1BX0NFUlEgICAgICAg ICAgICAgIDB4MUEKPiA+ICsjZGVmaW5lIEVETUFfU0VFSSAgICAgICAgICAgICAgMHgxOQo+ID4g KyNkZWZpbmUgRURNQV9DRUVJICAgICAgICAgICAgICAweDE4Cj4gPiArI2RlZmluZSBFRE1BX0NJ TlQgICAgICAgICAgICAgIDB4MUYKPiA+ICsjZGVmaW5lIEVETUFfQ0VSUiAgICAgICAgICAgICAg MHgxRQo+ID4gKyNkZWZpbmUgRURNQV9TU1JUICAgICAgICAgICAgICAweDFECj4gPiArI2RlZmlu ZSBFRE1BX0NETkUgICAgICAgICAgICAgIDB4MUMKPiA+ICsjZGVmaW5lIEVETUFfSU5UUiAgICAg ICAgICAgICAgMHgyNAo+ID4gKyNkZWZpbmUgRURNQV9FUlIgICAgICAgICAgICAgICAweDJDCj4g PiArCj4gPiArI2RlZmluZSBFRE1BNjRfRVJRSCAgICAgICAgICAgIDB4MDgKPiA+ICsjZGVmaW5l IEVETUE2NF9FRUlIICAgICAgICAgICAgMHgxMAo+ID4gKyNkZWZpbmUgRURNQTY0X1NFUlEgICAg ICAgICAgICAweDE4Cj4gPiArI2RlZmluZSBFRE1BNjRfQ0VSUSAgICAgICAgICAgIDB4MTkKPiA+ ICsjZGVmaW5lIEVETUE2NF9TRUVJICAgICAgICAgICAgMHgxYQo+ID4gKyNkZWZpbmUgRURNQTY0 X0NFRUkgICAgICAgICAgICAweDFiCj4gPiArI2RlZmluZSBFRE1BNjRfQ0lOVCAgICAgICAgICAg IDB4MWMKPiA+ICsjZGVmaW5lIEVETUE2NF9DRVJSICAgICAgICAgICAgMHgxZAo+ID4gKyNkZWZp bmUgRURNQTY0X1NTUlQgICAgICAgICAgICAweDFlCj4gPiArI2RlZmluZSBFRE1BNjRfQ0RORSAg ICAgICAgICAgIDB4MWYKPiA+ICsjZGVmaW5lIEVETUE2NF9JTlRIICAgICAgICAgICAgMHgyMAo+ ID4gKyNkZWZpbmUgRURNQTY0X0lOVEwgICAgICAgICAgICAweDI0Cj4gPiArI2RlZmluZSBFRE1B NjRfRVJSSCAgICAgICAgICAgIDB4MjgKPiA+ICsjZGVmaW5lIEVETUE2NF9FUlJMICAgICAgICAg ICAgMHgyYwo+ID4gKwo+ID4gKyNkZWZpbmUgRURNQV9UQ0QgICAgICAgICAgICAgICAweDEwMDAK PiA+ICsKPiA+ICAvKgo+ID4gICAqIFIvVyBmdW5jdGlvbnMgZm9yIGJpZy0gb3IgbGl0dGxlLWVu ZGlhbiByZWdpc3RlcnM6Cj4gPiAgICogVGhlIGVETUEgY29udHJvbGxlcidzIGVuZGlhbiBpcyBp bmRlcGVuZGVudCBvZiB0aGUgQ1BVIGNvcmUncyBlbmRpYW4uCj4gPiBAQCAtNjcsMjAgKzk5LDIw IEBAIEVYUE9SVF9TWU1CT0xfR1BMKHRvX2ZzbF9lZG1hX2Rlc2MpOwo+ID4KPiA+ICBzdGF0aWMg dm9pZCBmc2xfZWRtYV9lbmFibGVfcmVxdWVzdChzdHJ1Y3QgZnNsX2VkbWFfY2hhbiAqZnNsX2No YW4pCj4gPiAgewo+ID4gLSAgICAgICB2b2lkIF9faW9tZW0gKmFkZHIgPSBmc2xfY2hhbi0+ZWRt YS0+bWVtYmFzZTsKPiA+ICsgICAgICAgc3RydWN0IGVkbWFfcmVncyAqcmVncyA9ICZmc2xfY2hh bi0+ZWRtYS0+cmVnczsKPiA+ICAgICAgICAgdTMyIGNoID0gZnNsX2NoYW4tPnZjaGFuLmNoYW4u Y2hhbl9pZDsKPiA+Cj4gPiAtICAgICAgIGVkbWFfd3JpdGViKGZzbF9jaGFuLT5lZG1hLCBFRE1B X1NFRUlfU0VFSShjaCksIGFkZHIgKyBFRE1BX1NFRUkpOwo+ID4gLSAgICAgICBlZG1hX3dyaXRl Yihmc2xfY2hhbi0+ZWRtYSwgY2gsIGFkZHIgKyBFRE1BX1NFUlEpOwo+ID4gKyAgICAgICBlZG1h X3dyaXRlYihmc2xfY2hhbi0+ZWRtYSwgRURNQV9TRUVJX1NFRUkoY2gpLCByZWdzLT5zZWVpKTsK PiA+ICsgICAgICAgZWRtYV93cml0ZWIoZnNsX2NoYW4tPmVkbWEsIGNoLCByZWdzLT5zZXJxKTsK PiA+ICB9Cj4gPgo+ID4gIHZvaWQgZnNsX2VkbWFfZGlzYWJsZV9yZXF1ZXN0KHN0cnVjdCBmc2xf ZWRtYV9jaGFuICpmc2xfY2hhbikKPiA+ICB7Cj4gPiAtICAgICAgIHZvaWQgX19pb21lbSAqYWRk ciA9IGZzbF9jaGFuLT5lZG1hLT5tZW1iYXNlOwo+ID4gKyAgICAgICBzdHJ1Y3QgZWRtYV9yZWdz ICpyZWdzID0gJmZzbF9jaGFuLT5lZG1hLT5yZWdzOwo+ID4gICAgICAgICB1MzIgY2ggPSBmc2xf Y2hhbi0+dmNoYW4uY2hhbi5jaGFuX2lkOwo+ID4KPiA+IC0gICAgICAgZWRtYV93cml0ZWIoZnNs X2NoYW4tPmVkbWEsIGNoLCBhZGRyICsgRURNQV9DRVJRKTsKPiA+IC0gICAgICAgZWRtYV93cml0 ZWIoZnNsX2NoYW4tPmVkbWEsIEVETUFfQ0VFSV9DRUVJKGNoKSwgYWRkciArIEVETUFfQ0VFSSk7 Cj4gPiArICAgICAgIGVkbWFfd3JpdGViKGZzbF9jaGFuLT5lZG1hLCBjaCwgcmVncy0+Y2VycSk7 Cj4gPiArICAgICAgIGVkbWFfd3JpdGViKGZzbF9jaGFuLT5lZG1hLCBFRE1BX0NFRUlfQ0VFSShj aCksIHJlZ3MtPmNlZWkpOwo+ID4gIH0KPiA+ICBFWFBPUlRfU1lNQk9MX0dQTChmc2xfZWRtYV9k aXNhYmxlX3JlcXVlc3QpOwo+ID4KPiA+IEBAIC0yMDgsNyArMjQwLDcgQEAgc3RhdGljIHNpemVf dCBmc2xfZWRtYV9kZXNjX3Jlc2lkdWUoc3RydWN0IGZzbF9lZG1hX2NoYW4gKmZzbF9jaGFuLAo+ ID4gICAgICAgICAgICAgICAgIHN0cnVjdCB2aXJ0X2RtYV9kZXNjICp2ZGVzYywgYm9vbCBpbl9w cm9ncmVzcykKPiA+ICB7Cj4gPiAgICAgICAgIHN0cnVjdCBmc2xfZWRtYV9kZXNjICplZGVzYyA9 IGZzbF9jaGFuLT5lZGVzYzsKPiA+IC0gICAgICAgdm9pZCBfX2lvbWVtICphZGRyID0gZnNsX2No YW4tPmVkbWEtPm1lbWJhc2U7Cj4gPiArICAgICAgIHN0cnVjdCBlZG1hX3JlZ3MgKnJlZ3MgPSAm ZnNsX2NoYW4tPmVkbWEtPnJlZ3M7Cj4gPiAgICAgICAgIHUzMiBjaCA9IGZzbF9jaGFuLT52Y2hh bi5jaGFuLmNoYW5faWQ7Cj4gPiAgICAgICAgIGVudW0gZG1hX3RyYW5zZmVyX2RpcmVjdGlvbiBk aXIgPSBmc2xfY2hhbi0+ZnNjLmRpcjsKPiA+ICAgICAgICAgZG1hX2FkZHJfdCBjdXJfYWRkciwg ZG1hX2FkZHI7Cj4gPiBAQCAtMjI0LDExICsyNTYsOSBAQCBzdGF0aWMgc2l6ZV90IGZzbF9lZG1h X2Rlc2NfcmVzaWR1ZShzdHJ1Y3QgZnNsX2VkbWFfY2hhbiAqZnNsX2NoYW4sCj4gPiAgICAgICAg ICAgICAgICAgcmV0dXJuIGxlbjsKPiA+Cj4gPiAgICAgICAgIGlmIChkaXIgPT0gRE1BX01FTV9U T19ERVYpCj4gPiAtICAgICAgICAgICAgICAgY3VyX2FkZHIgPSBlZG1hX3JlYWRsKAo+ID4gLSAg ICAgICAgICAgICAgICAgICAgICAgZnNsX2NoYW4tPmVkbWEsIGFkZHIgKyBFRE1BX1RDRF9TQURE UihjaCkpOwo+ID4gKyAgICAgICAgICAgICAgIGN1cl9hZGRyID0gZWRtYV9yZWFkbChmc2xfY2hh bi0+ZWRtYSwgJnJlZ3MtPnRjZFtjaF0uc2FkZHIpOwo+ID4gICAgICAgICBlbHNlCj4gPiAtICAg ICAgICAgICAgICAgY3VyX2FkZHIgPSBlZG1hX3JlYWRsKAo+ID4gLSAgICAgICAgICAgICAgICAg ICAgICAgZnNsX2NoYW4tPmVkbWEsIGFkZHIgKyBFRE1BX1RDRF9EQUREUihjaCkpOwo+ID4gKyAg ICAgICAgICAgICAgIGN1cl9hZGRyID0gZWRtYV9yZWFkbChmc2xfY2hhbi0+ZWRtYSwgJnJlZ3Mt PnRjZFtjaF0uZGFkZHIpOwo+ID4KPiA+ICAgICAgICAgLyogZmlndXJlIG91dCB0aGUgZmluaXNo ZWQgYW5kIGNhbGN1bGF0ZSB0aGUgcmVzaWR1ZSAqLwo+ID4gICAgICAgICBmb3IgKGkgPSAwOyBp IDwgZnNsX2NoYW4tPmVkZXNjLT5uX3RjZHM7IGkrKykgewo+ID4gQEAgLTI4NSw3ICszMTUsNyBA QCBzdGF0aWMgdm9pZCBmc2xfZWRtYV9zZXRfdGNkX3JlZ3Moc3RydWN0IGZzbF9lZG1hX2NoYW4g KmZzbF9jaGFuLAo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBm c2xfZWRtYV9od190Y2QgKnRjZCkKPiA+ICB7Cj4gPiAgICAgICAgIHN0cnVjdCBmc2xfZWRtYV9l bmdpbmUgKmVkbWEgPSBmc2xfY2hhbi0+ZWRtYTsKPiA+IC0gICAgICAgdm9pZCBfX2lvbWVtICph ZGRyID0gZnNsX2NoYW4tPmVkbWEtPm1lbWJhc2U7Cj4gPiArICAgICAgIHN0cnVjdCBlZG1hX3Jl Z3MgKnJlZ3MgPSAmZnNsX2NoYW4tPmVkbWEtPnJlZ3M7Cj4gPiAgICAgICAgIHUzMiBjaCA9IGZz bF9jaGFuLT52Y2hhbi5jaGFuLmNoYW5faWQ7Cj4gPgo+ID4gICAgICAgICAvKgo+ID4gQEAgLTI5 MywyNCArMzIzLDI0IEBAIHN0YXRpYyB2b2lkIGZzbF9lZG1hX3NldF90Y2RfcmVncyhzdHJ1Y3Qg ZnNsX2VkbWFfY2hhbiAqZnNsX2NoYW4sCj4gPiAgICAgICAgICAqIGVuZGlhbiBmb3JtYXQuIEhv d2V2ZXIsIHdlIG5lZWQgdG8gbG9hZCB0aGUgVENEIHJlZ2lzdGVycyBpbgo+ID4gICAgICAgICAg KiBiaWctIG9yIGxpdHRsZS1lbmRpYW4gb2JleWluZyB0aGUgZURNQSBlbmdpbmUgbW9kZWwgZW5k aWFuLgo+ID4gICAgICAgICAgKi8KPiA+IC0gICAgICAgZWRtYV93cml0ZXcoZWRtYSwgMCwgYWRk ciArIEVETUFfVENEX0NTUihjaCkpOwo+ID4gLSAgICAgICBlZG1hX3dyaXRlbChlZG1hLCBsZTMy X3RvX2NwdSh0Y2QtPnNhZGRyKSwgYWRkciArIEVETUFfVENEX1NBRERSKGNoKSk7Cj4gPiAtICAg ICAgIGVkbWFfd3JpdGVsKGVkbWEsIGxlMzJfdG9fY3B1KHRjZC0+ZGFkZHIpLCBhZGRyICsgRURN QV9UQ0RfREFERFIoY2gpKTsKPiA+ICsgICAgICAgZWRtYV93cml0ZXcoZWRtYSwgMCwgICZyZWdz LT50Y2RbY2hdLmNzcik7Cj4gPiArICAgICAgIGVkbWFfd3JpdGVsKGVkbWEsIGxlMzJfdG9fY3B1 KHRjZC0+c2FkZHIpLCAmcmVncy0+dGNkW2NoXS5zYWRkcik7Cj4gPiArICAgICAgIGVkbWFfd3Jp dGVsKGVkbWEsIGxlMzJfdG9fY3B1KHRjZC0+ZGFkZHIpLCAmcmVncy0+dGNkW2NoXS5kYWRkcik7 Cj4gPgo+ID4gLSAgICAgICBlZG1hX3dyaXRldyhlZG1hLCBsZTE2X3RvX2NwdSh0Y2QtPmF0dHIp LCBhZGRyICsgRURNQV9UQ0RfQVRUUihjaCkpOwo+ID4gLSAgICAgICBlZG1hX3dyaXRldyhlZG1h LCBsZTE2X3RvX2NwdSh0Y2QtPnNvZmYpLCBhZGRyICsgRURNQV9UQ0RfU09GRihjaCkpOwo+ID4g KyAgICAgICBlZG1hX3dyaXRldyhlZG1hLCBsZTE2X3RvX2NwdSh0Y2QtPmF0dHIpLCAmcmVncy0+ dGNkW2NoXS5hdHRyKTsKPiA+ICsgICAgICAgZWRtYV93cml0ZXcoZWRtYSwgbGUxNl90b19jcHUo dGNkLT5zb2ZmKSwgJnJlZ3MtPnRjZFtjaF0uc29mZik7Cj4gPgo+ID4gLSAgICAgICBlZG1hX3dy aXRlbChlZG1hLCBsZTMyX3RvX2NwdSh0Y2QtPm5ieXRlcyksIGFkZHIgKyBFRE1BX1RDRF9OQllU RVMoY2gpKTsKPiA+IC0gICAgICAgZWRtYV93cml0ZWwoZWRtYSwgbGUzMl90b19jcHUodGNkLT5z bGFzdCksIGFkZHIgKyBFRE1BX1RDRF9TTEFTVChjaCkpOwo+ID4gKyAgICAgICBlZG1hX3dyaXRl bChlZG1hLCBsZTMyX3RvX2NwdSh0Y2QtPm5ieXRlcyksICZyZWdzLT50Y2RbY2hdLm5ieXRlcyk7 Cj4gPiArICAgICAgIGVkbWFfd3JpdGVsKGVkbWEsIGxlMzJfdG9fY3B1KHRjZC0+c2xhc3QpLCAm cmVncy0+dGNkW2NoXS5zbGFzdCk7Cj4gPgo+ID4gLSAgICAgICBlZG1hX3dyaXRldyhlZG1hLCBs ZTE2X3RvX2NwdSh0Y2QtPmNpdGVyKSwgYWRkciArIEVETUFfVENEX0NJVEVSKGNoKSk7Cj4gPiAt ICAgICAgIGVkbWFfd3JpdGV3KGVkbWEsIGxlMTZfdG9fY3B1KHRjZC0+Yml0ZXIpLCBhZGRyICsg RURNQV9UQ0RfQklURVIoY2gpKTsKPiA+IC0gICAgICAgZWRtYV93cml0ZXcoZWRtYSwgbGUxNl90 b19jcHUodGNkLT5kb2ZmKSwgYWRkciArIEVETUFfVENEX0RPRkYoY2gpKTsKPiA+ICsgICAgICAg ZWRtYV93cml0ZXcoZWRtYSwgbGUxNl90b19jcHUodGNkLT5jaXRlciksICZyZWdzLT50Y2RbY2hd LmNpdGVyKTsKPiA+ICsgICAgICAgZWRtYV93cml0ZXcoZWRtYSwgbGUxNl90b19jcHUodGNkLT5i aXRlciksICZyZWdzLT50Y2RbY2hdLmJpdGVyKTsKPiA+ICsgICAgICAgZWRtYV93cml0ZXcoZWRt YSwgbGUxNl90b19jcHUodGNkLT5kb2ZmKSwgJnJlZ3MtPnRjZFtjaF0uZG9mZik7Cj4gPgo+ID4g LSAgICAgICBlZG1hX3dyaXRlbChlZG1hLAo+ID4gLSAgICAgICAgICAgICAgICAgICBsZTMyX3Rv X2NwdSh0Y2QtPmRsYXN0X3NnYSksIGFkZHIgKyBFRE1BX1RDRF9ETEFTVF9TR0EoY2gpKTsKPiA+ ICsgICAgICAgZWRtYV93cml0ZWwoZWRtYSwgbGUzMl90b19jcHUodGNkLT5kbGFzdF9zZ2EpLAo+ ID4gKyAgICAgICAgICAgICAgICAgICAgICAgJnJlZ3MtPnRjZFtjaF0uZGxhc3Rfc2dhKTsKPiA+ Cj4gPiAtICAgICAgIGVkbWFfd3JpdGV3KGVkbWEsIGxlMTZfdG9fY3B1KHRjZC0+Y3NyKSwgYWRk ciArIEVETUFfVENEX0NTUihjaCkpOwo+ID4gKyAgICAgICBlZG1hX3dyaXRldyhlZG1hLCBsZTE2 X3RvX2NwdSh0Y2QtPmNzciksICZyZWdzLT50Y2RbY2hdLmNzcik7Cj4gPiAgfQo+ID4KPiA+ICBz dGF0aWMgaW5saW5lCj4gPiBAQCAtMzMyLDE1ICszNjIsMTUgQEAgdm9pZCBmc2xfZWRtYV9maWxs X3RjZChzdHJ1Y3QgZnNsX2VkbWFfaHdfdGNkICp0Y2QsIHUzMiBzcmMsIHUzMiBkc3QsCj4gPgo+ ID4gICAgICAgICB0Y2QtPmF0dHIgPSBjcHVfdG9fbGUxNihhdHRyKTsKPiA+Cj4gPiAtICAgICAg IHRjZC0+c29mZiA9IGNwdV90b19sZTE2KEVETUFfVENEX1NPRkZfU09GRihzb2ZmKSk7Cj4gPiAr ICAgICAgIHRjZC0+c29mZiA9IGNwdV90b19sZTE2KHNvZmYpOwo+ID4KPiA+IC0gICAgICAgdGNk LT5uYnl0ZXMgPSBjcHVfdG9fbGUzMihFRE1BX1RDRF9OQllURVNfTkJZVEVTKG5ieXRlcykpOwo+ ID4gLSAgICAgICB0Y2QtPnNsYXN0ID0gY3B1X3RvX2xlMzIoRURNQV9UQ0RfU0xBU1RfU0xBU1Qo c2xhc3QpKTsKPiA+ICsgICAgICAgdGNkLT5uYnl0ZXMgPSBjcHVfdG9fbGUzMihuYnl0ZXMpOwo+ ID4gKyAgICAgICB0Y2QtPnNsYXN0ID0gY3B1X3RvX2xlMzIoc2xhc3QpOwo+ID4KPiA+ICAgICAg ICAgdGNkLT5jaXRlciA9IGNwdV90b19sZTE2KEVETUFfVENEX0NJVEVSX0NJVEVSKGNpdGVyKSk7 Cj4gPiAtICAgICAgIHRjZC0+ZG9mZiA9IGNwdV90b19sZTE2KEVETUFfVENEX0RPRkZfRE9GRihk b2ZmKSk7Cj4gPiArICAgICAgIHRjZC0+ZG9mZiA9IGNwdV90b19sZTE2KGRvZmYpOwo+ID4KPiA+ IC0gICAgICAgdGNkLT5kbGFzdF9zZ2EgPSBjcHVfdG9fbGUzMihFRE1BX1RDRF9ETEFTVF9TR0Ff RExBU1RfU0dBKGRsYXN0X3NnYSkpOwo+ID4gKyAgICAgICB0Y2QtPmRsYXN0X3NnYSA9IGNwdV90 b19sZTMyKGRsYXN0X3NnYSk7Cj4gPgo+ID4gICAgICAgICB0Y2QtPmJpdGVyID0gY3B1X3RvX2xl MTYoRURNQV9UQ0RfQklURVJfQklURVIoYml0ZXIpKTsKPiA+ICAgICAgICAgaWYgKG1ham9yX2lu dCkKPiA+IEBAIC01NzMsNCArNjAzLDUyIEBAIHZvaWQgZnNsX2VkbWFfY2xlYW51cF92Y2hhbihz dHJ1Y3QgZG1hX2RldmljZSAqZG1hZGV2KQo+ID4gIH0KPiA+ICBFWFBPUlRfU1lNQk9MX0dQTChm c2xfZWRtYV9jbGVhbnVwX3ZjaGFuKTsKPiA+Cj4gPiArLyoKPiA+ICsgKiBPbiB0aGUgMzIgY2hh bm5lbHMgVnlicmlkL21wYzU3N3ggZWRtYSB2ZXJzaW9uIChoZXJlIGNhbGxlZCAidjEiKSwKPiA+ ICsgKiByZWdpc3RlciBvZmZzZXRzIGFyZSBkaWZmZXJlbnQgY29tcGFyZWQgdG8gQ29sZEZpcmUg bWNmNTQ0MXggNjQgY2hhbm5lbHMKPiA+ICsgKiBlZG1hIChoZXJlIGNhbGxlZCAidjIiKS4KPiA+ ICsgKgo+ID4gKyAqIFRoaXMgZnVuY3Rpb24gc2V0cyB1cCByZWdpc3RlciBvZmZzZXRzIGFzIHBl ciBwcm9wZXIgZGVjbGFyZWQgdmVyc2lvbgo+ID4gKyAqIHNvIG11c3QgYmUgY2FsbGVkIGluIHh4 eF9lZG1hX3Byb2JlKCkganVzdCBhZnRlciBzZXR0aW5nIHRoZQo+ID4gKyAqIGVkbWEgInZlcnNp b24iIGFuZCAibWVtYmFzZSIgYXBwcm9wcmlhdGVseS4KPiA+ICsgKi8KPiA+ICt2b2lkIGZzbF9l ZG1hX3NldHVwX3JlZ3Moc3RydWN0IGZzbF9lZG1hX2VuZ2luZSAqZWRtYSkKPiA+ICt7Cj4gPiAr ICAgICAgIGVkbWEtPnJlZ3MuY3IgPSBlZG1hLT5tZW1iYXNlICsgRURNQV9DUjsKPiA+ICsgICAg ICAgZWRtYS0+cmVncy5lcyA9IGVkbWEtPm1lbWJhc2UgKyBFRE1BX0VTOwo+ID4gKyAgICAgICBl ZG1hLT5yZWdzLmVycWwgPSBlZG1hLT5tZW1iYXNlICsgRURNQV9FUlE7Cj4gPiArICAgICAgIGVk bWEtPnJlZ3MuZWVpbCA9IGVkbWEtPm1lbWJhc2UgKyBFRE1BX0VFSTsKPiA+ICsKPiA+ICsgICAg ICAgZWRtYS0+cmVncy5zZXJxID0gZWRtYS0+bWVtYmFzZSArICgoZWRtYS0+dmVyc2lvbiA9PSB2 MSkgPwo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgRURNQV9TRVJRIDogRURNQTY0X1NFUlEp Owo+ID4gKyAgICAgICBlZG1hLT5yZWdzLmNlcnEgPSBlZG1hLT5tZW1iYXNlICsgKChlZG1hLT52 ZXJzaW9uID09IHYxKSA/Cj4gPiArICAgICAgICAgICAgICAgICAgICAgICBFRE1BX0NFUlEgOiBF RE1BNjRfQ0VSUSk7Cj4gPiArICAgICAgIGVkbWEtPnJlZ3Muc2VlaSA9IGVkbWEtPm1lbWJhc2Ug KyAoKGVkbWEtPnZlcnNpb24gPT0gdjEpID8KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgIEVE TUFfU0VFSSA6IEVETUE2NF9TRUVJKTsKPiA+ICsgICAgICAgZWRtYS0+cmVncy5jZWVpID0gZWRt YS0+bWVtYmFzZSArICgoZWRtYS0+dmVyc2lvbiA9PSB2MSkgPwo+ID4gKyAgICAgICAgICAgICAg ICAgICAgICAgRURNQV9DRUVJIDogRURNQTY0X0NFRUkpOwo+ID4gKyAgICAgICBlZG1hLT5yZWdz LmNpbnQgPSBlZG1hLT5tZW1iYXNlICsgKChlZG1hLT52ZXJzaW9uID09IHYxKSA/Cj4gPiArICAg ICAgICAgICAgICAgICAgICAgICBFRE1BX0NJTlQgOiBFRE1BNjRfQ0lOVCk7Cj4gPiArICAgICAg IGVkbWEtPnJlZ3MuY2VyciA9IGVkbWEtPm1lbWJhc2UgKyAoKGVkbWEtPnZlcnNpb24gPT0gdjEp ID8KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgIEVETUFfQ0VSUiA6IEVETUE2NF9DRVJSKTsK PiA+ICsgICAgICAgZWRtYS0+cmVncy5zc3J0ID0gZWRtYS0+bWVtYmFzZSArICgoZWRtYS0+dmVy c2lvbiA9PSB2MSkgPwo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgRURNQV9TU1JUIDogRURN QTY0X1NTUlQpOwo+ID4gKyAgICAgICBlZG1hLT5yZWdzLmNkbmUgPSBlZG1hLT5tZW1iYXNlICsg KChlZG1hLT52ZXJzaW9uID09IHYxKSA/Cj4gPiArICAgICAgICAgICAgICAgICAgICAgICBFRE1B X0NETkUgOiBFRE1BNjRfQ0RORSk7Cj4gPiArICAgICAgIGVkbWEtPnJlZ3MuaW50bCA9IGVkbWEt Pm1lbWJhc2UgKyAoKGVkbWEtPnZlcnNpb24gPT0gdjEpID8KPiA+ICsgICAgICAgICAgICAgICAg ICAgICAgIEVETUFfSU5UUiA6IEVETUE2NF9JTlRMKTsKPiA+ICsgICAgICAgZWRtYS0+cmVncy5l cnJsID0gZWRtYS0+bWVtYmFzZSArICgoZWRtYS0+dmVyc2lvbiA9PSB2MSkgPwo+ID4gKyAgICAg ICAgICAgICAgICAgICAgICAgRURNQV9FUlIgOiBFRE1BNjRfRVJSTCk7Cj4gPiArCj4gPiArICAg ICAgIGlmIChlZG1hLT52ZXJzaW9uID09IHYyKSB7Cj4gPiArICAgICAgICAgICAgICAgZWRtYS0+ cmVncy5lcnFoID0gZWRtYS0+bWVtYmFzZSArIEVETUE2NF9FUlFIOwo+ID4gKyAgICAgICAgICAg ICAgIGVkbWEtPnJlZ3MuZWVpaCA9IGVkbWEtPm1lbWJhc2UgKyBFRE1BNjRfRUVJSDsKPiA+ICsg ICAgICAgICAgICAgICBlZG1hLT5yZWdzLmVycmggPSBlZG1hLT5tZW1iYXNlICsgRURNQTY0X0VS Ukg7Cj4gPiArICAgICAgICAgICAgICAgZWRtYS0+cmVncy5pbnRoID0gZWRtYS0+bWVtYmFzZSAr IEVETUE2NF9JTlRIOwo+ID4gKyAgICAgICB9Cj4gPiArCj4gPiArICAgICAgIGVkbWEtPnJlZ3Mu dGNkID0gZWRtYS0+bWVtYmFzZSArIEVETUFfVENEOwo+ID4gK30KPiA+ICtFWFBPUlRfU1lNQk9M X0dQTChmc2xfZWRtYV9zZXR1cF9yZWdzKTsKPiA+ICsKPiA+ICBNT0RVTEVfTElDRU5TRSgiR1BM IHYyIik7Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEvZnNsLWVkbWEtY29tbW9uLmggYi9k cml2ZXJzL2RtYS9mc2wtZWRtYS1jb21tb24uaAo+ID4gaW5kZXggZjNlYTY4ZTE1YjIzLi43YTky MzFlNzYzOWYgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2RtYS9mc2wtZWRtYS1jb21tb24uaAo+ ID4gKysrIGIvZHJpdmVycy9kbWEvZnNsLWVkbWEtY29tbW9uLmgKPiA+IEBAIC04LDM1ICs4LDYg QEAKPiA+Cj4gPiAgI2luY2x1ZGUgInZpcnQtZG1hLmgiCj4gPgo+ID4gLSNkZWZpbmUgRURNQV9D UiAgICAgICAgICAgICAgICAgICAgICAgIDB4MDAKPiA+IC0jZGVmaW5lIEVETUFfRVMgICAgICAg ICAgICAgICAgICAgICAgICAweDA0Cj4gPiAtI2RlZmluZSBFRE1BX0VSUSAgICAgICAgICAgICAg IDB4MEMKPiA+IC0jZGVmaW5lIEVETUFfRUVJICAgICAgICAgICAgICAgMHgxNAo+ID4gLSNkZWZp bmUgRURNQV9TRVJRICAgICAgICAgICAgICAweDFCCj4gPiAtI2RlZmluZSBFRE1BX0NFUlEgICAg ICAgICAgICAgIDB4MUEKPiA+IC0jZGVmaW5lIEVETUFfU0VFSSAgICAgICAgICAgICAgMHgxOQo+ ID4gLSNkZWZpbmUgRURNQV9DRUVJICAgICAgICAgICAgICAweDE4Cj4gPiAtI2RlZmluZSBFRE1B X0NJTlQgICAgICAgICAgICAgIDB4MUYKPiA+IC0jZGVmaW5lIEVETUFfQ0VSUiAgICAgICAgICAg ICAgMHgxRQo+ID4gLSNkZWZpbmUgRURNQV9TU1JUICAgICAgICAgICAgICAweDFECj4gPiAtI2Rl ZmluZSBFRE1BX0NETkUgICAgICAgICAgICAgIDB4MUMKPiA+IC0jZGVmaW5lIEVETUFfSU5UUiAg ICAgICAgICAgICAgMHgyNAo+ID4gLSNkZWZpbmUgRURNQV9FUlIgICAgICAgICAgICAgICAweDJD Cj4gPiAtCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9TQUREUih4KSAgICAgICgweDEwMDAgKyAzMiAq ICh4KSkKPiA+IC0jZGVmaW5lIEVETUFfVENEX1NPRkYoeCkgICAgICAgKDB4MTAwNCArIDMyICog KHgpKQo+ID4gLSNkZWZpbmUgRURNQV9UQ0RfQVRUUih4KSAgICAgICAoMHgxMDA2ICsgMzIgKiAo eCkpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9OQllURVMoeCkgICAgICgweDEwMDggKyAzMiAqICh4 KSkKPiA+IC0jZGVmaW5lIEVETUFfVENEX1NMQVNUKHgpICAgICAgKDB4MTAwQyArIDMyICogKHgp KQo+ID4gLSNkZWZpbmUgRURNQV9UQ0RfREFERFIoeCkgICAgICAoMHgxMDEwICsgMzIgKiAoeCkp Cj4gPiAtI2RlZmluZSBFRE1BX1RDRF9ET0ZGKHgpICAgICAgICgweDEwMTQgKyAzMiAqICh4KSkK PiA+IC0jZGVmaW5lIEVETUFfVENEX0NJVEVSX0VMSU5LKHgpICAgICAgICAoMHgxMDE2ICsgMzIg KiAoeCkpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9DSVRFUih4KSAgICAgICgweDEwMTYgKyAzMiAq ICh4KSkKPiA+IC0jZGVmaW5lIEVETUFfVENEX0RMQVNUX1NHQSh4KSAgKDB4MTAxOCArIDMyICog KHgpKQo+ID4gLSNkZWZpbmUgRURNQV9UQ0RfQ1NSKHgpICAgICAgICAgICAgICAgICgweDEwMUMg KyAzMiAqICh4KSkKPiA+IC0jZGVmaW5lIEVETUFfVENEX0JJVEVSX0VMSU5LKHgpICAgICAgICAo MHgxMDFFICsgMzIgKiAoeCkpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9CSVRFUih4KSAgICAgICgw eDEwMUUgKyAzMiAqICh4KSkKPiA+IC0KPiA+ICAjZGVmaW5lIEVETUFfQ1JfRURCRyAgICAgICAg ICAgQklUKDEpCj4gPiAgI2RlZmluZSBFRE1BX0NSX0VSQ0EgICAgICAgICAgIEJJVCgyKQo+ID4g ICNkZWZpbmUgRURNQV9DUl9FUkdBICAgICAgICAgICBCSVQoMykKPiA+IEBAIC00NywzNCArMTgs MjkgQEAKPiA+ICAjZGVmaW5lIEVETUFfQ1JfRUNYICAgICAgICAgICAgQklUKDE2KQo+ID4gICNk ZWZpbmUgRURNQV9DUl9DWCAgICAgICAgICAgICBCSVQoMTcpCj4gPgo+ID4gLSNkZWZpbmUgRURN QV9TRUVJX1NFRUkoeCkgICAgICAoKHgpICYgMHgxRikKPiA+IC0jZGVmaW5lIEVETUFfQ0VFSV9D RUVJKHgpICAgICAgKCh4KSAmIDB4MUYpCj4gPiAtI2RlZmluZSBFRE1BX0NJTlRfQ0lOVCh4KSAg ICAgICgoeCkgJiAweDFGKQo+ID4gLSNkZWZpbmUgRURNQV9DRVJSX0NFUlIoeCkgICAgICAoKHgp ICYgMHgxRikKPiA+IC0KPiA+IC0jZGVmaW5lIEVETUFfVENEX0FUVFJfRFNJWkUoeCkgICAgICAg ICAoKCh4KSAmIDB4MDAwNykpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9BVFRSX0RNT0QoeCkgICAg ICAgICAgKCgoeCkgJiAweDAwMUYpIDw8IDMpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9BVFRSX1NT SVpFKHgpICAgICAgICAgKCgoeCkgJiAweDAwMDcpIDw8IDgpCj4gPiAtI2RlZmluZSBFRE1BX1RD RF9BVFRSX1NNT0QoeCkgICAgICAgICAgKCgoeCkgJiAweDAwMUYpIDw8IDExKQo+ID4gLSNkZWZp bmUgRURNQV9UQ0RfQVRUUl9TU0laRV84QklUICAgICAgICgweDAwMDApCj4gPiAtI2RlZmluZSBF RE1BX1RDRF9BVFRSX1NTSVpFXzE2QklUICAgICAgKDB4MDEwMCkKPiA+IC0jZGVmaW5lIEVETUFf VENEX0FUVFJfU1NJWkVfMzJCSVQgICAgICAoMHgwMjAwKQo+ID4gLSNkZWZpbmUgRURNQV9UQ0Rf QVRUUl9TU0laRV82NEJJVCAgICAgICgweDAzMDApCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9BVFRS X1NTSVpFXzMyQllURSAgICAgKDB4MDUwMCkKPiA+IC0jZGVmaW5lIEVETUFfVENEX0FUVFJfRFNJ WkVfOEJJVCAgICAgICAoMHgwMDAwKQo+ID4gLSNkZWZpbmUgRURNQV9UQ0RfQVRUUl9EU0laRV8x NkJJVCAgICAgICgweDAwMDEpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9BVFRSX0RTSVpFXzMyQklU ICAgICAgKDB4MDAwMikKPiA+IC0jZGVmaW5lIEVETUFfVENEX0FUVFJfRFNJWkVfNjRCSVQgICAg ICAoMHgwMDAzKQo+ID4gLSNkZWZpbmUgRURNQV9UQ0RfQVRUUl9EU0laRV8zMkJZVEUgICAgICgw eDAwMDUpCj4gPiAtCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9TT0ZGX1NPRkYoeCkgICAgICAgICAg KHgpCj4gPiAtI2RlZmluZSBFRE1BX1RDRF9OQllURVNfTkJZVEVTKHgpICAgICAgKHgpCj4gPiAt I2RlZmluZSBFRE1BX1RDRF9TTEFTVF9TTEFTVCh4KSAgICAgICAgICAgICAgICAoeCkKPiA+IC0j ZGVmaW5lIEVETUFfVENEX0RBRERSX0RBRERSKHgpICAgICAgICAgICAgICAgICh4KQo+ID4gLSNk ZWZpbmUgRURNQV9UQ0RfQ0lURVJfQ0lURVIoeCkgICAgICAgICAgICAgICAgKCh4KSAmIDB4N0ZG RikKPiA+IC0jZGVmaW5lIEVETUFfVENEX0RPRkZfRE9GRih4KSAgICAgICAgICAoeCkKPiA+IC0j ZGVmaW5lIEVETUFfVENEX0RMQVNUX1NHQV9ETEFTVF9TR0EoeCkgICAgICAgICh4KQo+ID4gLSNk ZWZpbmUgRURNQV9UQ0RfQklURVJfQklURVIoeCkgICAgICAgICAgICAgICAgKCh4KSAmIDB4N0ZG RikKPiA+ICsjZGVmaW5lIEVETUFfU0VFSV9TRUVJKHgpICAgICAgKCh4KSAmIEdFTk1BU0soNCwg MCkpCj4gPiArI2RlZmluZSBFRE1BX0NFRUlfQ0VFSSh4KSAgICAgICgoeCkgJiBHRU5NQVNLKDQs IDApKQo+ID4gKyNkZWZpbmUgRURNQV9DSU5UX0NJTlQoeCkgICAgICAoKHgpICYgR0VOTUFTSyg0 LCAwKSkKPiA+ICsjZGVmaW5lIEVETUFfQ0VSUl9DRVJSKHgpICAgICAgKCh4KSAmIEdFTk1BU0so NCwgMCkpCj4gPiArCj4gPiArI2RlZmluZSBFRE1BX1RDRF9BVFRSX0RTSVpFKHgpICAgICAgICAg KCgoeCkgJiBHRU5NQVNLKDIsIDApKSkKPiA+ICsjZGVmaW5lIEVETUFfVENEX0FUVFJfRE1PRCh4 KSAgICAgICAgICAoKCh4KSAmIEdFTk1BU0soNCwgMCkpIDw8IDMpCj4gPiArI2RlZmluZSBFRE1B X1RDRF9BVFRSX1NTSVpFKHgpICAgICAgICAgKCgoeCkgJiBHRU5NQVNLKDIsIDApKSA8PCA4KQo+ ID4gKyNkZWZpbmUgRURNQV9UQ0RfQVRUUl9TTU9EKHgpICAgICAgICAgICgoKHgpICYgR0VOTUFT Syg0LCAwKSkgPDwgMTEpCj4gCj4gVGhpcyBsb29rcyBsaWtlIGEgY2hhbmdlIGZvciBpdHMgb3du IGNvbW1pdC4KPiAKWWVzLCB3YXMgcHJldmlvdXNseSByZXF1aXJlZCB0aGUgdXNhZ2Ugb2YgQklU KCkgYW5kIEdFTk1BU0soKS4KCj4gPiArCj4gPiArI2RlZmluZSBFRE1BX1RDRF9BVFRSX0RTSVpF XzhCSVQgICAgICAgMAo+ID4gKyNkZWZpbmUgRURNQV9UQ0RfQVRUUl9EU0laRV8xNkJJVCAgICAg IEJJVCgwKQo+ID4gKyNkZWZpbmUgRURNQV9UQ0RfQVRUUl9EU0laRV8zMkJJVCAgICAgIEJJVCgx KQo+ID4gKyNkZWZpbmUgRURNQV9UQ0RfQVRUUl9EU0laRV82NEJJVCAgICAgIChCSVQoMCkgfCBC SVQoMSkpCj4gPiArI2RlZmluZSBFRE1BX1RDRF9BVFRSX0RTSVpFXzMyQllURSAgICAgKEJJVCgz KSB8IEJJVCgwKSkKPiA+ICsjZGVmaW5lIEVETUFfVENEX0FUVFJfU1NJWkVfOEJJVCAgICAgICAw Cj4gPiArI2RlZmluZSBFRE1BX1RDRF9BVFRSX1NTSVpFXzE2QklUICAgICAgKEVETUFfVENEX0FU VFJfRFNJWkVfMTZCSVQgPDwgOCkKPiA+ICsjZGVmaW5lIEVETUFfVENEX0FUVFJfU1NJWkVfMzJC SVQgICAgICAoRURNQV9UQ0RfQVRUUl9EU0laRV8zMkJJVCA8PCA4KQo+ID4gKyNkZWZpbmUgRURN QV9UQ0RfQVRUUl9TU0laRV82NEJJVCAgICAgIChFRE1BX1RDRF9BVFRSX0RTSVpFXzY0QklUIDw8 IDgpCj4gPiArI2RlZmluZSBFRE1BX1RDRF9BVFRSX1NTSVpFXzMyQllURSAgICAgKEVETUFfVENE X0FUVFJfRFNJWkVfMzJCWVRFIDw8IDgpCj4gPiArCj4gPiArI2RlZmluZSBFRE1BX1RDRF9DSVRF Ul9DSVRFUih4KSAgICAgICAgICAgICAgICAoKHgpICYgR0VOTUFTSygxNCwgMCkpCj4gPiArI2Rl ZmluZSBFRE1BX1RDRF9CSVRFUl9CSVRFUih4KSAgICAgICAgICAgICAgICAoKHgpICYgR0VOTUFT SygxNCwgMCkpCj4gPgo+ID4gICNkZWZpbmUgRURNQV9UQ0RfQ1NSX1NUQVJUICAgICAgICAgICAg IEJJVCgwKQo+ID4gICNkZWZpbmUgRURNQV9UQ0RfQ1NSX0lOVF9NQUpPUiAgICAgICAgIEJJVCgx KQo+ID4gQEAgLTg3LDcgKzUzLDcgQEAKPiA+Cj4gPiAgI2RlZmluZSBFRE1BTVVYX0NIQ0ZHX0RJ UyAgICAgICAgICAgICAgMHgwCj4gPiAgI2RlZmluZSBFRE1BTVVYX0NIQ0ZHX0VOQkwgICAgICAg ICAgICAgMHg4MAo+ID4gLSNkZWZpbmUgRURNQU1VWF9DSENGR19TT1VSQ0UobikgICAgICAgICAg ICAgICAgKChuKSAmIDB4M0YpCj4gPiArI2RlZmluZSBFRE1BTVVYX0NIQ0ZHX1NPVVJDRShuKSAg ICAgICAgICAgICAgICAoKG4pICYgR0VOTUFTSyg2LCAwKSkKPiA+Cj4gPiAgI2RlZmluZSBETUFN VVhfTlIgICAgICAyCj4gPgo+ID4gQEAgLTExNCw2ICs4MCwzMSBAQCBzdHJ1Y3QgZnNsX2VkbWFf aHdfdGNkIHsKPiA+ICAgICAgICAgX19sZTE2ICBiaXRlcjsKPiA+ICB9Owo+ID4KPiA+ICsvKgo+ ID4gKyAqIFRoaXMgYXJlIGlvbWVtIHBvaW50ZXJzLCBmb3IgYm90aCB2MzIgYW5kIHY2NC4KPiAK PiBzL1RoaXMvVGhlc2UvCj4KQWNrLiBXaWxsIGV2ZW50dWFsbHkgZml4IGFsbCBpbiBhIHY5LiBD b2xsZWN0aW5nIGZlZWRiYWNrcy4KIAo+IFRlc3RlZC1ieTogS3J6eXN6dG9mIEtvemxvd3NraSA8 a3J6a0BrZXJuZWwub3JnPgo+IAo+IEJlc3QgcmVnYXJkcywKPiBLcnp5c3p0b2YKPiAtLQo+IFRv IHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBs aW51eC1tNjhrIiBpbgo+IHRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5r ZXJuZWwub3JnCj4gTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9y Zy9tYWpvcmRvbW8taW5mby5odG1sCgpCZXN0IFJlZ2FyZHMsCkFuZ2VsbwotLS0KVG8gdW5zdWJz Y3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGRtYWVuZ2lu ZSIgaW4KdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcK TW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8t aW5mby5odG1sCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Angelo Dureghello Subject: Re: [PATCH v8 2/3] dmaengine: fsl-edma: add edma version and configurable registers Date: Mon, 6 Aug 2018 22:31:17 +0200 Message-ID: <20180806203117.GB6092@jerusalem> References: <20180803193244.12084-1-angelo@sysam.it> <20180803193244.12084-2-angelo@sysam.it> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, Stefan Agner , linux-m68k@vger.kernel.org, vinod.koul@linaro.org, linux-arm-kernel@lists.infradead.org List-Id: linux-m68k@vger.kernel.org Hi Krzysztof, many thanks for testing. On Mon, Aug 06, 2018 at 09:59:35AM +0200, Krzysztof Kozlowski wrote: > On 3 August 2018 at 21:32, Angelo Dureghello wrote: > > This patch adds configurable registers (using __iomem addresses) > > to allow the use of fsl-edma-common code with slightly different > > edma module versions, as Vybrid (v1) and ColdFire (v2) are. > > > > Removal of old membase-referenced registers, amd some fixes on > > macroes are included. > > > > Signed-off-by: Angelo Dureghello > > --- > > Changes from v7: > > - patch rewritten from scratch, this patch (2/3) has just been added. > > --- > > drivers/dma/fsl-edma-common.c | 138 ++++++++++++++++++++++++++-------- > > drivers/dma/fsl-edma-common.h | 115 ++++++++++++++-------------- > > drivers/dma/fsl-edma.c | 32 ++++---- > > 3 files changed, 182 insertions(+), 103 deletions(-) > > > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > > index 0ae7094f477a..948a3ee51bbb 100644 > > --- a/drivers/dma/fsl-edma-common.c > > +++ b/drivers/dma/fsl-edma-common.c > > @@ -9,6 +9,38 @@ > > > > #include "fsl-edma-common.h" > > > > +#define EDMA_CR 0x00 > > +#define EDMA_ES 0x04 > > +#define EDMA_ERQ 0x0C > > +#define EDMA_EEI 0x14 > > +#define EDMA_SERQ 0x1B > > +#define EDMA_CERQ 0x1A > > +#define EDMA_SEEI 0x19 > > +#define EDMA_CEEI 0x18 > > +#define EDMA_CINT 0x1F > > +#define EDMA_CERR 0x1E > > +#define EDMA_SSRT 0x1D > > +#define EDMA_CDNE 0x1C > > +#define EDMA_INTR 0x24 > > +#define EDMA_ERR 0x2C > > + > > +#define EDMA64_ERQH 0x08 > > +#define EDMA64_EEIH 0x10 > > +#define EDMA64_SERQ 0x18 > > +#define EDMA64_CERQ 0x19 > > +#define EDMA64_SEEI 0x1a > > +#define EDMA64_CEEI 0x1b > > +#define EDMA64_CINT 0x1c > > +#define EDMA64_CERR 0x1d > > +#define EDMA64_SSRT 0x1e > > +#define EDMA64_CDNE 0x1f > > +#define EDMA64_INTH 0x20 > > +#define EDMA64_INTL 0x24 > > +#define EDMA64_ERRH 0x28 > > +#define EDMA64_ERRL 0x2c > > + > > +#define EDMA_TCD 0x1000 > > + > > /* > > * R/W functions for big- or little-endian registers: > > * The eDMA controller's endian is independent of the CPU core's endian. > > @@ -67,20 +99,20 @@ EXPORT_SYMBOL_GPL(to_fsl_edma_desc); > > > > static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) > > { > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > - edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), addr + EDMA_SEEI); > > - edma_writeb(fsl_chan->edma, ch, addr + EDMA_SERQ); > > + edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei); > > + edma_writeb(fsl_chan->edma, ch, regs->serq); > > } > > > > void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan) > > { > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > - edma_writeb(fsl_chan->edma, ch, addr + EDMA_CERQ); > > - edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), addr + EDMA_CEEI); > > + edma_writeb(fsl_chan->edma, ch, regs->cerq); > > + edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei); > > } > > EXPORT_SYMBOL_GPL(fsl_edma_disable_request); > > > > @@ -208,7 +240,7 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, > > struct virt_dma_desc *vdesc, bool in_progress) > > { > > struct fsl_edma_desc *edesc = fsl_chan->edesc; > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > enum dma_transfer_direction dir = fsl_chan->fsc.dir; > > dma_addr_t cur_addr, dma_addr; > > @@ -224,11 +256,9 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, > > return len; > > > > if (dir == DMA_MEM_TO_DEV) > > - cur_addr = edma_readl( > > - fsl_chan->edma, addr + EDMA_TCD_SADDR(ch)); > > + cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].saddr); > > else > > - cur_addr = edma_readl( > > - fsl_chan->edma, addr + EDMA_TCD_DADDR(ch)); > > + cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].daddr); > > > > /* figure out the finished and calculate the residue */ > > for (i = 0; i < fsl_chan->edesc->n_tcds; i++) { > > @@ -285,7 +315,7 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, > > struct fsl_edma_hw_tcd *tcd) > > { > > struct fsl_edma_engine *edma = fsl_chan->edma; > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > /* > > @@ -293,24 +323,24 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, > > * endian format. However, we need to load the TCD registers in > > * big- or little-endian obeying the eDMA engine model endian. > > */ > > - edma_writew(edma, 0, addr + EDMA_TCD_CSR(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->saddr), addr + EDMA_TCD_SADDR(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->daddr), addr + EDMA_TCD_DADDR(ch)); > > + edma_writew(edma, 0, ®s->tcd[ch].csr); > > + edma_writel(edma, le32_to_cpu(tcd->saddr), ®s->tcd[ch].saddr); > > + edma_writel(edma, le32_to_cpu(tcd->daddr), ®s->tcd[ch].daddr); > > > > - edma_writew(edma, le16_to_cpu(tcd->attr), addr + EDMA_TCD_ATTR(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->soff), addr + EDMA_TCD_SOFF(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->attr), ®s->tcd[ch].attr); > > + edma_writew(edma, le16_to_cpu(tcd->soff), ®s->tcd[ch].soff); > > > > - edma_writel(edma, le32_to_cpu(tcd->nbytes), addr + EDMA_TCD_NBYTES(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->slast), addr + EDMA_TCD_SLAST(ch)); > > + edma_writel(edma, le32_to_cpu(tcd->nbytes), ®s->tcd[ch].nbytes); > > + edma_writel(edma, le32_to_cpu(tcd->slast), ®s->tcd[ch].slast); > > > > - edma_writew(edma, le16_to_cpu(tcd->citer), addr + EDMA_TCD_CITER(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->biter), addr + EDMA_TCD_BITER(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->doff), addr + EDMA_TCD_DOFF(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->citer), ®s->tcd[ch].citer); > > + edma_writew(edma, le16_to_cpu(tcd->biter), ®s->tcd[ch].biter); > > + edma_writew(edma, le16_to_cpu(tcd->doff), ®s->tcd[ch].doff); > > > > - edma_writel(edma, > > - le32_to_cpu(tcd->dlast_sga), addr + EDMA_TCD_DLAST_SGA(ch)); > > + edma_writel(edma, le32_to_cpu(tcd->dlast_sga), > > + ®s->tcd[ch].dlast_sga); > > > > - edma_writew(edma, le16_to_cpu(tcd->csr), addr + EDMA_TCD_CSR(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->csr), ®s->tcd[ch].csr); > > } > > > > static inline > > @@ -332,15 +362,15 @@ void fsl_edma_fill_tcd(struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, > > > > tcd->attr = cpu_to_le16(attr); > > > > - tcd->soff = cpu_to_le16(EDMA_TCD_SOFF_SOFF(soff)); > > + tcd->soff = cpu_to_le16(soff); > > > > - tcd->nbytes = cpu_to_le32(EDMA_TCD_NBYTES_NBYTES(nbytes)); > > - tcd->slast = cpu_to_le32(EDMA_TCD_SLAST_SLAST(slast)); > > + tcd->nbytes = cpu_to_le32(nbytes); > > + tcd->slast = cpu_to_le32(slast); > > > > tcd->citer = cpu_to_le16(EDMA_TCD_CITER_CITER(citer)); > > - tcd->doff = cpu_to_le16(EDMA_TCD_DOFF_DOFF(doff)); > > + tcd->doff = cpu_to_le16(doff); > > > > - tcd->dlast_sga = cpu_to_le32(EDMA_TCD_DLAST_SGA_DLAST_SGA(dlast_sga)); > > + tcd->dlast_sga = cpu_to_le32(dlast_sga); > > > > tcd->biter = cpu_to_le16(EDMA_TCD_BITER_BITER(biter)); > > if (major_int) > > @@ -573,4 +603,52 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev) > > } > > EXPORT_SYMBOL_GPL(fsl_edma_cleanup_vchan); > > > > +/* > > + * On the 32 channels Vybrid/mpc577x edma version (here called "v1"), > > + * register offsets are different compared to ColdFire mcf5441x 64 channels > > + * edma (here called "v2"). > > + * > > + * This function sets up register offsets as per proper declared version > > + * so must be called in xxx_edma_probe() just after setting the > > + * edma "version" and "membase" appropriately. > > + */ > > +void fsl_edma_setup_regs(struct fsl_edma_engine *edma) > > +{ > > + edma->regs.cr = edma->membase + EDMA_CR; > > + edma->regs.es = edma->membase + EDMA_ES; > > + edma->regs.erql = edma->membase + EDMA_ERQ; > > + edma->regs.eeil = edma->membase + EDMA_EEI; > > + > > + edma->regs.serq = edma->membase + ((edma->version == v1) ? > > + EDMA_SERQ : EDMA64_SERQ); > > + edma->regs.cerq = edma->membase + ((edma->version == v1) ? > > + EDMA_CERQ : EDMA64_CERQ); > > + edma->regs.seei = edma->membase + ((edma->version == v1) ? > > + EDMA_SEEI : EDMA64_SEEI); > > + edma->regs.ceei = edma->membase + ((edma->version == v1) ? > > + EDMA_CEEI : EDMA64_CEEI); > > + edma->regs.cint = edma->membase + ((edma->version == v1) ? > > + EDMA_CINT : EDMA64_CINT); > > + edma->regs.cerr = edma->membase + ((edma->version == v1) ? > > + EDMA_CERR : EDMA64_CERR); > > + edma->regs.ssrt = edma->membase + ((edma->version == v1) ? > > + EDMA_SSRT : EDMA64_SSRT); > > + edma->regs.cdne = edma->membase + ((edma->version == v1) ? > > + EDMA_CDNE : EDMA64_CDNE); > > + edma->regs.intl = edma->membase + ((edma->version == v1) ? > > + EDMA_INTR : EDMA64_INTL); > > + edma->regs.errl = edma->membase + ((edma->version == v1) ? > > + EDMA_ERR : EDMA64_ERRL); > > + > > + if (edma->version == v2) { > > + edma->regs.erqh = edma->membase + EDMA64_ERQH; > > + edma->regs.eeih = edma->membase + EDMA64_EEIH; > > + edma->regs.errh = edma->membase + EDMA64_ERRH; > > + edma->regs.inth = edma->membase + EDMA64_INTH; > > + } > > + > > + edma->regs.tcd = edma->membase + EDMA_TCD; > > +} > > +EXPORT_SYMBOL_GPL(fsl_edma_setup_regs); > > + > > MODULE_LICENSE("GPL v2"); > > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h > > index f3ea68e15b23..7a9231e7639f 100644 > > --- a/drivers/dma/fsl-edma-common.h > > +++ b/drivers/dma/fsl-edma-common.h > > @@ -8,35 +8,6 @@ > > > > #include "virt-dma.h" > > > > -#define EDMA_CR 0x00 > > -#define EDMA_ES 0x04 > > -#define EDMA_ERQ 0x0C > > -#define EDMA_EEI 0x14 > > -#define EDMA_SERQ 0x1B > > -#define EDMA_CERQ 0x1A > > -#define EDMA_SEEI 0x19 > > -#define EDMA_CEEI 0x18 > > -#define EDMA_CINT 0x1F > > -#define EDMA_CERR 0x1E > > -#define EDMA_SSRT 0x1D > > -#define EDMA_CDNE 0x1C > > -#define EDMA_INTR 0x24 > > -#define EDMA_ERR 0x2C > > - > > -#define EDMA_TCD_SADDR(x) (0x1000 + 32 * (x)) > > -#define EDMA_TCD_SOFF(x) (0x1004 + 32 * (x)) > > -#define EDMA_TCD_ATTR(x) (0x1006 + 32 * (x)) > > -#define EDMA_TCD_NBYTES(x) (0x1008 + 32 * (x)) > > -#define EDMA_TCD_SLAST(x) (0x100C + 32 * (x)) > > -#define EDMA_TCD_DADDR(x) (0x1010 + 32 * (x)) > > -#define EDMA_TCD_DOFF(x) (0x1014 + 32 * (x)) > > -#define EDMA_TCD_CITER_ELINK(x) (0x1016 + 32 * (x)) > > -#define EDMA_TCD_CITER(x) (0x1016 + 32 * (x)) > > -#define EDMA_TCD_DLAST_SGA(x) (0x1018 + 32 * (x)) > > -#define EDMA_TCD_CSR(x) (0x101C + 32 * (x)) > > -#define EDMA_TCD_BITER_ELINK(x) (0x101E + 32 * (x)) > > -#define EDMA_TCD_BITER(x) (0x101E + 32 * (x)) > > - > > #define EDMA_CR_EDBG BIT(1) > > #define EDMA_CR_ERCA BIT(2) > > #define EDMA_CR_ERGA BIT(3) > > @@ -47,34 +18,29 @@ > > #define EDMA_CR_ECX BIT(16) > > #define EDMA_CR_CX BIT(17) > > > > -#define EDMA_SEEI_SEEI(x) ((x) & 0x1F) > > -#define EDMA_CEEI_CEEI(x) ((x) & 0x1F) > > -#define EDMA_CINT_CINT(x) ((x) & 0x1F) > > -#define EDMA_CERR_CERR(x) ((x) & 0x1F) > > - > > -#define EDMA_TCD_ATTR_DSIZE(x) (((x) & 0x0007)) > > -#define EDMA_TCD_ATTR_DMOD(x) (((x) & 0x001F) << 3) > > -#define EDMA_TCD_ATTR_SSIZE(x) (((x) & 0x0007) << 8) > > -#define EDMA_TCD_ATTR_SMOD(x) (((x) & 0x001F) << 11) > > -#define EDMA_TCD_ATTR_SSIZE_8BIT (0x0000) > > -#define EDMA_TCD_ATTR_SSIZE_16BIT (0x0100) > > -#define EDMA_TCD_ATTR_SSIZE_32BIT (0x0200) > > -#define EDMA_TCD_ATTR_SSIZE_64BIT (0x0300) > > -#define EDMA_TCD_ATTR_SSIZE_32BYTE (0x0500) > > -#define EDMA_TCD_ATTR_DSIZE_8BIT (0x0000) > > -#define EDMA_TCD_ATTR_DSIZE_16BIT (0x0001) > > -#define EDMA_TCD_ATTR_DSIZE_32BIT (0x0002) > > -#define EDMA_TCD_ATTR_DSIZE_64BIT (0x0003) > > -#define EDMA_TCD_ATTR_DSIZE_32BYTE (0x0005) > > - > > -#define EDMA_TCD_SOFF_SOFF(x) (x) > > -#define EDMA_TCD_NBYTES_NBYTES(x) (x) > > -#define EDMA_TCD_SLAST_SLAST(x) (x) > > -#define EDMA_TCD_DADDR_DADDR(x) (x) > > -#define EDMA_TCD_CITER_CITER(x) ((x) & 0x7FFF) > > -#define EDMA_TCD_DOFF_DOFF(x) (x) > > -#define EDMA_TCD_DLAST_SGA_DLAST_SGA(x) (x) > > -#define EDMA_TCD_BITER_BITER(x) ((x) & 0x7FFF) > > +#define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CEEI_CEEI(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CINT_CINT(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CERR_CERR(x) ((x) & GENMASK(4, 0)) > > + > > +#define EDMA_TCD_ATTR_DSIZE(x) (((x) & GENMASK(2, 0))) > > +#define EDMA_TCD_ATTR_DMOD(x) (((x) & GENMASK(4, 0)) << 3) > > +#define EDMA_TCD_ATTR_SSIZE(x) (((x) & GENMASK(2, 0)) << 8) > > +#define EDMA_TCD_ATTR_SMOD(x) (((x) & GENMASK(4, 0)) << 11) > > This looks like a change for its own commit. > Yes, was previously required the usage of BIT() and GENMASK(). > > + > > +#define EDMA_TCD_ATTR_DSIZE_8BIT 0 > > +#define EDMA_TCD_ATTR_DSIZE_16BIT BIT(0) > > +#define EDMA_TCD_ATTR_DSIZE_32BIT BIT(1) > > +#define EDMA_TCD_ATTR_DSIZE_64BIT (BIT(0) | BIT(1)) > > +#define EDMA_TCD_ATTR_DSIZE_32BYTE (BIT(3) | BIT(0)) > > +#define EDMA_TCD_ATTR_SSIZE_8BIT 0 > > +#define EDMA_TCD_ATTR_SSIZE_16BIT (EDMA_TCD_ATTR_DSIZE_16BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_32BIT (EDMA_TCD_ATTR_DSIZE_32BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_64BIT (EDMA_TCD_ATTR_DSIZE_64BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_32BYTE (EDMA_TCD_ATTR_DSIZE_32BYTE << 8) > > + > > +#define EDMA_TCD_CITER_CITER(x) ((x) & GENMASK(14, 0)) > > +#define EDMA_TCD_BITER_BITER(x) ((x) & GENMASK(14, 0)) > > > > #define EDMA_TCD_CSR_START BIT(0) > > #define EDMA_TCD_CSR_INT_MAJOR BIT(1) > > @@ -87,7 +53,7 @@ > > > > #define EDMAMUX_CHCFG_DIS 0x0 > > #define EDMAMUX_CHCFG_ENBL 0x80 > > -#define EDMAMUX_CHCFG_SOURCE(n) ((n) & 0x3F) > > +#define EDMAMUX_CHCFG_SOURCE(n) ((n) & GENMASK(6, 0)) > > > > #define DMAMUX_NR 2 > > > > @@ -114,6 +80,31 @@ struct fsl_edma_hw_tcd { > > __le16 biter; > > }; > > > > +/* > > + * This are iomem pointers, for both v32 and v64. > > s/This/These/ > Ack. Will eventually fix all in a v9. Collecting feedbacks. > Tested-by: Krzysztof Kozlowski > > Best regards, > Krzysztof > -- > To unsubscribe from this list: send the line "unsubscribe linux-m68k" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Best Regards, Angelo From mboxrd@z Thu Jan 1 00:00:00 1970 From: angelo@sysam.it (Angelo Dureghello) Date: Mon, 6 Aug 2018 22:31:17 +0200 Subject: [PATCH v8 2/3] dmaengine: fsl-edma: add edma version and configurable registers In-Reply-To: References: <20180803193244.12084-1-angelo@sysam.it> <20180803193244.12084-2-angelo@sysam.it> Message-ID: <20180806203117.GB6092@jerusalem> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Krzysztof, many thanks for testing. On Mon, Aug 06, 2018 at 09:59:35AM +0200, Krzysztof Kozlowski wrote: > On 3 August 2018 at 21:32, Angelo Dureghello wrote: > > This patch adds configurable registers (using __iomem addresses) > > to allow the use of fsl-edma-common code with slightly different > > edma module versions, as Vybrid (v1) and ColdFire (v2) are. > > > > Removal of old membase-referenced registers, amd some fixes on > > macroes are included. > > > > Signed-off-by: Angelo Dureghello > > --- > > Changes from v7: > > - patch rewritten from scratch, this patch (2/3) has just been added. > > --- > > drivers/dma/fsl-edma-common.c | 138 ++++++++++++++++++++++++++-------- > > drivers/dma/fsl-edma-common.h | 115 ++++++++++++++-------------- > > drivers/dma/fsl-edma.c | 32 ++++---- > > 3 files changed, 182 insertions(+), 103 deletions(-) > > > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > > index 0ae7094f477a..948a3ee51bbb 100644 > > --- a/drivers/dma/fsl-edma-common.c > > +++ b/drivers/dma/fsl-edma-common.c > > @@ -9,6 +9,38 @@ > > > > #include "fsl-edma-common.h" > > > > +#define EDMA_CR 0x00 > > +#define EDMA_ES 0x04 > > +#define EDMA_ERQ 0x0C > > +#define EDMA_EEI 0x14 > > +#define EDMA_SERQ 0x1B > > +#define EDMA_CERQ 0x1A > > +#define EDMA_SEEI 0x19 > > +#define EDMA_CEEI 0x18 > > +#define EDMA_CINT 0x1F > > +#define EDMA_CERR 0x1E > > +#define EDMA_SSRT 0x1D > > +#define EDMA_CDNE 0x1C > > +#define EDMA_INTR 0x24 > > +#define EDMA_ERR 0x2C > > + > > +#define EDMA64_ERQH 0x08 > > +#define EDMA64_EEIH 0x10 > > +#define EDMA64_SERQ 0x18 > > +#define EDMA64_CERQ 0x19 > > +#define EDMA64_SEEI 0x1a > > +#define EDMA64_CEEI 0x1b > > +#define EDMA64_CINT 0x1c > > +#define EDMA64_CERR 0x1d > > +#define EDMA64_SSRT 0x1e > > +#define EDMA64_CDNE 0x1f > > +#define EDMA64_INTH 0x20 > > +#define EDMA64_INTL 0x24 > > +#define EDMA64_ERRH 0x28 > > +#define EDMA64_ERRL 0x2c > > + > > +#define EDMA_TCD 0x1000 > > + > > /* > > * R/W functions for big- or little-endian registers: > > * The eDMA controller's endian is independent of the CPU core's endian. > > @@ -67,20 +99,20 @@ EXPORT_SYMBOL_GPL(to_fsl_edma_desc); > > > > static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) > > { > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > - edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), addr + EDMA_SEEI); > > - edma_writeb(fsl_chan->edma, ch, addr + EDMA_SERQ); > > + edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei); > > + edma_writeb(fsl_chan->edma, ch, regs->serq); > > } > > > > void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan) > > { > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > - edma_writeb(fsl_chan->edma, ch, addr + EDMA_CERQ); > > - edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), addr + EDMA_CEEI); > > + edma_writeb(fsl_chan->edma, ch, regs->cerq); > > + edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei); > > } > > EXPORT_SYMBOL_GPL(fsl_edma_disable_request); > > > > @@ -208,7 +240,7 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, > > struct virt_dma_desc *vdesc, bool in_progress) > > { > > struct fsl_edma_desc *edesc = fsl_chan->edesc; > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > enum dma_transfer_direction dir = fsl_chan->fsc.dir; > > dma_addr_t cur_addr, dma_addr; > > @@ -224,11 +256,9 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, > > return len; > > > > if (dir == DMA_MEM_TO_DEV) > > - cur_addr = edma_readl( > > - fsl_chan->edma, addr + EDMA_TCD_SADDR(ch)); > > + cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].saddr); > > else > > - cur_addr = edma_readl( > > - fsl_chan->edma, addr + EDMA_TCD_DADDR(ch)); > > + cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].daddr); > > > > /* figure out the finished and calculate the residue */ > > for (i = 0; i < fsl_chan->edesc->n_tcds; i++) { > > @@ -285,7 +315,7 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, > > struct fsl_edma_hw_tcd *tcd) > > { > > struct fsl_edma_engine *edma = fsl_chan->edma; > > - void __iomem *addr = fsl_chan->edma->membase; > > + struct edma_regs *regs = &fsl_chan->edma->regs; > > u32 ch = fsl_chan->vchan.chan.chan_id; > > > > /* > > @@ -293,24 +323,24 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, > > * endian format. However, we need to load the TCD registers in > > * big- or little-endian obeying the eDMA engine model endian. > > */ > > - edma_writew(edma, 0, addr + EDMA_TCD_CSR(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->saddr), addr + EDMA_TCD_SADDR(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->daddr), addr + EDMA_TCD_DADDR(ch)); > > + edma_writew(edma, 0, ®s->tcd[ch].csr); > > + edma_writel(edma, le32_to_cpu(tcd->saddr), ®s->tcd[ch].saddr); > > + edma_writel(edma, le32_to_cpu(tcd->daddr), ®s->tcd[ch].daddr); > > > > - edma_writew(edma, le16_to_cpu(tcd->attr), addr + EDMA_TCD_ATTR(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->soff), addr + EDMA_TCD_SOFF(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->attr), ®s->tcd[ch].attr); > > + edma_writew(edma, le16_to_cpu(tcd->soff), ®s->tcd[ch].soff); > > > > - edma_writel(edma, le32_to_cpu(tcd->nbytes), addr + EDMA_TCD_NBYTES(ch)); > > - edma_writel(edma, le32_to_cpu(tcd->slast), addr + EDMA_TCD_SLAST(ch)); > > + edma_writel(edma, le32_to_cpu(tcd->nbytes), ®s->tcd[ch].nbytes); > > + edma_writel(edma, le32_to_cpu(tcd->slast), ®s->tcd[ch].slast); > > > > - edma_writew(edma, le16_to_cpu(tcd->citer), addr + EDMA_TCD_CITER(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->biter), addr + EDMA_TCD_BITER(ch)); > > - edma_writew(edma, le16_to_cpu(tcd->doff), addr + EDMA_TCD_DOFF(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->citer), ®s->tcd[ch].citer); > > + edma_writew(edma, le16_to_cpu(tcd->biter), ®s->tcd[ch].biter); > > + edma_writew(edma, le16_to_cpu(tcd->doff), ®s->tcd[ch].doff); > > > > - edma_writel(edma, > > - le32_to_cpu(tcd->dlast_sga), addr + EDMA_TCD_DLAST_SGA(ch)); > > + edma_writel(edma, le32_to_cpu(tcd->dlast_sga), > > + ®s->tcd[ch].dlast_sga); > > > > - edma_writew(edma, le16_to_cpu(tcd->csr), addr + EDMA_TCD_CSR(ch)); > > + edma_writew(edma, le16_to_cpu(tcd->csr), ®s->tcd[ch].csr); > > } > > > > static inline > > @@ -332,15 +362,15 @@ void fsl_edma_fill_tcd(struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, > > > > tcd->attr = cpu_to_le16(attr); > > > > - tcd->soff = cpu_to_le16(EDMA_TCD_SOFF_SOFF(soff)); > > + tcd->soff = cpu_to_le16(soff); > > > > - tcd->nbytes = cpu_to_le32(EDMA_TCD_NBYTES_NBYTES(nbytes)); > > - tcd->slast = cpu_to_le32(EDMA_TCD_SLAST_SLAST(slast)); > > + tcd->nbytes = cpu_to_le32(nbytes); > > + tcd->slast = cpu_to_le32(slast); > > > > tcd->citer = cpu_to_le16(EDMA_TCD_CITER_CITER(citer)); > > - tcd->doff = cpu_to_le16(EDMA_TCD_DOFF_DOFF(doff)); > > + tcd->doff = cpu_to_le16(doff); > > > > - tcd->dlast_sga = cpu_to_le32(EDMA_TCD_DLAST_SGA_DLAST_SGA(dlast_sga)); > > + tcd->dlast_sga = cpu_to_le32(dlast_sga); > > > > tcd->biter = cpu_to_le16(EDMA_TCD_BITER_BITER(biter)); > > if (major_int) > > @@ -573,4 +603,52 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev) > > } > > EXPORT_SYMBOL_GPL(fsl_edma_cleanup_vchan); > > > > +/* > > + * On the 32 channels Vybrid/mpc577x edma version (here called "v1"), > > + * register offsets are different compared to ColdFire mcf5441x 64 channels > > + * edma (here called "v2"). > > + * > > + * This function sets up register offsets as per proper declared version > > + * so must be called in xxx_edma_probe() just after setting the > > + * edma "version" and "membase" appropriately. > > + */ > > +void fsl_edma_setup_regs(struct fsl_edma_engine *edma) > > +{ > > + edma->regs.cr = edma->membase + EDMA_CR; > > + edma->regs.es = edma->membase + EDMA_ES; > > + edma->regs.erql = edma->membase + EDMA_ERQ; > > + edma->regs.eeil = edma->membase + EDMA_EEI; > > + > > + edma->regs.serq = edma->membase + ((edma->version == v1) ? > > + EDMA_SERQ : EDMA64_SERQ); > > + edma->regs.cerq = edma->membase + ((edma->version == v1) ? > > + EDMA_CERQ : EDMA64_CERQ); > > + edma->regs.seei = edma->membase + ((edma->version == v1) ? > > + EDMA_SEEI : EDMA64_SEEI); > > + edma->regs.ceei = edma->membase + ((edma->version == v1) ? > > + EDMA_CEEI : EDMA64_CEEI); > > + edma->regs.cint = edma->membase + ((edma->version == v1) ? > > + EDMA_CINT : EDMA64_CINT); > > + edma->regs.cerr = edma->membase + ((edma->version == v1) ? > > + EDMA_CERR : EDMA64_CERR); > > + edma->regs.ssrt = edma->membase + ((edma->version == v1) ? > > + EDMA_SSRT : EDMA64_SSRT); > > + edma->regs.cdne = edma->membase + ((edma->version == v1) ? > > + EDMA_CDNE : EDMA64_CDNE); > > + edma->regs.intl = edma->membase + ((edma->version == v1) ? > > + EDMA_INTR : EDMA64_INTL); > > + edma->regs.errl = edma->membase + ((edma->version == v1) ? > > + EDMA_ERR : EDMA64_ERRL); > > + > > + if (edma->version == v2) { > > + edma->regs.erqh = edma->membase + EDMA64_ERQH; > > + edma->regs.eeih = edma->membase + EDMA64_EEIH; > > + edma->regs.errh = edma->membase + EDMA64_ERRH; > > + edma->regs.inth = edma->membase + EDMA64_INTH; > > + } > > + > > + edma->regs.tcd = edma->membase + EDMA_TCD; > > +} > > +EXPORT_SYMBOL_GPL(fsl_edma_setup_regs); > > + > > MODULE_LICENSE("GPL v2"); > > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h > > index f3ea68e15b23..7a9231e7639f 100644 > > --- a/drivers/dma/fsl-edma-common.h > > +++ b/drivers/dma/fsl-edma-common.h > > @@ -8,35 +8,6 @@ > > > > #include "virt-dma.h" > > > > -#define EDMA_CR 0x00 > > -#define EDMA_ES 0x04 > > -#define EDMA_ERQ 0x0C > > -#define EDMA_EEI 0x14 > > -#define EDMA_SERQ 0x1B > > -#define EDMA_CERQ 0x1A > > -#define EDMA_SEEI 0x19 > > -#define EDMA_CEEI 0x18 > > -#define EDMA_CINT 0x1F > > -#define EDMA_CERR 0x1E > > -#define EDMA_SSRT 0x1D > > -#define EDMA_CDNE 0x1C > > -#define EDMA_INTR 0x24 > > -#define EDMA_ERR 0x2C > > - > > -#define EDMA_TCD_SADDR(x) (0x1000 + 32 * (x)) > > -#define EDMA_TCD_SOFF(x) (0x1004 + 32 * (x)) > > -#define EDMA_TCD_ATTR(x) (0x1006 + 32 * (x)) > > -#define EDMA_TCD_NBYTES(x) (0x1008 + 32 * (x)) > > -#define EDMA_TCD_SLAST(x) (0x100C + 32 * (x)) > > -#define EDMA_TCD_DADDR(x) (0x1010 + 32 * (x)) > > -#define EDMA_TCD_DOFF(x) (0x1014 + 32 * (x)) > > -#define EDMA_TCD_CITER_ELINK(x) (0x1016 + 32 * (x)) > > -#define EDMA_TCD_CITER(x) (0x1016 + 32 * (x)) > > -#define EDMA_TCD_DLAST_SGA(x) (0x1018 + 32 * (x)) > > -#define EDMA_TCD_CSR(x) (0x101C + 32 * (x)) > > -#define EDMA_TCD_BITER_ELINK(x) (0x101E + 32 * (x)) > > -#define EDMA_TCD_BITER(x) (0x101E + 32 * (x)) > > - > > #define EDMA_CR_EDBG BIT(1) > > #define EDMA_CR_ERCA BIT(2) > > #define EDMA_CR_ERGA BIT(3) > > @@ -47,34 +18,29 @@ > > #define EDMA_CR_ECX BIT(16) > > #define EDMA_CR_CX BIT(17) > > > > -#define EDMA_SEEI_SEEI(x) ((x) & 0x1F) > > -#define EDMA_CEEI_CEEI(x) ((x) & 0x1F) > > -#define EDMA_CINT_CINT(x) ((x) & 0x1F) > > -#define EDMA_CERR_CERR(x) ((x) & 0x1F) > > - > > -#define EDMA_TCD_ATTR_DSIZE(x) (((x) & 0x0007)) > > -#define EDMA_TCD_ATTR_DMOD(x) (((x) & 0x001F) << 3) > > -#define EDMA_TCD_ATTR_SSIZE(x) (((x) & 0x0007) << 8) > > -#define EDMA_TCD_ATTR_SMOD(x) (((x) & 0x001F) << 11) > > -#define EDMA_TCD_ATTR_SSIZE_8BIT (0x0000) > > -#define EDMA_TCD_ATTR_SSIZE_16BIT (0x0100) > > -#define EDMA_TCD_ATTR_SSIZE_32BIT (0x0200) > > -#define EDMA_TCD_ATTR_SSIZE_64BIT (0x0300) > > -#define EDMA_TCD_ATTR_SSIZE_32BYTE (0x0500) > > -#define EDMA_TCD_ATTR_DSIZE_8BIT (0x0000) > > -#define EDMA_TCD_ATTR_DSIZE_16BIT (0x0001) > > -#define EDMA_TCD_ATTR_DSIZE_32BIT (0x0002) > > -#define EDMA_TCD_ATTR_DSIZE_64BIT (0x0003) > > -#define EDMA_TCD_ATTR_DSIZE_32BYTE (0x0005) > > - > > -#define EDMA_TCD_SOFF_SOFF(x) (x) > > -#define EDMA_TCD_NBYTES_NBYTES(x) (x) > > -#define EDMA_TCD_SLAST_SLAST(x) (x) > > -#define EDMA_TCD_DADDR_DADDR(x) (x) > > -#define EDMA_TCD_CITER_CITER(x) ((x) & 0x7FFF) > > -#define EDMA_TCD_DOFF_DOFF(x) (x) > > -#define EDMA_TCD_DLAST_SGA_DLAST_SGA(x) (x) > > -#define EDMA_TCD_BITER_BITER(x) ((x) & 0x7FFF) > > +#define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CEEI_CEEI(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CINT_CINT(x) ((x) & GENMASK(4, 0)) > > +#define EDMA_CERR_CERR(x) ((x) & GENMASK(4, 0)) > > + > > +#define EDMA_TCD_ATTR_DSIZE(x) (((x) & GENMASK(2, 0))) > > +#define EDMA_TCD_ATTR_DMOD(x) (((x) & GENMASK(4, 0)) << 3) > > +#define EDMA_TCD_ATTR_SSIZE(x) (((x) & GENMASK(2, 0)) << 8) > > +#define EDMA_TCD_ATTR_SMOD(x) (((x) & GENMASK(4, 0)) << 11) > > This looks like a change for its own commit. > Yes, was previously required the usage of BIT() and GENMASK(). > > + > > +#define EDMA_TCD_ATTR_DSIZE_8BIT 0 > > +#define EDMA_TCD_ATTR_DSIZE_16BIT BIT(0) > > +#define EDMA_TCD_ATTR_DSIZE_32BIT BIT(1) > > +#define EDMA_TCD_ATTR_DSIZE_64BIT (BIT(0) | BIT(1)) > > +#define EDMA_TCD_ATTR_DSIZE_32BYTE (BIT(3) | BIT(0)) > > +#define EDMA_TCD_ATTR_SSIZE_8BIT 0 > > +#define EDMA_TCD_ATTR_SSIZE_16BIT (EDMA_TCD_ATTR_DSIZE_16BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_32BIT (EDMA_TCD_ATTR_DSIZE_32BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_64BIT (EDMA_TCD_ATTR_DSIZE_64BIT << 8) > > +#define EDMA_TCD_ATTR_SSIZE_32BYTE (EDMA_TCD_ATTR_DSIZE_32BYTE << 8) > > + > > +#define EDMA_TCD_CITER_CITER(x) ((x) & GENMASK(14, 0)) > > +#define EDMA_TCD_BITER_BITER(x) ((x) & GENMASK(14, 0)) > > > > #define EDMA_TCD_CSR_START BIT(0) > > #define EDMA_TCD_CSR_INT_MAJOR BIT(1) > > @@ -87,7 +53,7 @@ > > > > #define EDMAMUX_CHCFG_DIS 0x0 > > #define EDMAMUX_CHCFG_ENBL 0x80 > > -#define EDMAMUX_CHCFG_SOURCE(n) ((n) & 0x3F) > > +#define EDMAMUX_CHCFG_SOURCE(n) ((n) & GENMASK(6, 0)) > > > > #define DMAMUX_NR 2 > > > > @@ -114,6 +80,31 @@ struct fsl_edma_hw_tcd { > > __le16 biter; > > }; > > > > +/* > > + * This are iomem pointers, for both v32 and v64. > > s/This/These/ > Ack. Will eventually fix all in a v9. Collecting feedbacks. > Tested-by: Krzysztof Kozlowski > > Best regards, > Krzysztof > -- > To unsubscribe from this list: send the line "unsubscribe linux-m68k" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Best Regards, Angelo