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: [v2,1/2] dma-mapping: move dma configuration to bus infrastructure From: Greg Kroah-Hartman Message-Id: <20180321092954.GS14085@kroah.com> Date: Wed, 21 Mar 2018 10:29:54 +0100 To: Nipun Gupta Cc: robin.murphy@arm.com, hch@lst.de, linux@armlinux.org.uk, m.szyprowski@samsung.com, bhelgaas@google.com, zajec5@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, dan.j.williams@intel.com, vinod.koul@intel.com, thierry.reding@gmail.com, robh+dt@kernel.org, frowand.list@gmail.com, jarkko.sakkinen@linux.intel.com, rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com, johan@kernel.org, msuchanek@suse.de, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, bharat.bhushan@nxp.com, leoyang.li@nxp.com List-ID: T24gV2VkLCBNYXIgMjEsIDIwMTggYXQgMTI6MjU6MjJQTSArMDUzMCwgTmlwdW4gR3VwdGEgd3Jv dGU6Cj4gSXQncyBidXMgc3BlY2lmaWMgYXNwZWN0IHRvIG1hcCBhIGdpdmVuIGRldmljZSBvbiB0 aGUgYnVzIGFuZAo+IHJlbGV2YW50IGZpcm13YXJlIGRlc2NyaXB0aW9uIG9mIGl0cyBETUEgY29u ZmlndXJhdGlvbi4KPiBTbywgdGhpcyBjaGFuZ2UgaW50cm9kdWNlcyAnL2RtYV9jb25maWd1cmUv JyBhcyBidXMgY2FsbGJhY2sKPiBnaXZpbmcgZmxleGliaWxpdHkgdG8gYnVzc2VzIGZvciBpbXBs ZW1lbnRpbmcgaXRzIG93biBkbWEKPiBjb25maWd1cmF0aW9uIGZ1bmN0aW9uLgo+IAo+IFRoZSBj aGFuZ2UgZWFzZXMgdGhlIGFkZGl0aW9uIG9mIG5ldyBidXNzZXMgdy5yLnQuIGFkZGluZyB0aGUg ZG1hCj4gY29uZmlndXJhdGlvbiBmdW5jdGlvbmFsaXR5Lgo+IAo+IFRoaXMgcGF0Y2ggYWxzbyB1 cGRhdGVzIHRoZSBQQ0ksIFBsYXRmb3JtLCBBQ1BJIGFuZCBob3N0MXggYnVzIHRvCj4gdXNlIG5l dyBpbnRyb2R1Y2VkIGNhbGxiYWNrcy4KPiAKPiBTdWdnZXN0ZWQtYnk6IENocmlzdG9waCBIZWxs d2lnIDxoY2hAbHN0LmRlPgo+IFNpZ25lZC1vZmYtYnk6IE5pcHVuIEd1cHRhIDxuaXB1bi5ndXB0 YUBueHAuY29tPgo+IC0tLQo+ICAtIFRoZSBwYXRjaGVzIGFyZSBiYXNlZCBvbiB0aGUgY29tbWVu dHMgb246Cj4gICAgaHR0cHM6Ly9wYXRjaHdvcmsua2VybmVsLm9yZy9wYXRjaC8xMDI1OTA4Ny8K PiAKPiBDaGFuZ2VzIGluIHYyOgo+ICAgLSBEbyBub3QgaGF2ZSBkbWFfZGVjb25maWd1cmUgY2Fs bGJhY2sKPiAgIC0gSGF2ZSAnL2RtYV9jb21tb25fY29uZmlndXJlLycgQVBJIHRvIHByb3ZpZGUg YSBjb21tb24gRE1BCj4gICAgIGNvbmZpZ3VyYXRpb24gd2hpY2ggY2FuIGJlIHVzZWQgYnkgYnVz c2VzIGlmIGl0IHN1aXRzIHRoZW0uCj4gICAtIFBsYXRmb3JtIGFuZCBBQ1BJIGJ1cyB0byB1c2Ug Jy9kbWFfY29tbW9uX2NvbmZpZ3VyZS8nIGluCj4gICAgICcvZG1hX2NvbmZpZ3VyZS8nIGNhbGxi YWNrLgo+ICAgLSBVcGRhdGVkIGNvbW1pdCBtZXNzYWdlCj4gICAtIFVwZGF0ZWQgcGNpX2RtYV9j b25maWd1cmUgQVBJIHdpdGggY2hhbmdlcyBzdWdnZXN0ZWQgYnkgUm9iaW4KPiAKPiAgZHJpdmVy cy9hbWJhL2J1cy5jICAgICAgICAgIHwgIDcgKysrKysrKwo+ICBkcml2ZXJzL2Jhc2UvZG1hLW1h cHBpbmcuYyAgfCAzNSArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICBkcml2 ZXJzL2Jhc2UvcGxhdGZvcm0uYyAgICAgfCAgNiArKysrKysKPiAgZHJpdmVycy9ncHUvaG9zdDF4 L2J1cy5jICAgIHwgIDkgKysrKysrKysrCj4gIGRyaXZlcnMvcGNpL3BjaS1kcml2ZXIuYyAgICB8 IDMyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gIGluY2x1ZGUvbGludXgvZGV2 aWNlLmggICAgICB8ICA0ICsrKysKPiAgaW5jbHVkZS9saW51eC9kbWEtbWFwcGluZy5oIHwgIDEg Kwo+ICA3IGZpbGVzIGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQo+ IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2FtYmEvYnVzLmMgYi9kcml2ZXJzL2FtYmEvYnVzLmMK PiBpbmRleCA1OTRjMjI4Li4yZmExZThiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvYW1iYS9idXMu Ywo+ICsrKyBiL2RyaXZlcnMvYW1iYS9idXMuYwo+IEBAIC0yMCw2ICsyMCw3IEBACj4gICNpbmNs dWRlIDxsaW51eC9zaXplcy5oPgo+ICAjaW5jbHVkZSA8bGludXgvbGltaXRzLmg+Cj4gICNpbmNs dWRlIDxsaW51eC9jbGsvY2xrLWNvbmYuaD4KPiArI2luY2x1ZGUgPGxpbnV4L2RtYS1tYXBwaW5n Lmg+Cj4gIAo+ICAjaW5jbHVkZSA8YXNtL2lycS5oPgo+ICAKPiBAQCAtMTcxLDYgKzE3MiwxMSBA QCBzdGF0aWMgaW50IGFtYmFfcG1fcnVudGltZV9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQo+ ICB9Cj4gICNlbmRpZiAvKiBDT05GSUdfUE0gKi8KPiAgCj4gK3N0YXRpYyBpbnQgYW1iYV9kbWFf Y29uZmlndXJlKHN0cnVjdCBkZXZpY2UgKmRldikKPiArewo+ICsJcmV0dXJuIGRtYV9jb21tb25f Y29uZmlndXJlKGRldik7Cj4gK30KPiArCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29w cyBhbWJhX3BtID0gewo+ICAJLnN1c3BlbmQJPSBwbV9nZW5lcmljX3N1c3BlbmQsCj4gIAkucmVz dW1lCQk9IHBtX2dlbmVyaWNfcmVzdW1lLAo+IEBAIC0xOTQsNiArMjAwLDcgQEAgc3RydWN0IGJ1 c190eXBlIGFtYmFfYnVzdHlwZSA9IHsKPiAgCS5kZXZfZ3JvdXBzCT0gYW1iYV9kZXZfZ3JvdXBz LAo+ICAJLm1hdGNoCQk9IGFtYmFfbWF0Y2gsCj4gIAkudWV2ZW50CQk9IGFtYmFfdWV2ZW50LAo+ ICsJLmRtYV9jb25maWd1cmUJPSBhbWJhX2RtYV9jb25maWd1cmUsCj4gIAkucG0JCT0gJmFtYmFf cG0sCj4gIAkuZm9yY2VfZG1hCT0gdHJ1ZSwKPiAgfTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9i YXNlL2RtYS1tYXBwaW5nLmMgYi9kcml2ZXJzL2Jhc2UvZG1hLW1hcHBpbmcuYwo+IGluZGV4IDNi MTE4MzUuLjQ4ZjlhZjAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9iYXNlL2RtYS1tYXBwaW5nLmMK PiArKysgYi9kcml2ZXJzL2Jhc2UvZG1hLW1hcHBpbmcuYwo+IEBAIC0zMzEsMzggKzMzMSwzMyBA QCB2b2lkIGRtYV9jb21tb25fZnJlZV9yZW1hcCh2b2lkICpjcHVfYWRkciwgc2l6ZV90IHNpemUs IHVuc2lnbmVkIGxvbmcgdm1fZmxhZ3MpCj4gICNlbmRpZgo+ICAKPiAgLyoKPiAtICogQ29tbW9u IGNvbmZpZ3VyYXRpb24gdG8gZW5hYmxlIERNQSBBUEkgdXNlIGZvciBhIGRldmljZQo+ICsgKiBD b21tb24gY29uZmlndXJhdGlvbiB0byBlbmFibGUgRE1BIEFQSSB1c2UgZm9yIGEgZGV2aWNlLgo+ ICsgKiBBIGJ1cyBjYW4gdXNlIHRoaXMgZnVuY3Rpb24gaW4gaXRzICdkbWFfY29uZmlndXJlJyBj YWxsYmFjaywgaWYKPiArICogc3VpdGFibGUgZm9yIHRoZSBidXMuCj4gICAqLwo+IC0jaW5jbHVk ZSA8bGludXgvcGNpLmg+Cj4gLQo+IC1pbnQgZG1hX2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpk ZXYpCj4gK2ludCBkbWFfY29tbW9uX2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpkZXYpCj4gIHsK PiAtCXN0cnVjdCBkZXZpY2UgKmJyaWRnZSA9IE5VTEwsICpkbWFfZGV2ID0gZGV2Owo+ICAJZW51 bSBkZXZfZG1hX2F0dHIgYXR0cjsKPiAgCWludCByZXQgPSAwOwo+ICAKPiAtCWlmIChkZXZfaXNf cGNpKGRldikpIHsKPiAtCQlicmlkZ2UgPSBwY2lfZ2V0X2hvc3RfYnJpZGdlX2RldmljZSh0b19w Y2lfZGV2KGRldikpOwo+IC0JCWRtYV9kZXYgPSBicmlkZ2U7Cj4gLQkJaWYgKElTX0VOQUJMRUQo Q09ORklHX09GKSAmJiBkbWFfZGV2LT5wYXJlbnQgJiYKPiAtCQkgICAgZG1hX2Rldi0+cGFyZW50 LT5vZl9ub2RlKQo+IC0JCQlkbWFfZGV2ID0gZG1hX2Rldi0+cGFyZW50Owo+IC0JfQo+IC0KPiAt CWlmIChkbWFfZGV2LT5vZl9ub2RlKSB7Cj4gLQkJcmV0ID0gb2ZfZG1hX2NvbmZpZ3VyZShkZXYs IGRtYV9kZXYtPm9mX25vZGUpOwo+IC0JfSBlbHNlIGlmIChoYXNfYWNwaV9jb21wYW5pb24oZG1h X2RldikpIHsKPiAtCQlhdHRyID0gYWNwaV9nZXRfZG1hX2F0dHIodG9fYWNwaV9kZXZpY2Vfbm9k ZShkbWFfZGV2LT5md25vZGUpKTsKPiArCWlmIChkZXYtPm9mX25vZGUpIHsKPiArCQlyZXQgPSBv Zl9kbWFfY29uZmlndXJlKGRldiwgZGV2LT5vZl9ub2RlKTsKPiArCX0gZWxzZSBpZiAoaGFzX2Fj cGlfY29tcGFuaW9uKGRldikpIHsKPiArCQlhdHRyID0gYWNwaV9nZXRfZG1hX2F0dHIodG9fYWNw aV9kZXZpY2Vfbm9kZShkZXYtPmZ3bm9kZSkpOwo+ICAJCWlmIChhdHRyICE9IERFVl9ETUFfTk9U X1NVUFBPUlRFRCkKPiAgCQkJcmV0ID0gYWNwaV9kbWFfY29uZmlndXJlKGRldiwgYXR0cik7Cj4g IAl9Cj4gIAo+IC0JaWYgKGJyaWRnZSkKPiAtCQlwY2lfcHV0X2hvc3RfYnJpZGdlX2RldmljZShi cmlkZ2UpOwo+IC0KPiAgCXJldHVybiByZXQ7Cj4gIH0KPiAgCj4gK2ludCBkbWFfY29uZmlndXJl KHN0cnVjdCBkZXZpY2UgKmRldikKPiArewo+ICsJaWYgKGRldi0+YnVzLT5kbWFfY29uZmlndXJl KQo+ICsJCXJldHVybiBkZXYtPmJ1cy0+ZG1hX2NvbmZpZ3VyZShkZXYpOwo+ICsKPiArCXJldHVy biAwOwo+ICt9Cj4gIHZvaWQgZG1hX2RlY29uZmlndXJlKHN0cnVjdCBkZXZpY2UgKmRldikKCkVt cHR5IGxpbmUgYWZ0ZXIgdGhpcyBuZXcgZnVuY3Rpb24/ICBTb3JyeSwgY291bGRuJ3QgaGVscCBp dCA6KQoKPiAgewo+ICAJb2ZfZG1hX2RlY29uZmlndXJlKGRldik7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvYmFzZS9wbGF0Zm9ybS5jIGIvZHJpdmVycy9iYXNlL3BsYXRmb3JtLmMKPiBpbmRleCBm MWJmN2IzLi5kMmQ1ODkxIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvYmFzZS9wbGF0Zm9ybS5jCj4g KysrIGIvZHJpdmVycy9iYXNlL3BsYXRmb3JtLmMKPiBAQCAtMTEzMCw2ICsxMTMwLDExIEBAIGlu dCBwbGF0Zm9ybV9wbV9yZXN0b3JlKHN0cnVjdCBkZXZpY2UgKmRldikKPiAgCj4gICNlbmRpZiAv KiBDT05GSUdfSElCRVJOQVRFX0NBTExCQUNLUyAqLwo+ICAKPiArc3RhdGljIGludCBwbGF0Zm9y bV9kbWFfY29uZmlndXJlKHN0cnVjdCBkZXZpY2UgKmRldikKPiArewo+ICsJcmV0dXJuIGRtYV9j b21tb25fY29uZmlndXJlKGRldik7Cj4gK30KPiArCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2 X3BtX29wcyBwbGF0Zm9ybV9kZXZfcG1fb3BzID0gewo+ICAJLnJ1bnRpbWVfc3VzcGVuZCA9IHBt X2dlbmVyaWNfcnVudGltZV9zdXNwZW5kLAo+ICAJLnJ1bnRpbWVfcmVzdW1lID0gcG1fZ2VuZXJp Y19ydW50aW1lX3Jlc3VtZSwKPiBAQCAtMTE0MSw2ICsxMTQ2LDcgQEAgc3RydWN0IGJ1c190eXBl IHBsYXRmb3JtX2J1c190eXBlID0gewo+ICAJLmRldl9ncm91cHMJPSBwbGF0Zm9ybV9kZXZfZ3Jv dXBzLAo+ICAJLm1hdGNoCQk9IHBsYXRmb3JtX21hdGNoLAo+ICAJLnVldmVudAkJPSBwbGF0Zm9y bV91ZXZlbnQsCj4gKwkuZG1hX2NvbmZpZ3VyZQk9IHBsYXRmb3JtX2RtYV9jb25maWd1cmUsCj4g IAkucG0JCT0gJnBsYXRmb3JtX2Rldl9wbV9vcHMsCj4gIAkuZm9yY2VfZG1hCT0gdHJ1ZSwKPiAg fTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvaG9zdDF4L2J1cy5jIGIvZHJpdmVycy9ncHUv aG9zdDF4L2J1cy5jCj4gaW5kZXggODhhMzU1OC4uZmE5ODk2ZCAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9ob3N0MXgvYnVzLmMKPiArKysgYi9kcml2ZXJzL2dwdS9ob3N0MXgvYnVzLmMKPiBA QCAtMzE0LDYgKzMxNCwxNCBAQCBzdGF0aWMgaW50IGhvc3QxeF9kZXZpY2VfbWF0Y2goc3RydWN0 IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2RyaXZlciAqZHJ2KQo+ICAJcmV0dXJuIHN0cmNt cChkZXZfbmFtZShkZXYpLCBkcnYtPm5hbWUpID09IDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBpbnQg aG9zdDF4X2RtYV9jb25maWd1cmUoc3RydWN0IGRldmljZSAqZGV2KQo+ICt7Cj4gKwlpZiAoZGV2 LT5vZl9ub2RlKQo+ICsJCXJldHVybiBvZl9kbWFfY29uZmlndXJlKGRldiwgZGV2LT5vZl9ub2Rl KTsKPiArCj4gKwlyZXR1cm4gMDsKPiArfQo+ICsKPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZXZf cG1fb3BzIGhvc3QxeF9kZXZpY2VfcG1fb3BzID0gewo+ICAJLnN1c3BlbmQgPSBwbV9nZW5lcmlj X3N1c3BlbmQsCj4gIAkucmVzdW1lID0gcG1fZ2VuZXJpY19yZXN1bWUsCj4gQEAgLTMyNiw2ICsz MzQsNyBAQCBzdGF0aWMgaW50IGhvc3QxeF9kZXZpY2VfbWF0Y2goc3RydWN0IGRldmljZSAqZGV2 LCBzdHJ1Y3QgZGV2aWNlX2RyaXZlciAqZHJ2KQo+ICBzdHJ1Y3QgYnVzX3R5cGUgaG9zdDF4X2J1 c190eXBlID0gewo+ICAJLm5hbWUgPSAiaG9zdDF4IiwKPiAgCS5tYXRjaCA9IGhvc3QxeF9kZXZp Y2VfbWF0Y2gsCj4gKwkuZG1hX2NvbmZpZ3VyZQk9IGhvc3QxeF9kbWFfY29uZmlndXJlLAo+ICAJ LnBtID0gJmhvc3QxeF9kZXZpY2VfcG1fb3BzLAo+ICAJLmZvcmNlX2RtYSA9IHRydWUsCj4gIH07 Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL3BjaS1kcml2ZXIuYyBiL2RyaXZlcnMvcGNpL3Bj aS1kcml2ZXIuYwo+IGluZGV4IDNiZWQ2YmUuLmI0NzNhNGMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9wY2kvcGNpLWRyaXZlci5jCj4gKysrIGIvZHJpdmVycy9wY2kvcGNpLWRyaXZlci5jCj4gQEAg LTE4LDYgKzE4LDggQEAKPiAgI2luY2x1ZGUgPGxpbnV4L3BtX3J1bnRpbWUuaD4KPiAgI2luY2x1 ZGUgPGxpbnV4L3N1c3BlbmQuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L2tleGVjLmg+Cj4gKyNpbmNs dWRlIDxsaW51eC9vZl9kZXZpY2UuaD4KPiArI2luY2x1ZGUgPGxpbnV4L2FjcGkuaD4KPiAgI2lu Y2x1ZGUgInBjaS5oIgo+ICAKPiAgc3RydWN0IHBjaV9keW5pZCB7Cj4gQEAgLTE1MjIsNiArMTUy NCwzNSBAQCBzdGF0aWMgaW50IHBjaV9idXNfbnVtX3ZmKHN0cnVjdCBkZXZpY2UgKmRldikKPiAg CXJldHVybiBwY2lfbnVtX3ZmKHRvX3BjaV9kZXYoZGV2KSk7Cj4gIH0KPiAgCj4gKy8qKgo+ICsg KiBwY2lfZG1hX2NvbmZpZ3VyZSAtIFNldHVwIERNQSBjb25maWd1cmF0aW9uCj4gKyAqIEBkZXY6 IHB0ciB0byBkZXYgc3RydWN0dXJlCj4gKyAqCj4gKyAqIEZ1bmN0aW9uIHRvIHVwZGF0ZSBQQ0kg ZGV2aWNlcydzIERNQSBjb25maWd1cmF0aW9uIHVzaW5nIHRoZSBzYW1lCj4gKyAqIGluZm8gZnJv bSB0aGUgT0Ygbm9kZSBvciBBQ1BJIG5vZGUgb2YgaG9zdCBicmlkZ2UncyBwYXJlbnQgKGlmIGFu eSkuCj4gKyAqLwo+ICtzdGF0aWMgaW50IHBjaV9kbWFfY29uZmlndXJlKHN0cnVjdCBkZXZpY2Ug KmRldikKPiArewo+ICsJc3RydWN0IGRldmljZSAqYnJpZGdlOwo+ICsJZW51bSBkZXZfZG1hX2F0 dHIgYXR0cjsKPiArCWludCByZXQgPSAwOwo+ICsKPiArCWJyaWRnZSA9IHBjaV9nZXRfaG9zdF9i cmlkZ2VfZGV2aWNlKHRvX3BjaV9kZXYoZGV2KSk7Cj4gKwo+ICsJaWYgKElTX0VOQUJMRUQoQ09O RklHX09GKSAmJiBicmlkZ2UtPnBhcmVudCAmJgo+ICsJICAgIGJyaWRnZS0+cGFyZW50LT5vZl9u b2RlKSB7Cj4gKwkJcmV0ID0gb2ZfZG1hX2NvbmZpZ3VyZShkZXYsIGJyaWRnZS0+cGFyZW50LT5v Zl9ub2RlKTsKPiArCX0gZWxzZSBpZiAoaGFzX2FjcGlfY29tcGFuaW9uKGJyaWRnZSkpIHsKPiAr CQlhdHRyID0gYWNwaV9nZXRfZG1hX2F0dHIodG9fYWNwaV9kZXZpY2Vfbm9kZShicmlkZ2UtPmZ3 bm9kZSkpOwo+ICsJCWlmIChhdHRyICE9IERFVl9ETUFfTk9UX1NVUFBPUlRFRCkKPiArCQkJcmV0 ID0gYWNwaV9kbWFfY29uZmlndXJlKGRldiwgYXR0cik7Cj4gKwl9Cj4gKwo+ICsJcGNpX3B1dF9o b3N0X2JyaWRnZV9kZXZpY2UoYnJpZGdlKTsKPiArCj4gKwlyZXR1cm4gcmV0Owo+ICt9Cj4gKwo+ ICBzdHJ1Y3QgYnVzX3R5cGUgcGNpX2J1c190eXBlID0gewo+ICAJLm5hbWUJCT0gInBjaSIsCj4g IAkubWF0Y2gJCT0gcGNpX2J1c19tYXRjaCwKPiBAQCAtMTUzNCw2ICsxNTY1LDcgQEAgc3RydWN0 IGJ1c190eXBlIHBjaV9idXNfdHlwZSA9IHsKPiAgCS5kcnZfZ3JvdXBzCT0gcGNpX2Rydl9ncm91 cHMsCj4gIAkucG0JCT0gUENJX1BNX09QU19QVFIsCj4gIAkubnVtX3ZmCQk9IHBjaV9idXNfbnVt X3ZmLAo+ICsJLmRtYV9jb25maWd1cmUJPSBwY2lfZG1hX2NvbmZpZ3VyZSwKPiAgCS5mb3JjZV9k bWEJPSB0cnVlLAo+ICB9Owo+ICBFWFBPUlRfU1lNQk9MKHBjaV9idXNfdHlwZSk7Cj4gZGlmZiAt LWdpdCBhL2luY2x1ZGUvbGludXgvZGV2aWNlLmggYi9pbmNsdWRlL2xpbnV4L2RldmljZS5oCj4g aW5kZXggYjA5MzQwNS4uMTgzMmQ5MCAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2xpbnV4L2Rldmlj ZS5oCj4gKysrIGIvaW5jbHVkZS9saW51eC9kZXZpY2UuaAo+IEBAIC04OCw2ICs4OCw4IEBAIGV4 dGVybiBpbnQgX19tdXN0X2NoZWNrIGJ1c19jcmVhdGVfZmlsZShzdHJ1Y3QgYnVzX3R5cGUgKiwK PiAgICogQHJlc3VtZToJQ2FsbGVkIHRvIGJyaW5nIGEgZGV2aWNlIG9uIHRoaXMgYnVzIG91dCBv ZiBzbGVlcCBtb2RlLgo+ICAgKiBAbnVtX3ZmOglDYWxsZWQgdG8gZmluZCBvdXQgaG93IG1hbnkg dmlydHVhbCBmdW5jdGlvbnMgYSBkZXZpY2Ugb24gdGhpcwo+ICAgKgkJYnVzIHN1cHBvcnRzLgo+ ICsgKiBAZG1hX2NvbmZpZ3VyZToJQ2FsbGVkIHRvIHNldHVwIERNQSBjb25maWd1cmF0aW9uIG9u IGEgZGV2aWNlIG9uCj4gKwkJCXRoaXMgYnVzLgo+ICAgKiBAcG06CQlQb3dlciBtYW5hZ2VtZW50 IG9wZXJhdGlvbnMgb2YgdGhpcyBidXMsIGNhbGxiYWNrIHRoZSBzcGVjaWZpYwo+ICAgKgkJZGV2 aWNlIGRyaXZlcidzIHBtLW9wcy4KPiAgICogQGlvbW11X29wczogIElPTU1VIHNwZWNpZmljIG9w ZXJhdGlvbnMgZm9yIHRoaXMgYnVzLCB1c2VkIHRvIGF0dGFjaCBJT01NVQo+IEBAIC0xMzAsNiAr MTMyLDggQEAgc3RydWN0IGJ1c190eXBlIHsKPiAgCj4gIAlpbnQgKCpudW1fdmYpKHN0cnVjdCBk ZXZpY2UgKmRldik7Cj4gIAo+ICsJaW50ICgqZG1hX2NvbmZpZ3VyZSkoc3RydWN0IGRldmljZSAq ZGV2KTsKPiArCj4gIAljb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyAqcG07Cj4gIAo+ICAJY29uc3Qg c3RydWN0IGlvbW11X29wcyAqaW9tbXVfb3BzOwo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L2RtYS1tYXBwaW5nLmggYi9pbmNsdWRlL2xpbnV4L2RtYS1tYXBwaW5nLmgKPiBpbmRleCBlYjll YWI0Li5jMTU5ODZiIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvbGludXgvZG1hLW1hcHBpbmcuaAo+ ICsrKyBiL2luY2x1ZGUvbGludXgvZG1hLW1hcHBpbmcuaAo+IEBAIC03NjEsNiArNzYxLDcgQEAg dm9pZCAqZG1hX21hcmtfZGVjbGFyZWRfbWVtb3J5X29jY3VwaWVkKHN0cnVjdCBkZXZpY2UgKmRl diwKPiAgfQo+ICAjZW5kaWYgLyogQ09ORklHX0hBVkVfR0VORVJJQ19ETUFfQ09IRVJFTlQgKi8K PiAgCj4gK2ludCBkbWFfY29tbW9uX2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpkZXYpOwo+ICAj aWZkZWYgQ09ORklHX0hBU19ETUEKCkJsYW5rIGxpbmUgYWZ0ZXIgdGhlIG5ldyBmdW5jdGlvbiBk ZWNsYXJhdGlvbj8KCk90aGVyIHRoYW4gdGhvc2UgdmVyeSBtaW5vciB0aGluZ3MsIG5pY2Ugam9i LCB0aGlzIGxvb2tzIGdvb2Q6CgpSZXZpZXdlZC1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVn a2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0 OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBkbWFlbmdpbmUiIGluCnRoZSBib2R5IG9mIGEg bWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8g YXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39252 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbeCUJ35 (ORCPT ); Wed, 21 Mar 2018 05:29:57 -0400 Date: Wed, 21 Mar 2018 10:29:54 +0100 From: Greg KH To: Nipun Gupta Cc: robin.murphy@arm.com, hch@lst.de, linux@armlinux.org.uk, m.szyprowski@samsung.com, bhelgaas@google.com, zajec5@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, dan.j.williams@intel.com, vinod.koul@intel.com, thierry.reding@gmail.com, robh+dt@kernel.org, frowand.list@gmail.com, jarkko.sakkinen@linux.intel.com, rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com, johan@kernel.org, msuchanek@suse.de, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, bharat.bhushan@nxp.com, leoyang.li@nxp.com Subject: Re: [PATCH v2 1/2] dma-mapping: move dma configuration to bus infrastructure Message-ID: <20180321092954.GS14085@kroah.com> (sfid-20180321_103003_820855_427176CF) References: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, Mar 21, 2018 at 12:25:22PM +0530, Nipun Gupta wrote: > It's bus specific aspect to map a given device on the bus and > relevant firmware description of its DMA configuration. > So, this change introduces '/dma_configure/' as bus callback > giving flexibility to busses for implementing its own dma > configuration function. > > The change eases the addition of new busses w.r.t. adding the dma > configuration functionality. > > This patch also updates the PCI, Platform, ACPI and host1x bus to > use new introduced callbacks. > > Suggested-by: Christoph Hellwig > Signed-off-by: Nipun Gupta > --- > - The patches are based on the comments on: > https://patchwork.kernel.org/patch/10259087/ > > Changes in v2: > - Do not have dma_deconfigure callback > - Have '/dma_common_configure/' API to provide a common DMA > configuration which can be used by busses if it suits them. > - Platform and ACPI bus to use '/dma_common_configure/' in > '/dma_configure/' callback. > - Updated commit message > - Updated pci_dma_configure API with changes suggested by Robin > > drivers/amba/bus.c | 7 +++++++ > drivers/base/dma-mapping.c | 35 +++++++++++++++-------------------- > drivers/base/platform.c | 6 ++++++ > drivers/gpu/host1x/bus.c | 9 +++++++++ > drivers/pci/pci-driver.c | 32 ++++++++++++++++++++++++++++++++ > include/linux/device.h | 4 ++++ > include/linux/dma-mapping.h | 1 + > 7 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c > index 594c228..2fa1e8b 100644 > --- a/drivers/amba/bus.c > +++ b/drivers/amba/bus.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > #include > > @@ -171,6 +172,11 @@ static int amba_pm_runtime_resume(struct device *dev) > } > #endif /* CONFIG_PM */ > > +static int amba_dma_configure(struct device *dev) > +{ > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops amba_pm = { > .suspend = pm_generic_suspend, > .resume = pm_generic_resume, > @@ -194,6 +200,7 @@ struct bus_type amba_bustype = { > .dev_groups = amba_dev_groups, > .match = amba_match, > .uevent = amba_uevent, > + .dma_configure = amba_dma_configure, > .pm = &amba_pm, > .force_dma = true, > }; > diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c > index 3b11835..48f9af0 100644 > --- a/drivers/base/dma-mapping.c > +++ b/drivers/base/dma-mapping.c > @@ -331,38 +331,33 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) > #endif > > /* > - * Common configuration to enable DMA API use for a device > + * Common configuration to enable DMA API use for a device. > + * A bus can use this function in its 'dma_configure' callback, if > + * suitable for the bus. > */ > -#include > - > -int dma_configure(struct device *dev) > +int dma_common_configure(struct device *dev) > { > - struct device *bridge = NULL, *dma_dev = dev; > enum dev_dma_attr attr; > int ret = 0; > > - if (dev_is_pci(dev)) { > - bridge = pci_get_host_bridge_device(to_pci_dev(dev)); > - dma_dev = bridge; > - if (IS_ENABLED(CONFIG_OF) && dma_dev->parent && > - dma_dev->parent->of_node) > - dma_dev = dma_dev->parent; > - } > - > - if (dma_dev->of_node) { > - ret = of_dma_configure(dev, dma_dev->of_node); > - } else if (has_acpi_companion(dma_dev)) { > - attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode)); > + if (dev->of_node) { > + ret = of_dma_configure(dev, dev->of_node); > + } else if (has_acpi_companion(dev)) { > + attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); > if (attr != DEV_DMA_NOT_SUPPORTED) > ret = acpi_dma_configure(dev, attr); > } > > - if (bridge) > - pci_put_host_bridge_device(bridge); > - > return ret; > } > > +int dma_configure(struct device *dev) > +{ > + if (dev->bus->dma_configure) > + return dev->bus->dma_configure(dev); > + > + return 0; > +} > void dma_deconfigure(struct device *dev) Empty line after this new function? Sorry, couldn't help it :) > { > of_dma_deconfigure(dev); > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index f1bf7b3..d2d5891 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -1130,6 +1130,11 @@ int platform_pm_restore(struct device *dev) > > #endif /* CONFIG_HIBERNATE_CALLBACKS */ > > +static int platform_dma_configure(struct device *dev) > +{ > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops platform_dev_pm_ops = { > .runtime_suspend = pm_generic_runtime_suspend, > .runtime_resume = pm_generic_runtime_resume, > @@ -1141,6 +1146,7 @@ struct bus_type platform_bus_type = { > .dev_groups = platform_dev_groups, > .match = platform_match, > .uevent = platform_uevent, > + .dma_configure = platform_dma_configure, > .pm = &platform_dev_pm_ops, > .force_dma = true, > }; > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c > index 88a3558..fa9896d 100644 > --- a/drivers/gpu/host1x/bus.c > +++ b/drivers/gpu/host1x/bus.c > @@ -314,6 +314,14 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) > return strcmp(dev_name(dev), drv->name) == 0; > } > > +static int host1x_dma_configure(struct device *dev) > +{ > + if (dev->of_node) > + return of_dma_configure(dev, dev->of_node); > + > + return 0; > +} > + > static const struct dev_pm_ops host1x_device_pm_ops = { > .suspend = pm_generic_suspend, > .resume = pm_generic_resume, > @@ -326,6 +334,7 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) > struct bus_type host1x_bus_type = { > .name = "host1x", > .match = host1x_device_match, > + .dma_configure = host1x_dma_configure, > .pm = &host1x_device_pm_ops, > .force_dma = true, > }; > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 3bed6be..b473a4c 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -18,6 +18,8 @@ > #include > #include > #include > +#include > +#include > #include "pci.h" > > struct pci_dynid { > @@ -1522,6 +1524,35 @@ static int pci_bus_num_vf(struct device *dev) > return pci_num_vf(to_pci_dev(dev)); > } > > +/** > + * pci_dma_configure - Setup DMA configuration > + * @dev: ptr to dev structure > + * > + * Function to update PCI devices's DMA configuration using the same > + * info from the OF node or ACPI node of host bridge's parent (if any). > + */ > +static int pci_dma_configure(struct device *dev) > +{ > + struct device *bridge; > + enum dev_dma_attr attr; > + int ret = 0; > + > + bridge = pci_get_host_bridge_device(to_pci_dev(dev)); > + > + if (IS_ENABLED(CONFIG_OF) && bridge->parent && > + bridge->parent->of_node) { > + ret = of_dma_configure(dev, bridge->parent->of_node); > + } else if (has_acpi_companion(bridge)) { > + attr = acpi_get_dma_attr(to_acpi_device_node(bridge->fwnode)); > + if (attr != DEV_DMA_NOT_SUPPORTED) > + ret = acpi_dma_configure(dev, attr); > + } > + > + pci_put_host_bridge_device(bridge); > + > + return ret; > +} > + > struct bus_type pci_bus_type = { > .name = "pci", > .match = pci_bus_match, > @@ -1534,6 +1565,7 @@ struct bus_type pci_bus_type = { > .drv_groups = pci_drv_groups, > .pm = PCI_PM_OPS_PTR, > .num_vf = pci_bus_num_vf, > + .dma_configure = pci_dma_configure, > .force_dma = true, > }; > EXPORT_SYMBOL(pci_bus_type); > diff --git a/include/linux/device.h b/include/linux/device.h > index b093405..1832d90 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -88,6 +88,8 @@ extern int __must_check bus_create_file(struct bus_type *, > * @resume: Called to bring a device on this bus out of sleep mode. > * @num_vf: Called to find out how many virtual functions a device on this > * bus supports. > + * @dma_configure: Called to setup DMA configuration on a device on > + this bus. > * @pm: Power management operations of this bus, callback the specific > * device driver's pm-ops. > * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU > @@ -130,6 +132,8 @@ struct bus_type { > > int (*num_vf)(struct device *dev); > > + int (*dma_configure)(struct device *dev); > + > const struct dev_pm_ops *pm; > > const struct iommu_ops *iommu_ops; > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index eb9eab4..c15986b 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -761,6 +761,7 @@ void *dma_mark_declared_memory_occupied(struct device *dev, > } > #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ > > +int dma_common_configure(struct device *dev); > #ifdef CONFIG_HAS_DMA Blank line after the new function declaration? Other than those very minor things, nice job, this looks good: Reviewed-by: Greg Kroah-Hartman From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [PATCH v2 1/2] dma-mapping: move dma configuration to bus infrastructure Date: Wed, 21 Mar 2018 10:29:54 +0100 Message-ID: <20180321092954.GS14085@kroah.com> References: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1521615323-4752-1-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Nipun Gupta Cc: zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, david.brown-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, hch-jcswGhMUV9g@public.gmane.org, vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org, andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, msuchanek-l3A5Bk7waGM@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, leoyang.li-3arQi8VN3Tc@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org On Wed, Mar 21, 2018 at 12:25:22PM +0530, Nipun Gupta wrote: > It's bus specific aspect to map a given device on the bus and > relevant firmware description of its DMA configuration. > So, this change introduces '/dma_configure/' as bus callback > giving flexibility to busses for implementing its own dma > configuration function. > > The change eases the addition of new busses w.r.t. adding the dma > configuration functionality. > > This patch also updates the PCI, Platform, ACPI and host1x bus to > use new introduced callbacks. > > Suggested-by: Christoph Hellwig > Signed-off-by: Nipun Gupta > --- > - The patches are based on the comments on: > https://patchwork.kernel.org/patch/10259087/ > > Changes in v2: > - Do not have dma_deconfigure callback > - Have '/dma_common_configure/' API to provide a common DMA > configuration which can be used by busses if it suits them. > - Platform and ACPI bus to use '/dma_common_configure/' in > '/dma_configure/' callback. > - Updated commit message > - Updated pci_dma_configure API with changes suggested by Robin > > drivers/amba/bus.c | 7 +++++++ > drivers/base/dma-mapping.c | 35 +++++++++++++++-------------------- > drivers/base/platform.c | 6 ++++++ > drivers/gpu/host1x/bus.c | 9 +++++++++ > drivers/pci/pci-driver.c | 32 ++++++++++++++++++++++++++++++++ > include/linux/device.h | 4 ++++ > include/linux/dma-mapping.h | 1 + > 7 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c > index 594c228..2fa1e8b 100644 > --- a/drivers/amba/bus.c > +++ b/drivers/amba/bus.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > #include > > @@ -171,6 +172,11 @@ static int amba_pm_runtime_resume(struct device *dev) > } > #endif /* CONFIG_PM */ > > +static int amba_dma_configure(struct device *dev) > +{ > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops amba_pm = { > .suspend = pm_generic_suspend, > .resume = pm_generic_resume, > @@ -194,6 +200,7 @@ struct bus_type amba_bustype = { > .dev_groups = amba_dev_groups, > .match = amba_match, > .uevent = amba_uevent, > + .dma_configure = amba_dma_configure, > .pm = &amba_pm, > .force_dma = true, > }; > diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c > index 3b11835..48f9af0 100644 > --- a/drivers/base/dma-mapping.c > +++ b/drivers/base/dma-mapping.c > @@ -331,38 +331,33 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) > #endif > > /* > - * Common configuration to enable DMA API use for a device > + * Common configuration to enable DMA API use for a device. > + * A bus can use this function in its 'dma_configure' callback, if > + * suitable for the bus. > */ > -#include > - > -int dma_configure(struct device *dev) > +int dma_common_configure(struct device *dev) > { > - struct device *bridge = NULL, *dma_dev = dev; > enum dev_dma_attr attr; > int ret = 0; > > - if (dev_is_pci(dev)) { > - bridge = pci_get_host_bridge_device(to_pci_dev(dev)); > - dma_dev = bridge; > - if (IS_ENABLED(CONFIG_OF) && dma_dev->parent && > - dma_dev->parent->of_node) > - dma_dev = dma_dev->parent; > - } > - > - if (dma_dev->of_node) { > - ret = of_dma_configure(dev, dma_dev->of_node); > - } else if (has_acpi_companion(dma_dev)) { > - attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode)); > + if (dev->of_node) { > + ret = of_dma_configure(dev, dev->of_node); > + } else if (has_acpi_companion(dev)) { > + attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); > if (attr != DEV_DMA_NOT_SUPPORTED) > ret = acpi_dma_configure(dev, attr); > } > > - if (bridge) > - pci_put_host_bridge_device(bridge); > - > return ret; > } > > +int dma_configure(struct device *dev) > +{ > + if (dev->bus->dma_configure) > + return dev->bus->dma_configure(dev); > + > + return 0; > +} > void dma_deconfigure(struct device *dev) Empty line after this new function? Sorry, couldn't help it :) > { > of_dma_deconfigure(dev); > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index f1bf7b3..d2d5891 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -1130,6 +1130,11 @@ int platform_pm_restore(struct device *dev) > > #endif /* CONFIG_HIBERNATE_CALLBACKS */ > > +static int platform_dma_configure(struct device *dev) > +{ > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops platform_dev_pm_ops = { > .runtime_suspend = pm_generic_runtime_suspend, > .runtime_resume = pm_generic_runtime_resume, > @@ -1141,6 +1146,7 @@ struct bus_type platform_bus_type = { > .dev_groups = platform_dev_groups, > .match = platform_match, > .uevent = platform_uevent, > + .dma_configure = platform_dma_configure, > .pm = &platform_dev_pm_ops, > .force_dma = true, > }; > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c > index 88a3558..fa9896d 100644 > --- a/drivers/gpu/host1x/bus.c > +++ b/drivers/gpu/host1x/bus.c > @@ -314,6 +314,14 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) > return strcmp(dev_name(dev), drv->name) == 0; > } > > +static int host1x_dma_configure(struct device *dev) > +{ > + if (dev->of_node) > + return of_dma_configure(dev, dev->of_node); > + > + return 0; > +} > + > static const struct dev_pm_ops host1x_device_pm_ops = { > .suspend = pm_generic_suspend, > .resume = pm_generic_resume, > @@ -326,6 +334,7 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) > struct bus_type host1x_bus_type = { > .name = "host1x", > .match = host1x_device_match, > + .dma_configure = host1x_dma_configure, > .pm = &host1x_device_pm_ops, > .force_dma = true, > }; > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 3bed6be..b473a4c 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -18,6 +18,8 @@ > #include > #include > #include > +#include > +#include > #include "pci.h" > > struct pci_dynid { > @@ -1522,6 +1524,35 @@ static int pci_bus_num_vf(struct device *dev) > return pci_num_vf(to_pci_dev(dev)); > } > > +/** > + * pci_dma_configure - Setup DMA configuration > + * @dev: ptr to dev structure > + * > + * Function to update PCI devices's DMA configuration using the same > + * info from the OF node or ACPI node of host bridge's parent (if any). > + */ > +static int pci_dma_configure(struct device *dev) > +{ > + struct device *bridge; > + enum dev_dma_attr attr; > + int ret = 0; > + > + bridge = pci_get_host_bridge_device(to_pci_dev(dev)); > + > + if (IS_ENABLED(CONFIG_OF) && bridge->parent && > + bridge->parent->of_node) { > + ret = of_dma_configure(dev, bridge->parent->of_node); > + } else if (has_acpi_companion(bridge)) { > + attr = acpi_get_dma_attr(to_acpi_device_node(bridge->fwnode)); > + if (attr != DEV_DMA_NOT_SUPPORTED) > + ret = acpi_dma_configure(dev, attr); > + } > + > + pci_put_host_bridge_device(bridge); > + > + return ret; > +} > + > struct bus_type pci_bus_type = { > .name = "pci", > .match = pci_bus_match, > @@ -1534,6 +1565,7 @@ struct bus_type pci_bus_type = { > .drv_groups = pci_drv_groups, > .pm = PCI_PM_OPS_PTR, > .num_vf = pci_bus_num_vf, > + .dma_configure = pci_dma_configure, > .force_dma = true, > }; > EXPORT_SYMBOL(pci_bus_type); > diff --git a/include/linux/device.h b/include/linux/device.h > index b093405..1832d90 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -88,6 +88,8 @@ extern int __must_check bus_create_file(struct bus_type *, > * @resume: Called to bring a device on this bus out of sleep mode. > * @num_vf: Called to find out how many virtual functions a device on this > * bus supports. > + * @dma_configure: Called to setup DMA configuration on a device on > + this bus. > * @pm: Power management operations of this bus, callback the specific > * device driver's pm-ops. > * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU > @@ -130,6 +132,8 @@ struct bus_type { > > int (*num_vf)(struct device *dev); > > + int (*dma_configure)(struct device *dev); > + > const struct dev_pm_ops *pm; > > const struct iommu_ops *iommu_ops; > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index eb9eab4..c15986b 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -761,6 +761,7 @@ void *dma_mark_declared_memory_occupied(struct device *dev, > } > #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ > > +int dma_common_configure(struct device *dev); > #ifdef CONFIG_HAS_DMA Blank line after the new function declaration? Other than those very minor things, nice job, this looks good: Reviewed-by: Greg Kroah-Hartman