From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH] drm/amdgpu: throttle buffer migrations at CS using a fixed MBps limit (v2) Date: Wed, 24 Aug 2016 15:20:01 +0200 Message-ID: <1472044801-14530-1-git-send-email-maraeo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KClRoZSBvbGQgbWVjaGFu aXNtIHVzZWQgYSBwZXItc3VibWlzc2lvbiBsaW1pdCB0aGF0IGRpZG4ndCB0YWtlIHByZXZpb3Vz CnN1Ym1pc3Npb25zIHdpdGhpbiB0aGUgc2FtZSB0aW1lIGZyYW1lIGludG8gYWNjb3VudC4gSXQg YWxzbyBmaWxsZWQgVlJBTQpzbG93bHkgd2hlbiBWUkFNIHVzYWdlIGRyb3BwZWQgZHVlIHRvIGEg YmlnIGV2aWN0aW9uIG9yIGJ1ZmZlciBkZWFsbG9jYXRpb24uCgpUaGlzIG5ldyBtZXRob2QgZXN0 YWJsaXNoZXMgYSBjb25maWd1cmFibGUgTUJwcyBsaW1pdCB0aGF0IGlzIG9iZXllZCB3aGVuClZS QU0gdXNhZ2UgaXMgdmVyeSBoaWdoLiBXaGVuIFZSQU0gdXNhZ2UgaXMgbm90IHZlcnkgaGlnaCwg aXQgZ2l2ZXMKdGhlIGRyaXZlciB0aGUgZnJlZWRvbSB0byBmaWxsIGl0IHF1aWNrbHkuIFRoZSBy ZXN1bHQgaXMgbW9yZSBjb25zaXN0ZW50CnBlcmZvcm1hbmNlLgoKSXQgY2FuJ3Qga2VlcCB0aGUg Qk8gbW92ZSByYXRlIGxvdyBpZiBsb3RzIG9mIGV2aWN0aW9ucyBhcmUgaGFwcGVuaW5nIGR1ZQp0 byBWUkFNIGZyYWdtZW50YXRpb24sIG9yIGlmIGEgYmlnIGJ1ZmZlciBpcyBiZWluZyBtaWdyYXRl ZC4KClRoZSBhbWRncHUubW92ZXJhdGUgcGFyYW1ldGVyIGNhbiBiZSB1c2VkIHRvIHNldCBhIG5v bi1kZWZhdWx0IGxpbWl0LgpNZWFzdXJlbWVudHMgY2FuIGJlIGRvbmUgdG8gZmluZCBvdXQgd2hp Y2ggYW1kZ3B1Lm1vdmVyYXRlIHNldHRpbmcgZ2l2ZXMKdGhlIGJlc3QgcmVzdWx0cy4KCk1haW5s eSBBUFVzIGFuZCBjYXJkcyB3aXRoIHNtYWxsIFZSQU0gd2lsbCBiZW5lZml0IGZyb20gdGhpcy4g Rm9yIEYxIDIwMTUsCmFueXRoaW5nIHdpdGggMiBHQiBWUkFNIG9yIGxlc3Mgd2lsbCBiZW5lZml0 LgoKU29tZSBiZW5jaG1hcmsgcmVzdWx0cyAtIEYxIDIwMTUgKFRvbmdhIDJHQik6CgpMaW1pdCAg ICAgIE1pbkZQUyBBdmdGUFMKT2xkIGNvZGU6ICAxNCAgICAgMzIuNgoxMjggTUIvczogIDI4ICAg ICA0MQo2NCBNQi9zOiAgIDE1LjUgICA0MwozMiBNQi9zOiAgIDI4LjcgICA0My40CjggTUIvczog ICAgMjcuOCAgIDQ0LjQKOCBNQi9zOiAgICAyMS45ICAgNDIuOCAoZGlmZmVyZW50IHJ1bikKClJh bmRvbSBkcm9wcyBpbiBNaW4gRlBTIGNhbiBzdGlsbCBvY2N1ciAoZHVlIHRvIGZyYWdtZW50ZWQg VlJBTT8pLCBidXQKdGhlIGF2ZXJhZ2UgRlBTIGlzIG11Y2ggYmV0dGVyLiA4IE1CL3MgaXMgcHJv YmFibHkgYSBnb29kIGxpbWl0IGZvciB0aGlzCmdhbWUgJiB0aGUgY3VycmVudCBWUkFNIG1hbmFn ZW1lbnQuIFRoZSByYW5kb20gRlBTIGRyb3BzIGFyZSBzdGlsbCB0byBiZQp0YWNrbGVkLgoKdjI6 IHVzZSBhIHNwaW5sb2NrCgpTaWduZWQtb2ZmLWJ5OiBNYXJlayBPbMWhw6FrIDxtYXJlay5vbHNh a0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAg ICB8ICAgOSArKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMgICAgIHwg MTUyICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZGV2aWNlLmMgfCAgMTAgKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kcnYuYyAgICB8ICAgNCArCiA0IGZpbGVzIGNoYW5nZWQsIDEyNyBpbnNlcnRpb25z KCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4 IDkxNmRhODAuLjU3NTNmMGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC01 OCwyMCArNTgsMjEgQEAKICNpbmNsdWRlICJhbWRfcG93ZXJwbGF5LmgiCiAKICNpbmNsdWRlICJn cHVfc2NoZWR1bGVyLmgiCiAKIC8qCiAgKiBNb2R1bGVzIHBhcmFtZXRlcnMuCiAgKi8KIGV4dGVy biBpbnQgYW1kZ3B1X21vZGVzZXQ7CiBleHRlcm4gaW50IGFtZGdwdV92cmFtX2xpbWl0OwogZXh0 ZXJuIGludCBhbWRncHVfZ2FydF9zaXplOworZXh0ZXJuIGludCBhbWRncHVfbW92ZXJhdGU7CiBl eHRlcm4gaW50IGFtZGdwdV9iZW5jaG1hcmtpbmc7CiBleHRlcm4gaW50IGFtZGdwdV90ZXN0aW5n OwogZXh0ZXJuIGludCBhbWRncHVfYXVkaW87CiBleHRlcm4gaW50IGFtZGdwdV9kaXNwX3ByaW9y aXR5OwogZXh0ZXJuIGludCBhbWRncHVfaHdfaTJjOwogZXh0ZXJuIGludCBhbWRncHVfcGNpZV9n ZW4yOwogZXh0ZXJuIGludCBhbWRncHVfbXNpOwogZXh0ZXJuIGludCBhbWRncHVfbG9ja3VwX3Rp bWVvdXQ7CiBleHRlcm4gaW50IGFtZGdwdV9kcG07CiBleHRlcm4gaW50IGFtZGdwdV9zbWNfbG9h ZF9mdzsKQEAgLTIwMjksMjAgKzIwMzAsMjggQEAgc3RydWN0IGFtZGdwdV9kZXZpY2UgewogCXN0 cnVjdCBhbWRncHVfbW1hbgkJbW1hbjsKIAlzdHJ1Y3QgYW1kZ3B1X3ZyYW1fc2NyYXRjaAl2cmFt X3NjcmF0Y2g7CiAJc3RydWN0IGFtZGdwdV93YgkJd2I7CiAJYXRvbWljNjRfdAkJCXZyYW1fdXNh Z2U7CiAJYXRvbWljNjRfdAkJCXZyYW1fdmlzX3VzYWdlOwogCWF0b21pYzY0X3QJCQlndHRfdXNh Z2U7CiAJYXRvbWljNjRfdAkJCW51bV9ieXRlc19tb3ZlZDsKIAlhdG9taWM2NF90CQkJbnVtX2V2 aWN0aW9uczsKIAlhdG9taWNfdAkJCWdwdV9yZXNldF9jb3VudGVyOwogCisJLyogZGF0YSBmb3Ig YnVmZmVyIG1pZ3JhdGlvbiB0aHJvdHRsaW5nICovCisJc3RydWN0IHsKKwkJc3BpbmxvY2tfdAkJ bG9jazsKKwkJczY0CQkJbGFzdF91cGRhdGVfdXM7CisJCXM2NAkJCWFjY3VtX3VzOyAvKiBhY2N1 bXVsYXRlZCBtaWNyb3NlY29uZHMgKi8KKwkJdTMyCQkJbG9nMl9tYXhfTUJwczsKKwl9IG1tX3N0 YXRzOworCiAJLyogZGlzcGxheSAqLwogCWJvb2wJCQkJZW5hYmxlX3ZpcnR1YWxfZGlzcGxheTsK IAlzdHJ1Y3QgYW1kZ3B1X21vZGVfaW5mbwkJbW9kZV9pbmZvOwogCS8qIEZvciBwcmUtRENFMTEu IERDRTExIGFuZCBsYXRlciBhcmUgaW4gInN0cnVjdCBhbWRncHVfZGV2aWNlLT5kbSIgKi8KIAlz dHJ1Y3Qgd29ya19zdHJ1Y3QJCWhvdHBsdWdfd29yazsKIAlzdHJ1Y3QgYW1kZ3B1X2lycV9zcmMJ CWNydGNfaXJxOwogCXN0cnVjdCBhbWRncHVfaXJxX3NyYwkJcGFnZWZsaXBfaXJxOwogCXN0cnVj dCBhbWRncHVfaXJxX3NyYwkJaHBkX2lycTsKIAogCS8qIHJpbmdzICovCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IGQ1ZDYxYTcuLmIwZTExY2EgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC0yMjksOTEgKzIyOSwxNDUgQEAgZnJlZV9w YXJ0aWFsX2tkYXRhOgogCQlkcm1fZnJlZV9sYXJnZShwLT5jaHVua3NbaV0ua2RhdGEpOwogCWtm cmVlKHAtPmNodW5rcyk7CiBwdXRfY3R4OgogCWFtZGdwdV9jdHhfcHV0KHAtPmN0eCk7CiBmcmVl X2NodW5rOgogCWtmcmVlKGNodW5rX2FycmF5KTsKIAogCXJldHVybiByZXQ7CiB9CiAKLS8qIFJl dHVybnMgaG93IG1hbnkgYnl0ZXMgVFRNIGNhbiBtb3ZlIHBlciBJQi4KKy8qIENvbnZlcnQgbWlj cm9zZWNvbmRzIHRvIGJ5dGVzLiAqLworc3RhdGljIHU2NCB1c190b19ieXRlcyhzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwgczY0IHVzKQoreworCWlmICh1cyA8PSAwIHx8ICFhZGV2LT5tbV9z dGF0cy5sb2cyX21heF9NQnBzKQorCQlyZXR1cm4gMDsKKworCS8qIFNpbmNlIGFjY3VtX3VzIGlz IGluY3JlbWVudGVkIGJ5IGEgbWlsbGlvbiBwZXIgc2Vjb25kLCBqdXN0CisJICogbXVsdGlwbHkg aXQgYnkgdGhlIG51bWJlciBvZiBNQi9zIHRvIGdldCB0aGUgbnVtYmVyIG9mIGJ5dGVzLgorCSAq LworCXJldHVybiB1cyA8PCBhZGV2LT5tbV9zdGF0cy5sb2cyX21heF9NQnBzOworfQorCitzdGF0 aWMgczY0IGJ5dGVzX3RvX3VzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1NjQgYnl0ZXMp Cit7CisJaWYgKCFhZGV2LT5tbV9zdGF0cy5sb2cyX21heF9NQnBzKQorCQlyZXR1cm4gMDsKKwor CXJldHVybiBieXRlcyA+PiBhZGV2LT5tbV9zdGF0cy5sb2cyX21heF9NQnBzOworfQorCisvKiBS ZXR1cm5zIGhvdyBtYW55IGJ5dGVzIFRUTSBjYW4gbW92ZSByaWdodCBub3cuIElmIG5vIGJ5dGVz IGNhbiBiZSBtb3ZlZCwKKyAqIGl0IHJldHVybnMgMC4gSWYgaXQgcmV0dXJucyBub24temVybywg aXQncyBPSyB0byBtb3ZlIGF0IGxlYXN0IG9uZSBidWZmZXIsCisgKiB3aGljaCBtZWFucyBpdCBj YW4gZ28gb3ZlciB0aGUgdGhyZXNob2xkIG9uY2UuIElmIHRoYXQgaGFwcGVucywgdGhlIGRyaXZl cgorICogd2lsbCBiZSBpbiBkZWJ0IGFuZCBubyBvdGhlciBidWZmZXIgbWlncmF0aW9ucyBjYW4g YmUgZG9uZSB1bnRpbCB0aGF0IGRlYnQKKyAqIGlzIHJlcGFpZC4KKyAqCisgKiBUaGlzIGFwcHJv YWNoIGFsbG93cyBtb3ZpbmcgYSBidWZmZXIgb2YgYW55IHNpemUgKGl0J3MgaW1wb3J0YW50IHRv IGFsbG93CisgKiB0aGF0KS4KKyAqCisgKiBUaGUgY3VycmVuY3kgaXMgc2ltcGx5IHRpbWUgaW4g bWljcm9zZWNvbmRzIGFuZCBpdCBpbmNyZWFzZXMgYXMgdGhlIGNsb2NrCisgKiB0aWNrcy4gVGhl IGFjY3VtdWxhdGVkIG1pY3Jvc2Vjb25kcyAodXMpIGFyZSBjb252ZXJ0ZWQgdG8gYnl0ZXMgYW5k CisgKiByZXR1cm5lZC4KICAqLwogc3RhdGljIHU2NCBhbWRncHVfY3NfZ2V0X3RocmVzaG9sZF9m b3JfbW92ZXMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0JdTY0IHJlYWxfdnJhbV9z aXplID0gYWRldi0+bWMucmVhbF92cmFtX3NpemU7Ci0JdTY0IHZyYW1fdXNhZ2UgPSBhdG9taWM2 NF9yZWFkKCZhZGV2LT52cmFtX3VzYWdlKTsKKwlzNjQgdGltZV91cywgaW5jcmVtZW50X3VzOwor CXU2NCBtYXhfYnl0ZXM7CisJdTY0IGZyZWVfdnJhbSwgdG90YWxfdnJhbSwgdXNlZF92cmFtOwog Ci0JLyogVGhpcyBmdW5jdGlvbiBpcyBiYXNlZCBvbiB0aGUgY3VycmVudCBWUkFNIHVzYWdlLgor CS8qIEFsbG93IGEgbWF4aW11bSBvZiAyMDAgYWNjdW11bGF0ZWQgbXMuIFRoaXMgaXMgYmFzaWNh bGx5IHBlci1JQgorCSAqIHRocm90dGxpbmcuCiAJICoKLQkgKiAtIElmIGFsbCBvZiBWUkFNIGlz IGZyZWUsIGFsbG93IHJlbG9jYXRpbmcgdGhlIG51bWJlciBvZiBieXRlcyB0aGF0Ci0JICogICBp cyBlcXVhbCB0byAxLzQgb2YgdGhlIHNpemUgb2YgVlJBTSBmb3IgdGhpcyBJQi4KKwkgKiBJdCBt ZWFucyB0aGF0IGluIG9yZGVyIHRvIGdldCBmdWxsIG1heCBNQnBzLCBhdCBsZWFzdCA1IElCcyBw ZXIKKwkgKiBzZWNvbmQgbXVzdCBiZSBzdWJtaXR0ZWQgYW5kIG5vdCBtb3JlIHRoYW4gMjAwbXMg YXBhcnQgZnJvbSBlYWNoCisJICogb3RoZXIuCisJICovCisJY29uc3QgczY0IHVzX3VwcGVyX2Jv dW5kID0gMjAwMDAwOwogCi0JICogLSBJZiBtb3JlIHRoYW4gb25lIGhhbGYgb2YgVlJBTSBpcyBv Y2N1cGllZCwgb25seSBhbGxvdyByZWxvY2F0aW5nCi0JICogICAxIE1CIG9mIGRhdGEgZm9yIHRo aXMgSUIuCi0JICoKLQkgKiAtIEZyb20gMCB0byBvbmUgaGFsZiBvZiB1c2VkIFZSQU0sIHRoZSB0 aHJlc2hvbGQgZGVjcmVhc2VzCi0JICogICBsaW5lYXJseS4KLQkgKiAgICAgICAgIF9fX19fX19f X19fX19fX19fXwotCSAqIDEvNCBvZiAtfFwgICAgICAgICAgICAgICB8Ci0JICogVlJBTSAgICB8 IFwgICAgICAgICAgICAgIHwKLQkgKiAgICAgICAgIHwgIFwgICAgICAgICAgICAgfAotCSAqICAg ICAgICAgfCAgIFwgICAgICAgICAgICB8Ci0JICogICAgICAgICB8ICAgIFwgICAgICAgICAgIHwK LQkgKiAgICAgICAgIHwgICAgIFwgICAgICAgICAgfAotCSAqICAgICAgICAgfCAgICAgIFwgICAg ICAgICB8Ci0JICogICAgICAgICB8ICAgICAgIFxfX19fX19fX3wxIE1CCi0JICogICAgICAgICB8 LS0tLS0tLS0tLS0tLS0tLXwKLQkgKiAgICBWUkFNIDAgJSAgICAgICAgICAgICAxMDAgJQotCSAq ICAgICAgICAgdXNlZCAgICAgICAgICAgIHVzZWQKLQkgKgotCSAqIE5vdGU6IEl0J3MgYSB0aHJl c2hvbGQsIG5vdCBhIGxpbWl0LiBUaGUgdGhyZXNob2xkIG11c3QgYmUgY3Jvc3NlZAotCSAqIGZv ciBidWZmZXIgcmVsb2NhdGlvbnMgdG8gc3RvcCwgc28gYW55IGJ1ZmZlciBvZiBhbiBhcmJpdHJh cnkgc2l6ZQotCSAqIGNhbiBiZSBtb3ZlZCBhcyBsb25nIGFzIHRoZSB0aHJlc2hvbGQgaXNuJ3Qg Y3Jvc3NlZCBiZWZvcmUKLQkgKiB0aGUgcmVsb2NhdGlvbiB0YWtlcyBwbGFjZS4gV2UgZG9uJ3Qg d2FudCB0byBkaXNhYmxlIGJ1ZmZlcgotCSAqIHJlbG9jYXRpb25zIGNvbXBsZXRlbHkuCisJaWYg KCFhZGV2LT5tbV9zdGF0cy5sb2cyX21heF9NQnBzKQorCQlyZXR1cm4gMDsKKworCXRvdGFsX3Zy YW0gPSBhZGV2LT5tYy5yZWFsX3ZyYW1fc2l6ZSAtIGFkZXYtPnZyYW1fcGluX3NpemU7CisJdXNl ZF92cmFtID0gYXRvbWljNjRfcmVhZCgmYWRldi0+dnJhbV91c2FnZSk7CisJZnJlZV92cmFtID0g dXNlZF92cmFtID49IHRvdGFsX3ZyYW0gPyAwIDogdG90YWxfdnJhbSAtIHVzZWRfdnJhbTsKKwor CXNwaW5fbG9jaygmYWRldi0+bW1fc3RhdHMubG9jayk7CisKKwkvKiBJbmNyZWFzZSB0aGUgYW1v dW50IG9mIGFjY3VtdWxhdGVkIHVzLiAqLworCXRpbWVfdXMgPSBrdGltZV90b191cyhrdGltZV9n ZXQoKSk7CisJaW5jcmVtZW50X3VzID0gdGltZV91cyAtIGFkZXYtPm1tX3N0YXRzLmxhc3RfdXBk YXRlX3VzOworCWFkZXYtPm1tX3N0YXRzLmxhc3RfdXBkYXRlX3VzID0gdGltZV91czsKKwlhZGV2 LT5tbV9zdGF0cy5hY2N1bV91cyA9IG1pbihhZGV2LT5tbV9zdGF0cy5hY2N1bV91cyArIGluY3Jl bWVudF91cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNfdXBwZXJf Ym91bmQpOworCisJLyogVGhpcyBwcmV2ZW50cyB0aGUgc2hvcnQgcGVyaW9kIG9mIGxvdyBwZXJm b3JtYW5jZSB3aGVuIHRoZSBWUkFNCisJICogdXNhZ2UgaXMgbG93IGFuZCB0aGUgZHJpdmVyIGlz IGluIGRlYnQgb3IgZG9lc24ndCBoYXZlIGVub3VnaAorCSAqIGFjY3VtdWxhdGVkIHVzIHRvIGZp bGwgVlJBTSBxdWlja2x5LgogCSAqCi0JICogVGhlIGlkZWEgaXMgdGhhdCBidWZmZXJzIHNob3Vs ZCBiZSBwbGFjZWQgaW4gVlJBTSBhdCBjcmVhdGlvbiB0aW1lCi0JICogYW5kIFRUTSBzaG91bGQg b25seSBkbyBhIG1pbmltdW0gbnVtYmVyIG9mIHJlbG9jYXRpb25zIGR1cmluZwotCSAqIGNvbW1h bmQgc3VibWlzc2lvbi4gSW4gcHJhY3RpY2UsIHlvdSBuZWVkIHRvIHN1Ym1pdCBhdCBsZWFzdAot CSAqIGEgZG96ZW4gSUJzIHRvIG1vdmUgYWxsIGJ1ZmZlcnMgdG8gVlJBTSBpZiB0aGV5IGFyZSBp biBHVFQuCisJICogVGhlIHNpdHVhdGlvbiBjYW4gb2NjdXIgaW4gdGhlc2UgY2FzZXM6CisJICog LSBhIGxvdCBvZiBWUkFNIGlzIGZyZWVkIGJ5IHVzZXJzcGFjZQorCSAqIC0gdGhlIHByZXNlbmNl IG9mIGEgYmlnIGJ1ZmZlciBjYXVzZXMgYSBsb3Qgb2YgZXZpY3Rpb25zCisJICogICAoc29sdXRp b246IHNwbGl0IGJ1ZmZlcnMgaW50byBzbWFsbGVyIG9uZXMpCiAJICoKLQkgKiBBbHNvLCB0aGlu Z3MgY2FuIGdldCBwcmV0dHkgY3JhenkgdW5kZXIgbWVtb3J5IHByZXNzdXJlIGFuZCBhY3R1YWwK LQkgKiBWUkFNIHVzYWdlIGNhbiBjaGFuZ2UgYSBsb3QsIHNvIHBsYXlpbmcgc2FmZSBldmVuIGF0 IDUwJSBkb2VzCi0JICogY29uc2lzdGVudGx5IGluY3JlYXNlIHBlcmZvcm1hbmNlLgorCSAqIElm IDEyOCBNQiBvciAxLzh0aCBvZiBWUkFNIGlzIGZyZWUsIHN0YXJ0IGZpbGxpbmcgaXQgbm93IGJ5 IHNldHRpbmcKKwkgKiBhY2N1bV91cyB0byBhIHBvc2l0aXZlIG51bWJlci4KIAkgKi8KKwlpZiAo ZnJlZV92cmFtID49IDEyOCAqIDEwMjQgKiAxMDI0IHx8IGZyZWVfdnJhbSA+PSB0b3RhbF92cmFt IC8gOCkgeworCQlzNjQgbWluX3VzOworCisJCS8qIEJlIG1vcmUgYWdncmVzaXZlIG9uIGRHUFVz LiBUcnkgdG8gZmlsbCBhIHBvcnRpb24gb2YgZnJlZQorCQkgKiBWUkFNIG5vdy4KKwkJICovCisJ CWlmICghKGFkZXYtPmZsYWdzICYgQU1EX0lTX0FQVSkpCisJCQltaW5fdXMgPSBieXRlc190b191 cyhhZGV2LCBmcmVlX3ZyYW0gLyA0KTsKKwkJZWxzZQorCQkJbWluX3VzID0gMDsgLyogUmVzZXQg YWNjdW1fdXMgb24gQVBVcy4gKi8KKworCQlhZGV2LT5tbV9zdGF0cy5hY2N1bV91cyA9IG1heCht aW5fdXMsIGFkZXYtPm1tX3N0YXRzLmFjY3VtX3VzKTsKKwl9CiAKLQl1NjQgaGFsZl92cmFtID0g cmVhbF92cmFtX3NpemUgPj4gMTsKLQl1NjQgaGFsZl9mcmVlX3ZyYW0gPSB2cmFtX3VzYWdlID49 IGhhbGZfdnJhbSA/IDAgOiBoYWxmX3ZyYW0gLSB2cmFtX3VzYWdlOwotCXU2NCBieXRlc19tb3Zl ZF90aHJlc2hvbGQgPSBoYWxmX2ZyZWVfdnJhbSA+PiAxOwotCXJldHVybiBtYXgoYnl0ZXNfbW92 ZWRfdGhyZXNob2xkLCAxMDI0KjEwMjR1bGwpOworCS8qIFRoaXMgcmV0dXJucyAwIGlmIHRoZSBk cml2ZXIgaXMgaW4gZGVidCB0byBkaXNhbGxvdyAob3B0aW9uYWwpCisJICogYnVmZmVyIG1vdmVz LgorCSAqLworCW1heF9ieXRlcyA9IHVzX3RvX2J5dGVzKGFkZXYsIGFkZXYtPm1tX3N0YXRzLmFj Y3VtX3VzKTsKKworCXNwaW5fdW5sb2NrKCZhZGV2LT5tbV9zdGF0cy5sb2NrKTsKKwlyZXR1cm4g bWF4X2J5dGVzOworfQorCisvKiBSZXBvcnQgaG93IG1hbnkgYnl0ZXMgaGF2ZSByZWFsbHkgYmVl biBtb3ZlZCBmb3IgdGhlIGxhc3QgY29tbWFuZAorICogc3VibWlzc2lvbi4gVGhpcyBjYW4gcmVz dWx0IGluIGEgZGVidCB0aGF0IGNhbiBzdG9wIGJ1ZmZlciBtaWdyYXRpb25zCisgKiB0ZW1wb3Jh cmlseS4KKyAqLworc3RhdGljIHZvaWQgYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRlcyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkJIHU2NCBudW1fYnl0ZXMpCit7CisJc3Bpbl9s b2NrKCZhZGV2LT5tbV9zdGF0cy5sb2NrKTsKKwlhZGV2LT5tbV9zdGF0cy5hY2N1bV91cyAtPSBi eXRlc190b191cyhhZGV2LCBudW1fYnl0ZXMpOworCXNwaW5fdW5sb2NrKCZhZGV2LT5tbV9zdGF0 cy5sb2NrKTsKIH0KIAogc3RhdGljIGludCBhbWRncHVfY3NfYm9fdmFsaWRhdGUoc3RydWN0IGFt ZGdwdV9jc19wYXJzZXIgKnAsCiAJCQkJIHN0cnVjdCBhbWRncHVfYm8gKmJvKQogewogCXU2NCBp bml0aWFsX2J5dGVzX21vdmVkOwogCXVpbnQzMl90IGRvbWFpbjsKIAlpbnQgcjsKIAogCWlmIChi by0+cGluX2NvdW50KQogCQlyZXR1cm4gMDsKIAotCS8qIEF2b2lkIG1vdmluZyB0aGlzIG9uZSBp ZiB3ZSBoYXZlIG1vdmVkIHRvbyBtYW55IGJ1ZmZlcnMKLQkgKiBmb3IgdGhpcyBJQiBhbHJlYWR5 LgotCSAqCi0JICogTm90ZSB0aGF0IHRoaXMgYWxsb3dzIG1vdmluZyBhdCBsZWFzdCBvbmUgYnVm ZmVyIG9mCi0JICogYW55IHNpemUsIGJlY2F1c2UgaXQgZG9lc24ndCB0YWtlIHRoZSBjdXJyZW50 ICJibyIKLQkgKiBpbnRvIGFjY291bnQuIFdlIGRvbid0IHdhbnQgdG8gZGlzYWxsb3cgYnVmZmVy IG1vdmVzCi0JICogY29tcGxldGVseS4KKwkvKiBEb24ndCBtb3ZlIHRoaXMgYnVmZmVyIGlmIHdl IGhhdmUgZGVwbGV0ZWQgb3VyIGFsbG93YW5jZQorCSAqIHRvIG1vdmUgaXQuIERvbid0IG1vdmUg YW55dGhpbmcgaWYgdGhlIHRocmVzaG9sZCBpcyB6ZXJvLgogCSAqLwotCWlmIChwLT5ieXRlc19t b3ZlZCA8PSBwLT5ieXRlc19tb3ZlZF90aHJlc2hvbGQpCisJaWYgKHAtPmJ5dGVzX21vdmVkIDwg cC0+Ynl0ZXNfbW92ZWRfdGhyZXNob2xkKQogCQlkb21haW4gPSBiby0+cHJlZmVyZWRfZG9tYWlu czsKIAllbHNlCiAJCWRvbWFpbiA9IGJvLT5hbGxvd2VkX2RvbWFpbnM7CiAKIHJldHJ5OgogCWFt ZGdwdV90dG1fcGxhY2VtZW50X2Zyb21fZG9tYWluKGJvLCBkb21haW4pOwogCWluaXRpYWxfYnl0 ZXNfbW92ZWQgPSBhdG9taWM2NF9yZWFkKCZiby0+YWRldi0+bnVtX2J5dGVzX21vdmVkKTsKIAly ID0gdHRtX2JvX3ZhbGlkYXRlKCZiby0+dGJvLCAmYm8tPnBsYWNlbWVudCwgdHJ1ZSwgZmFsc2Up OwogCXAtPmJ5dGVzX21vdmVkICs9IGF0b21pYzY0X3JlYWQoJmJvLT5hZGV2LT5udW1fYnl0ZXNf bW92ZWQpIC0KIAkJaW5pdGlhbF9ieXRlc19tb3ZlZDsKQEAgLTQ4OCwyMCArNTQyLDIyIEBAIHN0 YXRpYyBpbnQgYW1kZ3B1X2NzX3BhcnNlcl9ib3Moc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgKnAs CiAJCURSTV9FUlJPUigiYW1kZ3B1X2NzX2xpc3RfdmFsaWRhdGUoZHVwbGljYXRlcykgZmFpbGVk LlxuIik7CiAJCWdvdG8gZXJyb3JfdmFsaWRhdGU7CiAJfQogCiAJciA9IGFtZGdwdV9jc19saXN0 X3ZhbGlkYXRlKHAsICZwLT52YWxpZGF0ZWQpOwogCWlmIChyKSB7CiAJCURSTV9FUlJPUigiYW1k Z3B1X2NzX2xpc3RfdmFsaWRhdGUodmFsaWRhdGVkKSBmYWlsZWQuXG4iKTsKIAkJZ290byBlcnJv cl92YWxpZGF0ZTsKIAl9CiAKKwlhbWRncHVfY3NfcmVwb3J0X21vdmVkX2J5dGVzKHAtPmFkZXYs IHAtPmJ5dGVzX21vdmVkKTsKKwogCWZwcml2LT52bS5sYXN0X2V2aWN0aW9uX2NvdW50ZXIgPQog CQlhdG9taWM2NF9yZWFkKCZwLT5hZGV2LT5udW1fZXZpY3Rpb25zKTsKIAogCWlmIChwLT5ib19s aXN0KSB7CiAJCXN0cnVjdCBhbWRncHVfYm8gKmdkcyA9IHAtPmJvX2xpc3QtPmdkc19vYmo7CiAJ CXN0cnVjdCBhbWRncHVfYm8gKmd3cyA9IHAtPmJvX2xpc3QtPmd3c19vYmo7CiAJCXN0cnVjdCBh bWRncHVfYm8gKm9hID0gcC0+Ym9fbGlzdC0+b2Ffb2JqOwogCQlzdHJ1Y3QgYW1kZ3B1X3ZtICp2 bSA9ICZmcHJpdi0+dm07CiAJCXVuc2lnbmVkIGk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCAyNjA4MTM4Li44ODc3MjkxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC0xNTIxLDIwICsxNTIxLDIxIEBA IHN0YXRpYyBib29sIGFtZGdwdV9kZXZpY2VfaXNfdmlydHVhbCh2b2lkKQogICogUmV0dXJucyAw IGZvciBzdWNjZXNzIG9yIGFuIGVycm9yIG9uIGZhaWx1cmUuCiAgKiBDYWxsZWQgYXQgZHJpdmVy IHN0YXJ0dXAuCiAgKi8KIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGRldiwKIAkJICAgICAgIHN0 cnVjdCBwY2lfZGV2ICpwZGV2LAogCQkgICAgICAgdWludDMyX3QgZmxhZ3MpCiB7CiAJaW50IHIs IGk7CiAJYm9vbCBydW50aW1lID0gZmFsc2U7CisJdTMyIG1heF9NQnBzOwogCiAJYWRldi0+c2h1 dGRvd24gPSBmYWxzZTsKIAlhZGV2LT5kZXYgPSAmcGRldi0+ZGV2OwogCWFkZXYtPmRkZXYgPSBk ZGV2OwogCWFkZXYtPnBkZXYgPSBwZGV2OwogCWFkZXYtPmZsYWdzID0gZmxhZ3M7CiAJYWRldi0+ YXNpY190eXBlID0gZmxhZ3MgJiBBTURfQVNJQ19NQVNLOwogCWFkZXYtPmlzX2F0b21fYmlvcyA9 IGZhbHNlOwogCWFkZXYtPnVzZWNfdGltZW91dCA9IEFNREdQVV9NQVhfVVNFQ19USU1FT1VUOwog CWFkZXYtPm1jLmd0dF9zaXplID0gNTEyICogMTAyNCAqIDEwMjQ7CkBAIC0xNTgwLDIwICsxNTgx LDIxIEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiAKIAkvKiBSZWdpc3RlcnMgbWFwcGluZyAqLwogCS8qIFRPRE86IGJsb2NrIHVzZXJzcGFjZSBt YXBwaW5nIG9mIGlvIHJlZ2lzdGVyICovCiAJc3Bpbl9sb2NrX2luaXQoJmFkZXYtPm1taW9faWR4 X2xvY2spOwogCXNwaW5fbG9ja19pbml0KCZhZGV2LT5zbWNfaWR4X2xvY2spOwogCXNwaW5fbG9j a19pbml0KCZhZGV2LT5wY2llX2lkeF9sb2NrKTsKIAlzcGluX2xvY2tfaW5pdCgmYWRldi0+dXZk X2N0eF9pZHhfbG9jayk7CiAJc3Bpbl9sb2NrX2luaXQoJmFkZXYtPmRpZHRfaWR4X2xvY2spOwog CXNwaW5fbG9ja19pbml0KCZhZGV2LT5nY19jYWNfaWR4X2xvY2spOwogCXNwaW5fbG9ja19pbml0 KCZhZGV2LT5hdWRpb19lbmRwdF9pZHhfbG9jayk7CisJc3Bpbl9sb2NrX2luaXQoJmFkZXYtPm1t X3N0YXRzLmxvY2spOwogCiAJSU5JVF9MSVNUX0hFQUQoJmFkZXYtPnNoYWRvd19saXN0KTsKIAlt dXRleF9pbml0KCZhZGV2LT5zaGFkb3dfbGlzdF9sb2NrKTsKIAogCWFkZXYtPnJtbWlvX2Jhc2Ug PSBwY2lfcmVzb3VyY2Vfc3RhcnQoYWRldi0+cGRldiwgNSk7CiAJYWRldi0+cm1taW9fc2l6ZSA9 IHBjaV9yZXNvdXJjZV9sZW4oYWRldi0+cGRldiwgNSk7CiAJYWRldi0+cm1taW8gPSBpb3JlbWFw KGFkZXYtPnJtbWlvX2Jhc2UsIGFkZXYtPnJtbWlvX3NpemUpOwogCWlmIChhZGV2LT5ybW1pbyA9 PSBOVUxMKSB7CiAJCXJldHVybiAtRU5PTUVNOwogCX0KQEAgLTE2OTMsMjAgKzE2OTUsMjggQEAg aW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAogCXIg PSBhbWRncHVfaW5pdChhZGV2KTsKIAlpZiAocikgewogCQlkZXZfZXJyKGFkZXYtPmRldiwgImFt ZGdwdV9pbml0IGZhaWxlZFxuIik7CiAJCWFtZGdwdV9maW5pKGFkZXYpOwogCQlnb3RvIGZhaWxl ZDsKIAl9CiAKIAlhZGV2LT5hY2NlbF93b3JraW5nID0gdHJ1ZTsKIAorCS8qIEluaXRpYWxpemUg dGhlIGJ1ZmZlciBtaWdyYXRpb24gbGltaXQuICovCisJaWYgKGFtZGdwdV9tb3ZlcmF0ZSA+PSAw KQorCQltYXhfTUJwcyA9IGFtZGdwdV9tb3ZlcmF0ZTsKKwllbHNlCisJCW1heF9NQnBzID0gODsg LyogQWxsb3cgOCBNQi9zLiAqLworCS8qIEdldCBhIGxvZzIgZm9yIGVhc3kgZGl2aXNpb25zLiAq LworCWFkZXYtPm1tX3N0YXRzLmxvZzJfbWF4X01CcHMgPSBpbG9nMihtYXgoMXUsIG1heF9NQnBz KSk7CisKIAlhbWRncHVfZmJkZXZfaW5pdChhZGV2KTsKIAogCXIgPSBhbWRncHVfaWJfcG9vbF9p bml0KGFkZXYpOwogCWlmIChyKSB7CiAJCWRldl9lcnIoYWRldi0+ZGV2LCAiSUIgaW5pdGlhbGl6 YXRpb24gZmFpbGVkICglZCkuXG4iLCByKTsKIAkJZ290byBmYWlsZWQ7CiAJfQogCiAJciA9IGFt ZGdwdV9pYl9yaW5nX3Rlc3RzKGFkZXYpOwogCWlmIChyKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2Rydi5jCmluZGV4IDViY2ZlZWQuLmZlMmQyNmIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKQEAgLTU0LDIwICs1NCwyMSBAQAogICogICAgICAgICAg IGF0IHRoZSBlbmQgb2YgSUJzLgogICogLSAzLjMuMCAtIEFkZCBWTSBzdXBwb3J0IGZvciBVVkQg b24gc3VwcG9ydGVkIGhhcmR3YXJlLgogICogLSAzLjQuMCAtIEFkZCBBTURHUFVfSU5GT19OVU1f RVZJQ1RJT05TLgogICovCiAjZGVmaW5lIEtNU19EUklWRVJfTUFKT1IJMwogI2RlZmluZSBLTVNf RFJJVkVSX01JTk9SCTQKICNkZWZpbmUgS01TX0RSSVZFUl9QQVRDSExFVkVMCTAKIAogaW50IGFt ZGdwdV92cmFtX2xpbWl0ID0gMDsKIGludCBhbWRncHVfZ2FydF9zaXplID0gLTE7IC8qIGF1dG8g Ki8KK2ludCBhbWRncHVfbW92ZXJhdGUgPSAtMTsgLyogYXV0byAqLwogaW50IGFtZGdwdV9iZW5j aG1hcmtpbmcgPSAwOwogaW50IGFtZGdwdV90ZXN0aW5nID0gMDsKIGludCBhbWRncHVfYXVkaW8g PSAtMTsKIGludCBhbWRncHVfZGlzcF9wcmlvcml0eSA9IDA7CiBpbnQgYW1kZ3B1X2h3X2kyYyA9 IDA7CiBpbnQgYW1kZ3B1X3BjaWVfZ2VuMiA9IC0xOwogaW50IGFtZGdwdV9tc2kgPSAtMTsKIGlu dCBhbWRncHVfbG9ja3VwX3RpbWVvdXQgPSAwOwogaW50IGFtZGdwdV9kcG0gPSAtMTsKIGludCBh bWRncHVfc21jX2xvYWRfZncgPSAxOwpAQCAtOTIsMjAgKzkzLDIzIEBAIHVuc2lnbmVkIGFtZGdw dV9wY2llX2xhbmVfY2FwID0gMDsKIHVuc2lnbmVkIGFtZGdwdV9jZ19tYXNrID0gMHhmZmZmZmZm ZjsKIHVuc2lnbmVkIGFtZGdwdV9wZ19tYXNrID0gMHhmZmZmZmZmZjsKIGNoYXIgKmFtZGdwdV92 aXJ0dWFsX2Rpc3BsYXkgPSBOVUxMOwogCiBNT0RVTEVfUEFSTV9ERVNDKHZyYW1saW1pdCwgIlJl c3RyaWN0IFZSQU0gZm9yIHRlc3RpbmcsIGluIG1lZ2FieXRlcyIpOwogbW9kdWxlX3BhcmFtX25h bWVkKHZyYW1saW1pdCwgYW1kZ3B1X3ZyYW1fbGltaXQsIGludCwgMDYwMCk7CiAKIE1PRFVMRV9Q QVJNX0RFU0MoZ2FydHNpemUsICJTaXplIG9mIFBDSUUvSUdQIGdhcnQgdG8gc2V0dXAgaW4gbWVn YWJ5dGVzICgzMiwgNjQsIGV0Yy4sIC0xID0gYXV0bykiKTsKIG1vZHVsZV9wYXJhbV9uYW1lZChn YXJ0c2l6ZSwgYW1kZ3B1X2dhcnRfc2l6ZSwgaW50LCAwNjAwKTsKIAorTU9EVUxFX1BBUk1fREVT Qyhtb3ZlcmF0ZSwgIk1heGltdW0gYnVmZmVyIG1pZ3JhdGlvbiByYXRlIGluIE1CL3MuICgzMiwg NjQsIGV0Yy4sIC0xPWF1dG8sIDA9MT1kaXNhYmxlZCkiKTsKK21vZHVsZV9wYXJhbV9uYW1lZCht b3ZlcmF0ZSwgYW1kZ3B1X21vdmVyYXRlLCBpbnQsIDA2MDApOworCiBNT0RVTEVfUEFSTV9ERVND KGJlbmNobWFyaywgIlJ1biBiZW5jaG1hcmsiKTsKIG1vZHVsZV9wYXJhbV9uYW1lZChiZW5jaG1h cmssIGFtZGdwdV9iZW5jaG1hcmtpbmcsIGludCwgMDQ0NCk7CiAKIE1PRFVMRV9QQVJNX0RFU0Mo dGVzdCwgIlJ1biB0ZXN0cyIpOwogbW9kdWxlX3BhcmFtX25hbWVkKHRlc3QsIGFtZGdwdV90ZXN0 aW5nLCBpbnQsIDA0NDQpOwogCiBNT0RVTEVfUEFSTV9ERVNDKGF1ZGlvLCAiQXVkaW8gZW5hYmxl ICgtMSA9IGF1dG8sIDAgPSBkaXNhYmxlLCAxID0gZW5hYmxlKSIpOwogbW9kdWxlX3BhcmFtX25h bWVkKGF1ZGlvLCBhbWRncHVfYXVkaW8sIGludCwgMDQ0NCk7CiAKIE1PRFVMRV9QQVJNX0RFU0Mo ZGlzcF9wcmlvcml0eSwgIkRpc3BsYXkgUHJpb3JpdHkgKDAgPSBhdXRvLCAxID0gbm9ybWFsLCAy ID0gaGlnaCkiKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK