From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH] drm/amdgpu: cleanup VM manager init/fini Date: Thu, 11 May 2017 16:22:20 +0200 Message-ID: <1494512540-1696-1-git-send-email-deathsimple@vodafone.de> 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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVk0gaXMg bWFuZGF0b3J5IGZvciBhbGwgaHcgYW1kZ3B1IHN1cHBvcnRzLiBTbyByZW1vdmUgdGhlIGxlZnRv dmVycwp0byBtYWtlIGl0IG9wdGlvbmFsbHkuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2 bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2dlbS5jIHwgIDMgLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV92bS5oICB8ICAyIC0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMg ICB8IDU5ICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ21jX3Y3XzAuYyAgIHwgODIgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jICAgfCA4MiArKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8w LmMgICB8IDgwICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5n ZWQsIDc4IGluc2VydGlvbnMoKyksIDIzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZ2VtLmMKaW5kZXggNjc3OGVhNS4uYzhiMDM3YSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYwpAQCAtNTcxLDkgKzU3MSw2IEBAIGludCBhbWRn cHVfZ2VtX3ZhX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJdWlu dDY0X3QgdmFfZmxhZ3M7CiAJaW50IHIgPSAwOwogCi0JaWYgKCFhZGV2LT52bV9tYW5hZ2VyLmVu YWJsZWQpCi0JCXJldHVybiAtRU5PVFRZOwotCiAJaWYgKGFyZ3MtPnZhX2FkZHJlc3MgPCBBTURH UFVfVkFfUkVTRVJWRURfU0laRSkgewogCQlkZXZfZXJyKCZkZXYtPnBkZXYtPmRldiwKIAkJCSJ2 YV9hZGRyZXNzIDB4JWxYIGlzIGluIHJlc2VydmVkIGFyZWEgMHglWFxuIiwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5oIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmgKaW5kZXggMjc1NDZkZi4uYWZlOTA3MyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmgKQEAgLTE3Myw4ICsxNzMsNiBAQCBzdHJ1Y3Qg YW1kZ3B1X3ZtX21hbmFnZXIgewogCXVpbnQzMl90CQkJCWJsb2NrX3NpemU7CiAJLyogdnJhbSBi YXNlIGFkZHJlc3MgZm9yIHBhZ2UgdGFibGUgZW50cnkgICovCiAJdTY0CQkJCQl2cmFtX2Jhc2Vf b2Zmc2V0OwotCS8qIGlzIHZtIGVuYWJsZWQ/ICovCi0JYm9vbAkJCQkJZW5hYmxlZDsKIAkvKiB2 bSBwdGUgaGFuZGxpbmcgKi8KIAljb25zdCBzdHJ1Y3QgYW1kZ3B1X3ZtX3B0ZV9mdW5jcyAgICAg ICAgKnZtX3B0ZV9mdW5jczsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgICAgICAgICAgICAgICAgICAg ICAgKnZtX3B0ZV9yaW5nc1tBTURHUFVfTUFYX1JJTkdTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nbWNfdjZfMC5jCmluZGV4IGQ4NjA5MzkuLjFlNjI2M2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ21jX3Y2XzAuYwpAQCAtNjE0LDMzICs2MTQsNiBAQCBzdGF0aWMgdm9pZCBnbWNfdjZf MF9nYXJ0X2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJYW1kZ3B1X2dhcnRfZmlu aShhZGV2KTsKIH0KIAotc3RhdGljIGludCBnbWNfdjZfMF92bV9pbml0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2KQotewotCS8qCi0JICogbnVtYmVyIG9mIFZNcwotCSAqIFZNSUQgMCBpcyBy ZXNlcnZlZCBmb3IgU3lzdGVtCi0JICogYW1kZ3B1IGdyYXBoaWNzL2NvbXB1dGUgd2lsbCB1c2Ug Vk1JRHMgMS03Ci0JICogYW1ka2ZkIHdpbGwgdXNlIFZNSURzIDgtMTUKLQkgKi8KLQlhZGV2LT52 bV9tYW5hZ2VyLmlkX21nclswXS5udW1faWRzID0gQU1ER1BVX05VTV9PRl9WTUlEUzsKLQlhZGV2 LT52bV9tYW5hZ2VyLm51bV9sZXZlbCA9IDE7Ci0JYW1kZ3B1X3ZtX21hbmFnZXJfaW5pdChhZGV2 KTsKLQotCS8qIGJhc2Ugb2Zmc2V0IG9mIHZyYW0gcGFnZXMgKi8KLQlpZiAoYWRldi0+ZmxhZ3Mg JiBBTURfSVNfQVBVKSB7Ci0JCXU2NCB0bXAgPSBSUkVHMzIobW1NQ19WTV9GQl9PRkZTRVQpOwot CQl0bXAgPDw9IDIyOwotCQlhZGV2LT52bV9tYW5hZ2VyLnZyYW1fYmFzZV9vZmZzZXQgPSB0bXA7 Ci0JfSBlbHNlCi0JCWFkZXYtPnZtX21hbmFnZXIudnJhbV9iYXNlX29mZnNldCA9IDA7Ci0KLQly ZXR1cm4gMDsKLX0KLQotc3RhdGljIHZvaWQgZ21jX3Y2XzBfdm1fZmluaShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKLXsKLX0KLQogc3RhdGljIHZvaWQgZ21jX3Y2XzBfdm1fZGVjb2RlX2Zh dWx0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCSAgICAgdTMyIHN0YXR1cywgdTMy IGFkZHIsIHUzMiBtY19jbGllbnQpCiB7CkBAIC04ODcsMjYgKzg2MCwzNCBAQCBzdGF0aWMgaW50 IGdtY192Nl8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCWlmIChyKQogCQlyZXR1cm4gcjsKIAot CWlmICghYWRldi0+dm1fbWFuYWdlci5lbmFibGVkKSB7Ci0JCXIgPSBnbWNfdjZfMF92bV9pbml0 KGFkZXYpOwotCQlpZiAocikgewotCQkJZGV2X2VycihhZGV2LT5kZXYsICJ2bSBtYW5hZ2VyIGlu aXRpYWxpemF0aW9uIGZhaWxlZCAoJWQpLlxuIiwgcik7Ci0JCQlyZXR1cm4gcjsKLQkJfQotCQlh ZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSB0cnVlOworCS8qCisJICogbnVtYmVyIG9mIFZNcwor CSAqIFZNSUQgMCBpcyByZXNlcnZlZCBmb3IgU3lzdGVtCisJICogYW1kZ3B1IGdyYXBoaWNzL2Nv bXB1dGUgd2lsbCB1c2UgVk1JRHMgMS03CisJICogYW1ka2ZkIHdpbGwgdXNlIFZNSURzIDgtMTUK KwkgKi8KKwlhZGV2LT52bV9tYW5hZ2VyLmlkX21nclswXS5udW1faWRzID0gQU1ER1BVX05VTV9P Rl9WTUlEUzsKKwlhZGV2LT52bV9tYW5hZ2VyLm51bV9sZXZlbCA9IDE7CisJYW1kZ3B1X3ZtX21h bmFnZXJfaW5pdChhZGV2KTsKKworCS8qIGJhc2Ugb2Zmc2V0IG9mIHZyYW0gcGFnZXMgKi8KKwlp ZiAoYWRldi0+ZmxhZ3MgJiBBTURfSVNfQVBVKSB7CisJCXU2NCB0bXAgPSBSUkVHMzIobW1NQ19W TV9GQl9PRkZTRVQpOworCisJCXRtcCA8PD0gMjI7CisJCWFkZXYtPnZtX21hbmFnZXIudnJhbV9i YXNlX29mZnNldCA9IHRtcDsKKwl9IGVsc2UgeworCQlhZGV2LT52bV9tYW5hZ2VyLnZyYW1fYmFz ZV9vZmZzZXQgPSAwOwogCX0KIAotCXJldHVybiByOworCXJldHVybiAwOwogfQogCiBzdGF0aWMg aW50IGdtY192Nl8wX3N3X2Zpbmkodm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwogCi0JaWYgKGFkZXYt PnZtX21hbmFnZXIuZW5hYmxlZCkgewotCQlnbWNfdjZfMF92bV9maW5pKGFkZXYpOwotCQlhZGV2 LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSBmYWxzZTsKLQl9CisJYW1kZ3B1X3ZtX21hbmFnZXJfZmlu aShhZGV2KTsKIAlnbWNfdjZfMF9nYXJ0X2ZpbmkoYWRldik7CiAJYW1kZ3B1X2dlbV9mb3JjZV9y ZWxlYXNlKGFkZXYpOwogCWFtZGdwdV9ib19maW5pKGFkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dtY192N18wLmMKaW5kZXggMjc1MGU1Yy4uOTY3NTA1YiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nbWNfdjdfMC5jCkBAIC03MjQsNTUgKzcyNCw2IEBAIHN0YXRpYyB2b2lkIGdtY192 N18wX2dhcnRfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlhbWRncHVfZ2FydF9m aW5pKGFkZXYpOwogfQogCi0vKgotICogdm0KLSAqIFZNSUQgMCBpcyB0aGUgcGh5c2ljYWwgR1BV IGFkZHJlc3NlcyBhcyB1c2VkIGJ5IHRoZSBrZXJuZWwuCi0gKiBWTUlEcyAxLTE1IGFyZSB1c2Vk IGZvciB1c2Vyc3BhY2UgY2xpZW50cyBhbmQgYXJlIGhhbmRsZWQKLSAqIGJ5IHRoZSBhbWRncHUg dm0vaHNhIGNvZGUuCi0gKi8KLS8qKgotICogZ21jX3Y3XzBfdm1faW5pdCAtIGNpayB2bSBpbml0 IGNhbGxiYWNrCi0gKgotICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgotICoKLSAqIElu aXRzIGNpayBzcGVjaWZpYyB2bSBwYXJhbWV0ZXJzIChudW1iZXIgb2YgVk1zLCBiYXNlIG9mIHZy YW0gZm9yCi0gKiBWTUlEcyAxLTE1KSAoQ0lLKS4KLSAqIFJldHVybnMgMCBmb3Igc3VjY2Vzcy4K LSAqLwotc3RhdGljIGludCBnbWNfdjdfMF92bV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQotewotCS8qCi0JICogbnVtYmVyIG9mIFZNcwotCSAqIFZNSUQgMCBpcyByZXNlcnZlZCBm b3IgU3lzdGVtCi0JICogYW1kZ3B1IGdyYXBoaWNzL2NvbXB1dGUgd2lsbCB1c2UgVk1JRHMgMS03 Ci0JICogYW1ka2ZkIHdpbGwgdXNlIFZNSURzIDgtMTUKLQkgKi8KLQlhZGV2LT52bV9tYW5hZ2Vy LmlkX21nclswXS5udW1faWRzID0gQU1ER1BVX05VTV9PRl9WTUlEUzsKLQlhZGV2LT52bV9tYW5h Z2VyLm51bV9sZXZlbCA9IDE7Ci0JYW1kZ3B1X3ZtX21hbmFnZXJfaW5pdChhZGV2KTsKLQotCS8q IGJhc2Ugb2Zmc2V0IG9mIHZyYW0gcGFnZXMgKi8KLQlpZiAoYWRldi0+ZmxhZ3MgJiBBTURfSVNf QVBVKSB7Ci0JCXU2NCB0bXAgPSBSUkVHMzIobW1NQ19WTV9GQl9PRkZTRVQpOwotCQl0bXAgPDw9 IDIyOwotCQlhZGV2LT52bV9tYW5hZ2VyLnZyYW1fYmFzZV9vZmZzZXQgPSB0bXA7Ci0JfSBlbHNl Ci0JCWFkZXYtPnZtX21hbmFnZXIudnJhbV9iYXNlX29mZnNldCA9IDA7Ci0KLQlyZXR1cm4gMDsK LX0KLQotLyoqCi0gKiBnbWNfdjdfMF92bV9maW5pIC0gY2lrIHZtIGZpbmkgY2FsbGJhY2sKLSAq Ci0gKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCi0gKgotICogVGVhciBkb3duIGFueSBh c2ljIHNwZWNpZmljIFZNIHNldHVwIChDSUspLgotICovCi1zdGF0aWMgdm9pZCBnbWNfdjdfMF92 bV9maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotfQotCiAvKioKICAqIGdtY192 N18wX3ZtX2RlY29kZV9mYXVsdCAtIHByaW50IGh1bWFuIHJlYWRhYmxlIGZhdWx0IGluZm8KICAq CkBAIC0xMDUxLDI3ICsxMDAyLDM0IEBAIHN0YXRpYyBpbnQgZ21jX3Y3XzBfc3dfaW5pdCh2b2lk ICpoYW5kbGUpCiAJaWYgKHIpCiAJCXJldHVybiByOwogCi0JaWYgKCFhZGV2LT52bV9tYW5hZ2Vy LmVuYWJsZWQpIHsKLQkJciA9IGdtY192N18wX3ZtX2luaXQoYWRldik7Ci0JCWlmIChyKSB7Ci0J CQlkZXZfZXJyKGFkZXYtPmRldiwgInZtIG1hbmFnZXIgaW5pdGlhbGl6YXRpb24gZmFpbGVkICgl ZCkuXG4iLCByKTsKLQkJCXJldHVybiByOwotCQl9Ci0JCWFkZXYtPnZtX21hbmFnZXIuZW5hYmxl ZCA9IHRydWU7CisJLyoKKwkgKiBudW1iZXIgb2YgVk1zCisJICogVk1JRCAwIGlzIHJlc2VydmVk IGZvciBTeXN0ZW0KKwkgKiBhbWRncHUgZ3JhcGhpY3MvY29tcHV0ZSB3aWxsIHVzZSBWTUlEcyAx LTcKKwkgKiBhbWRrZmQgd2lsbCB1c2UgVk1JRHMgOC0xNQorCSAqLworCWFkZXYtPnZtX21hbmFn ZXIuaWRfbWdyWzBdLm51bV9pZHMgPSBBTURHUFVfTlVNX09GX1ZNSURTOworCWFkZXYtPnZtX21h bmFnZXIubnVtX2xldmVsID0gMTsKKwlhbWRncHVfdm1fbWFuYWdlcl9pbml0KGFkZXYpOworCisJ LyogYmFzZSBvZmZzZXQgb2YgdnJhbSBwYWdlcyAqLworCWlmIChhZGV2LT5mbGFncyAmIEFNRF9J U19BUFUpIHsKKwkJdTY0IHRtcCA9IFJSRUczMihtbU1DX1ZNX0ZCX09GRlNFVCk7CisKKwkJdG1w IDw8PSAyMjsKKwkJYWRldi0+dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0ID0gdG1wOworCX0g ZWxzZSB7CisJCWFkZXYtPnZtX21hbmFnZXIudnJhbV9iYXNlX29mZnNldCA9IDA7CiAJfQogCi0J cmV0dXJuIHI7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQgZ21jX3Y3XzBfc3dfZmluaSh2 b2lkICpoYW5kbGUpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSAoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAKLQlpZiAoYWRldi0+dm1fbWFuYWdlci5lbmFibGVkKSB7 Ci0JCWFtZGdwdV92bV9tYW5hZ2VyX2ZpbmkoYWRldik7Ci0JCWdtY192N18wX3ZtX2ZpbmkoYWRl dik7Ci0JCWFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCA9IGZhbHNlOwotCX0KKwlhbWRncHVfdm1f bWFuYWdlcl9maW5pKGFkZXYpOwogCWdtY192N18wX2dhcnRfZmluaShhZGV2KTsKIAlhbWRncHVf Z2VtX2ZvcmNlX3JlbGVhc2UoYWRldik7CiAJYW1kZ3B1X2JvX2ZpbmkoYWRldik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYwppbmRleCBmNTZiNDA4Li4zYjVlYTBmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMKQEAgLTkyNyw1NSArOTI3LDYgQEAgc3RhdGlj IHZvaWQgZ21jX3Y4XzBfZ2FydF9maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWFt ZGdwdV9nYXJ0X2ZpbmkoYWRldik7CiB9CiAKLS8qCi0gKiB2bQotICogVk1JRCAwIGlzIHRoZSBw aHlzaWNhbCBHUFUgYWRkcmVzc2VzIGFzIHVzZWQgYnkgdGhlIGtlcm5lbC4KLSAqIFZNSURzIDEt MTUgYXJlIHVzZWQgZm9yIHVzZXJzcGFjZSBjbGllbnRzIGFuZCBhcmUgaGFuZGxlZAotICogYnkg dGhlIGFtZGdwdSB2bS9oc2EgY29kZS4KLSAqLwotLyoqCi0gKiBnbWNfdjhfMF92bV9pbml0IC0g Y2lrIHZtIGluaXQgY2FsbGJhY2sKLSAqCi0gKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVy Ci0gKgotICogSW5pdHMgY2lrIHNwZWNpZmljIHZtIHBhcmFtZXRlcnMgKG51bWJlciBvZiBWTXMs IGJhc2Ugb2YgdnJhbSBmb3IKLSAqIFZNSURzIDEtMTUpIChDSUspLgotICogUmV0dXJucyAwIGZv ciBzdWNjZXNzLgotICovCi1zdGF0aWMgaW50IGdtY192OF8wX3ZtX2luaXQoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCi17Ci0JLyoKLQkgKiBudW1iZXIgb2YgVk1zCi0JICogVk1JRCAwIGlz IHJlc2VydmVkIGZvciBTeXN0ZW0KLQkgKiBhbWRncHUgZ3JhcGhpY3MvY29tcHV0ZSB3aWxsIHVz ZSBWTUlEcyAxLTcKLQkgKiBhbWRrZmQgd2lsbCB1c2UgVk1JRHMgOC0xNQotCSAqLwotCWFkZXYt PnZtX21hbmFnZXIuaWRfbWdyWzBdLm51bV9pZHMgPSBBTURHUFVfTlVNX09GX1ZNSURTOwotCWFk ZXYtPnZtX21hbmFnZXIubnVtX2xldmVsID0gMTsKLQlhbWRncHVfdm1fbWFuYWdlcl9pbml0KGFk ZXYpOwotCi0JLyogYmFzZSBvZmZzZXQgb2YgdnJhbSBwYWdlcyAqLwotCWlmIChhZGV2LT5mbGFn cyAmIEFNRF9JU19BUFUpIHsKLQkJdTY0IHRtcCA9IFJSRUczMihtbU1DX1ZNX0ZCX09GRlNFVCk7 Ci0JCXRtcCA8PD0gMjI7Ci0JCWFkZXYtPnZtX21hbmFnZXIudnJhbV9iYXNlX29mZnNldCA9IHRt cDsKLQl9IGVsc2UKLQkJYWRldi0+dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0ID0gMDsKLQot CXJldHVybiAwOwotfQotCi0vKioKLSAqIGdtY192OF8wX3ZtX2ZpbmkgLSBjaWsgdm0gZmluaSBj YWxsYmFjawotICoKLSAqIEBhZGV2OiBhbWRncHVfZGV2aWNlIHBvaW50ZXIKLSAqCi0gKiBUZWFy IGRvd24gYW55IGFzaWMgc3BlY2lmaWMgVk0gc2V0dXAgKENJSykuCi0gKi8KLXN0YXRpYyB2b2lk IGdtY192OF8wX3ZtX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCi17Ci19Ci0KIC8q KgogICogZ21jX3Y4XzBfdm1fZGVjb2RlX2ZhdWx0IC0gcHJpbnQgaHVtYW4gcmVhZGFibGUgZmF1 bHQgaW5mbwogICoKQEAgLTExMzUsMjcgKzEwODYsMzQgQEAgc3RhdGljIGludCBnbWNfdjhfMF9z d19pbml0KHZvaWQgKmhhbmRsZSkKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQlpZiAoIWFkZXYt PnZtX21hbmFnZXIuZW5hYmxlZCkgewotCQlyID0gZ21jX3Y4XzBfdm1faW5pdChhZGV2KTsKLQkJ aWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAidm0gbWFuYWdlciBpbml0aWFsaXphdGlv biBmYWlsZWQgKCVkKS5cbiIsIHIpOwotCQkJcmV0dXJuIHI7Ci0JCX0KLQkJYWRldi0+dm1fbWFu YWdlci5lbmFibGVkID0gdHJ1ZTsKKwkvKgorCSAqIG51bWJlciBvZiBWTXMKKwkgKiBWTUlEIDAg aXMgcmVzZXJ2ZWQgZm9yIFN5c3RlbQorCSAqIGFtZGdwdSBncmFwaGljcy9jb21wdXRlIHdpbGwg dXNlIFZNSURzIDEtNworCSAqIGFtZGtmZCB3aWxsIHVzZSBWTUlEcyA4LTE1CisJICovCisJYWRl di0+dm1fbWFuYWdlci5pZF9tZ3JbMF0ubnVtX2lkcyA9IEFNREdQVV9OVU1fT0ZfVk1JRFM7CisJ YWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWwgPSAxOworCWFtZGdwdV92bV9tYW5hZ2VyX2luaXQo YWRldik7CisKKwkvKiBiYXNlIG9mZnNldCBvZiB2cmFtIHBhZ2VzICovCisJaWYgKGFkZXYtPmZs YWdzICYgQU1EX0lTX0FQVSkgeworCQl1NjQgdG1wID0gUlJFRzMyKG1tTUNfVk1fRkJfT0ZGU0VU KTsKKworCQl0bXAgPDw9IDIyOworCQlhZGV2LT52bV9tYW5hZ2VyLnZyYW1fYmFzZV9vZmZzZXQg PSB0bXA7CisJfSBlbHNlIHsKKwkJYWRldi0+dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0ID0g MDsKIAl9CiAKLQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCBnbWNfdjhf MF9zd19maW5pKHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9 IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAotCWlmIChhZGV2LT52bV9tYW5hZ2Vy LmVuYWJsZWQpIHsKLQkJYW1kZ3B1X3ZtX21hbmFnZXJfZmluaShhZGV2KTsKLQkJZ21jX3Y4XzBf dm1fZmluaShhZGV2KTsKLQkJYWRldi0+dm1fbWFuYWdlci5lbmFibGVkID0gZmFsc2U7Ci0JfQor CWFtZGdwdV92bV9tYW5hZ2VyX2ZpbmkoYWRldik7CiAJZ21jX3Y4XzBfZ2FydF9maW5pKGFkZXYp OwogCWFtZGdwdV9nZW1fZm9yY2VfcmVsZWFzZShhZGV2KTsKIAlhbWRncHVfYm9fZmluaShhZGV2 KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jCmluZGV4IDFiYzgyOTIuLjE5ZTEw MjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwpAQCAtNTI0LDU0ICs1MjQs NiBAQCBzdGF0aWMgaW50IGdtY192OV8wX2dhcnRfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAlyZXR1cm4gYW1kZ3B1X2dhcnRfdGFibGVfdnJhbV9hbGxvYyhhZGV2KTsKIH0KIAot LyoKLSAqIHZtCi0gKiBWTUlEIDAgaXMgdGhlIHBoeXNpY2FsIEdQVSBhZGRyZXNzZXMgYXMgdXNl ZCBieSB0aGUga2VybmVsLgotICogVk1JRHMgMS0xNSBhcmUgdXNlZCBmb3IgdXNlcnNwYWNlIGNs aWVudHMgYW5kIGFyZSBoYW5kbGVkCi0gKiBieSB0aGUgYW1kZ3B1IHZtL2hzYSBjb2RlLgotICov Ci0vKioKLSAqIGdtY192OV8wX3ZtX2luaXQgLSB2bSBpbml0IGNhbGxiYWNrCi0gKgotICogQGFk ZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgotICoKLSAqIEluaXRzIHZlZ2ExMCBzcGVjaWZpYyB2 bSBwYXJhbWV0ZXJzIChudW1iZXIgb2YgVk1zLCBiYXNlIG9mIHZyYW0gZm9yCi0gKiBWTUlEcyAx LTE1KSAodmVnYTEwKS4KLSAqIFJldHVybnMgMCBmb3Igc3VjY2Vzcy4KLSAqLwotc3RhdGljIGlu dCBnbWNfdjlfMF92bV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCS8qCi0J ICogbnVtYmVyIG9mIFZNcwotCSAqIFZNSUQgMCBpcyByZXNlcnZlZCBmb3IgU3lzdGVtCi0JICog YW1kZ3B1IGdyYXBoaWNzL2NvbXB1dGUgd2lsbCB1c2UgVk1JRHMgMS03Ci0JICogYW1ka2ZkIHdp bGwgdXNlIFZNSURzIDgtMTUKLQkgKi8KLQlhZGV2LT52bV9tYW5hZ2VyLmlkX21ncltBTURHUFVf R0ZYSFVCXS5udW1faWRzID0gQU1ER1BVX05VTV9PRl9WTUlEUzsKLQlhZGV2LT52bV9tYW5hZ2Vy LmlkX21ncltBTURHUFVfTU1IVUJdLm51bV9pZHMgPSBBTURHUFVfTlVNX09GX1ZNSURTOwotCi0J LyogVE9ETzogZml4IG51bV9sZXZlbCBmb3IgQVBVIHdoZW4gdXBkYXRpbmcgdm0gc2l6ZSBhbmQg YmxvY2sgc2l6ZSAqLwotCWlmIChhZGV2LT5mbGFncyAmIEFNRF9JU19BUFUpCi0JCWFkZXYtPnZt X21hbmFnZXIubnVtX2xldmVsID0gMTsKLQllbHNlCi0JCWFkZXYtPnZtX21hbmFnZXIubnVtX2xl dmVsID0gMzsKLQlhbWRncHVfdm1fbWFuYWdlcl9pbml0KGFkZXYpOwotCi0JcmV0dXJuIDA7Ci19 Ci0KLS8qKgotICogZ21jX3Y5XzBfdm1fZmluaSAtIHZtIGZpbmkgY2FsbGJhY2sKLSAqCi0gKiBA YWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCi0gKgotICogVGVhciBkb3duIGFueSBhc2ljIHNw ZWNpZmljIFZNIHNldHVwLgotICovCi1zdGF0aWMgdm9pZCBnbWNfdjlfMF92bV9maW5pKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCXJldHVybjsKLX0KLQogc3RhdGljIGludCBnbWNf djlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIHsKIAlpbnQgcjsKQEAgLTY0NywxNSArNTk5LDIz IEBAIHN0YXRpYyBpbnQgZ21jX3Y5XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJaWYgKHIpCiAJ CXJldHVybiByOwogCi0JaWYgKCFhZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQpIHsKLQkJciA9IGdt Y192OV8wX3ZtX2luaXQoYWRldik7Ci0JCWlmIChyKSB7Ci0JCQlkZXZfZXJyKGFkZXYtPmRldiwg InZtIG1hbmFnZXIgaW5pdGlhbGl6YXRpb24gZmFpbGVkICglZCkuXG4iLCByKTsKLQkJCXJldHVy biByOwotCQl9Ci0JCWFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCA9IHRydWU7Ci0JfQotCXJldHVy biByOworCS8qCisJICogbnVtYmVyIG9mIFZNcworCSAqIFZNSUQgMCBpcyByZXNlcnZlZCBmb3Ig U3lzdGVtCisJICogYW1kZ3B1IGdyYXBoaWNzL2NvbXB1dGUgd2lsbCB1c2UgVk1JRHMgMS03CisJ ICogYW1ka2ZkIHdpbGwgdXNlIFZNSURzIDgtMTUKKwkgKi8KKwlhZGV2LT52bV9tYW5hZ2VyLmlk X21ncltBTURHUFVfR0ZYSFVCXS5udW1faWRzID0gQU1ER1BVX05VTV9PRl9WTUlEUzsKKwlhZGV2 LT52bV9tYW5hZ2VyLmlkX21ncltBTURHUFVfTU1IVUJdLm51bV9pZHMgPSBBTURHUFVfTlVNX09G X1ZNSURTOworCisJLyogVE9ETzogZml4IG51bV9sZXZlbCBmb3IgQVBVIHdoZW4gdXBkYXRpbmcg dm0gc2l6ZSBhbmQgYmxvY2sgc2l6ZSAqLworCWlmIChhZGV2LT5mbGFncyAmIEFNRF9JU19BUFUp CisJCWFkZXYtPnZtX21hbmFnZXIubnVtX2xldmVsID0gMTsKKwllbHNlCisJCWFkZXYtPnZtX21h bmFnZXIubnVtX2xldmVsID0gMzsKKwlhbWRncHVfdm1fbWFuYWdlcl9pbml0KGFkZXYpOworCisJ cmV0dXJuIDA7CiB9CiAKIC8qKgpAQCAtNjc1LDExICs2MzUsNyBAQCBzdGF0aWMgaW50IGdtY192 OV8wX3N3X2Zpbmkodm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwogCi0JaWYgKGFkZXYtPnZtX21hbmFn ZXIuZW5hYmxlZCkgewotCQlhbWRncHVfdm1fbWFuYWdlcl9maW5pKGFkZXYpOwotCQlnbWNfdjlf MF92bV9maW5pKGFkZXYpOwotCQlhZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSBmYWxzZTsKLQl9 CisJYW1kZ3B1X3ZtX21hbmFnZXJfZmluaShhZGV2KTsKIAlnbWNfdjlfMF9nYXJ0X2ZpbmkoYWRl dik7CiAJYW1kZ3B1X2dlbV9mb3JjZV9yZWxlYXNlKGFkZXYpOwogCWFtZGdwdV9ib19maW5pKGFk ZXYpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=