From: Tom St Denis Subject: [PATCH] drm/amdgpu: replace iova debugfs file with iomem (v2) Date: Fri, 9 Feb 2018 12:27:50 -0500 Message-ID: <20180209172750.15675-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: amd-gfx@lists.freedesktop.org Cc: Tom St Denis , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2tvZW5pZy5sZWljaHR6dW1lcmtlbkBnbWFpbC5jb20+ CgpUaGlzIGFsbG93cyBhY2Nlc3MgdG8gcGFnZXMgYWxsb2NhdGVkIHRocm91Z2ggdGhlIGRyaXZl ciB3aXRoIG9wdGlvbmFsCklPTU1VIG1hcHBpbmcuCgp2MjogRml4IG51bWJlciBvZiBieXRlcyBj b3BpZWQgYW5kIGFkZCB3cml0ZSBtZXRob2QKCk9yaWdpbmFsLWJ5OiBDaHJpc3RpYW4gS8O2bmln IDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbSBTdCBEZW5pcyA8 dG9tLnN0ZGVuaXNAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdHRtLmMgfCAxMTAgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA4OSBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKaW5kZXggYjM3MmQ4ZDY1MGE1Li5kNmM1NmIwMDFhMmMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKQEAgLTE5MjksMzggKzE5 MjksMTA2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVyYXRpb25zIGFtZGdwdV90dG1f Z3R0X2ZvcHMgPSB7CiAKICNlbmRpZgogCi1zdGF0aWMgc3NpemVfdCBhbWRncHVfaW92YV90b19w aHlzX3JlYWQoc3RydWN0IGZpbGUgKmYsIGNoYXIgX191c2VyICpidWYsCi0JCQkJICAgc2l6ZV90 IHNpemUsIGxvZmZfdCAqcG9zKQorc3RhdGljIHNzaXplX3QgYW1kZ3B1X2lvbWVtX3JlYWQoc3Ry dWN0IGZpbGUgKmYsIGNoYXIgX191c2VyICpidWYsCisJCQkJIHNpemVfdCBzaXplLCBsb2ZmX3Qg KnBvcykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGZpbGVfaW5vZGUoZiktPmlf cHJpdmF0ZTsKLQlpbnQgcjsKLQl1aW50NjRfdCBwaHlzOwogCXN0cnVjdCBpb21tdV9kb21haW4g KmRvbTsKKwlzc2l6ZV90IHJlc3VsdCA9IDA7CisJaW50IHI7CiAKLQkvLyBhbHdheXMgcmV0dXJu IDggYnl0ZXMKLQlpZiAoc2l6ZSAhPSA4KQotCQlyZXR1cm4gLUVJTlZBTDsKKwlkb20gPSBpb21t dV9nZXRfZG9tYWluX2Zvcl9kZXYoYWRldi0+ZGV2KTsKIAotCS8vIG9ubHkgYWNjZXB0IHBhZ2Ug YWRkcmVzc2VzCi0JaWYgKCpwb3MgJiAweEZGRikKLQkJcmV0dXJuIC1FSU5WQUw7CisJd2hpbGUg KHNpemUpIHsKKwkJcGh5c19hZGRyX3QgYWRkciA9ICpwb3MgJiBQQUdFX01BU0s7CisJCWxvZmZf dCBvZmYgPSAqcG9zICYgflBBR0VfTUFTSzsKKwkJc2l6ZV90IGJ5dGVzID0gUEFHRV9TSVpFIC0g b2ZmOworCQl1bnNpZ25lZCBsb25nIHBmbjsKKwkJc3RydWN0IHBhZ2UgKnA7CisJCXZvaWQgKnB0 cjsKKworCQlieXRlcyA9IGJ5dGVzIDwgc2l6ZSA/IGJ5dGVzIDogc2l6ZTsKKworCQlhZGRyID0g ZG9tID8gaW9tbXVfaW92YV90b19waHlzKGRvbSwgYWRkcikgOiBhZGRyOworCisJCXBmbiA9IGFk ZHIgPj4gUEFHRV9TSElGVDsKKwkJaWYgKCFwZm5fdmFsaWQocGZuKSkKKwkJCXJldHVybiAtRVBF Uk07CisKKwkJcCA9IHBmbl90b19wYWdlKHBmbik7CisJCWlmIChwLT5tYXBwaW5nICE9IGFkZXYt Pm1tYW4uYmRldi5kZXZfbWFwcGluZykKKwkJCXJldHVybiAtRVBFUk07CisKKwkJcHRyID0ga21h cChwKTsKKwkJaWYgKHB0cikgeworCQkJciA9IGNvcHlfdG9fdXNlcihidWYsIHB0ciwgYnl0ZXMp OworCQkJa3VubWFwKHApOworCQkJaWYgKHIpCisJCQkJcmV0dXJuIC1FRkFVTFQ7CisJCX0gZWxz ZSB7CisJCQlyZXR1cm4gLUVGQVVMVDsKKwkJfQorCisJCXNpemUgLT0gYnl0ZXM7CisJCSpwb3Mg Kz0gYnl0ZXM7CisJCXJlc3VsdCArPSBieXRlczsKKwl9CisKKwlyZXR1cm4gcmVzdWx0OworfQor CitzdGF0aWMgc3NpemVfdCBhbWRncHVfaW9tZW1fd3JpdGUoc3RydWN0IGZpbGUgKmYsIGNvbnN0 IGNoYXIgX191c2VyICpidWYsCisJCQkJIHNpemVfdCBzaXplLCBsb2ZmX3QgKnBvcykKK3sKKwlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGZpbGVfaW5vZGUoZiktPmlfcHJpdmF0ZTsKKwlz dHJ1Y3QgaW9tbXVfZG9tYWluICpkb207CisJc3NpemVfdCByZXN1bHQgPSAwOworCWludCByOwog CiAJZG9tID0gaW9tbXVfZ2V0X2RvbWFpbl9mb3JfZGV2KGFkZXYtPmRldik7Ci0JaWYgKGRvbSkK LQkJcGh5cyA9IGlvbW11X2lvdmFfdG9fcGh5cyhkb20sICpwb3MpOwotCWVsc2UKLQkJcGh5cyA9 ICpwb3M7CiAKLQlyID0gY29weV90b191c2VyKGJ1ZiwgJnBoeXMsIDgpOwotCWlmIChyKQotCQly ZXR1cm4gLUVGQVVMVDsKKwl3aGlsZSAoc2l6ZSkgeworCQlwaHlzX2FkZHJfdCBhZGRyID0gKnBv cyAmIFBBR0VfTUFTSzsKKwkJbG9mZl90IG9mZiA9ICpwb3MgJiB+UEFHRV9NQVNLOworCQlzaXpl X3QgYnl0ZXMgPSBQQUdFX1NJWkUgLSBvZmY7CisJCXVuc2lnbmVkIGxvbmcgcGZuOworCQlzdHJ1 Y3QgcGFnZSAqcDsKKwkJdm9pZCAqcHRyOworCisJCWJ5dGVzID0gYnl0ZXMgPCBzaXplID8gYnl0 ZXMgOiBzaXplOworCisJCWFkZHIgPSBkb20gPyBpb21tdV9pb3ZhX3RvX3BoeXMoZG9tLCBhZGRy KSA6IGFkZHI7CiAKLQlyZXR1cm4gODsKKwkJcGZuID0gYWRkciA+PiBQQUdFX1NISUZUOworCQlp ZiAoIXBmbl92YWxpZChwZm4pKQorCQkJcmV0dXJuIC1FUEVSTTsKKworCQlwID0gcGZuX3RvX3Bh Z2UocGZuKTsKKwkJaWYgKHAtPm1hcHBpbmcgIT0gYWRldi0+bW1hbi5iZGV2LmRldl9tYXBwaW5n KQorCQkJcmV0dXJuIC1FUEVSTTsKKworCQlwdHIgPSBrbWFwKHApOworCQlpZiAocHRyKSB7CisJ CQlyID0gY29weV9mcm9tX3VzZXIocHRyLCBidWYsIGJ5dGVzKTsKKwkJCWt1bm1hcChwKTsKKwkJ CWlmIChyKQorCQkJCXJldHVybiAtRUZBVUxUOworCQl9IGVsc2UgeworCQkJcmV0dXJuIC1FRkFV TFQ7CisJCX0KKworCQlzaXplIC09IGJ5dGVzOworCQkqcG9zICs9IGJ5dGVzOworCQlyZXN1bHQg Kz0gYnl0ZXM7CisJfQorCisJcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVj dCBmaWxlX29wZXJhdGlvbnMgYW1kZ3B1X3R0bV9pb3ZhX2ZvcHMgPSB7CitzdGF0aWMgY29uc3Qg c3RydWN0IGZpbGVfb3BlcmF0aW9ucyBhbWRncHVfdHRtX2lvbWVtX2ZvcHMgPSB7CiAJLm93bmVy ID0gVEhJU19NT0RVTEUsCi0JLnJlYWQgPSBhbWRncHVfaW92YV90b19waHlzX3JlYWQsCisJLnJl YWQgPSBhbWRncHVfaW9tZW1fcmVhZCwKKwkud3JpdGUgPSBhbWRncHVfaW9tZW1fd3JpdGUsCiAJ Lmxsc2VlayA9IGRlZmF1bHRfbGxzZWVrCiB9OwogCkBAIC0xOTczLDcgKzIwNDEsNyBAQCBzdGF0 aWMgY29uc3Qgc3RydWN0IHsKICNpZmRlZiBDT05GSUdfRFJNX0FNREdQVV9HQVJUX0RFQlVHRlMK IAl7ICJhbWRncHVfZ3R0IiwgJmFtZGdwdV90dG1fZ3R0X2ZvcHMsIFRUTV9QTF9UVCB9LAogI2Vu ZGlmCi0JeyAiYW1kZ3B1X2lvdmEiLCAmYW1kZ3B1X3R0bV9pb3ZhX2ZvcHMsIFRUTV9QTF9TWVNU RU0gfSwKKwl7ICJhbWRncHVfaW9tZW0iLCAmYW1kZ3B1X3R0bV9pb21lbV9mb3BzLCBUVE1fUExf U1lTVEVNIH0sCiB9OwogCiAjZW5kaWYKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==