From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH] drm/amdgpu: Make amdgpu_bo_reserve use uninterruptible waits for cleanup Date: Fri, 28 Apr 2017 17:47:33 +0900 Message-ID: <20170428084733.26362-1-michel@daenzer.net> 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 Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpTb21lIG9mIHRo ZXNlIHBhdGhzIHByb2JhYmx5IGNhbm5vdCBiZSBpbnRlcnJ1cHRlZCBieSBhIHNpZ25hbCBhbnl3 YXkuClRob3NlIHRoYXQgY2FuIHdvdWxkIGZhaWwgdG8gY2xlYW4gdXAgdGhpbmdzIGlmIHRoZXkg YWN0dWFsbHkgZ290CmludGVycnVwdGVkLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIg PG1pY2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2Rpc3BsYXkuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZmIuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9n YXJ0LmMgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5j ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHJpbWUuYyAg IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9zYS5jICAgICAgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjEwXzAuYyAgICAgIHwgIDYgKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjExXzAuYyAgICAgIHwgIDYgKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjZfMC5jICAgICAgIHwgIDYgKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjhfMC5jICAgICAgIHwgIDYgKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdmlydHVhbC5jICAgIHwgIDIgKy0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMgICAgICAgfCAgNiArKystLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMgICAgICAgfCAxMCArKysrKy0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jICAgICAgIHwgIDggKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgICAgICAgfCAgOCArKysr LS0tLQogMTYgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kaXNwbGF5LmMKaW5kZXggNzcx YTZhYWU1OGQ2Li5hZjY0NDQ4YTU2NWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2Rpc3BsYXkuYwpAQCAtMTIzLDcgKzEyMyw3IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV91 bnBpbl93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJaW50IHI7CiAKIAkv KiB1bnBpbiBvZiB0aGUgb2xkIGJ1ZmZlciAqLwotCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZSh3b3Jr LT5vbGRfYWJvLCBmYWxzZSk7CisJciA9IGFtZGdwdV9ib19yZXNlcnZlKHdvcmstPm9sZF9hYm8s IHRydWUpOwogCWlmIChsaWtlbHkociA9PSAwKSkgewogCQlyID0gYW1kZ3B1X2JvX3VucGluKHdv cmstPm9sZF9hYm8pOwogCQlpZiAodW5saWtlbHkociAhPSAwKSkgewpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZiLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZmIuYwppbmRleCA5ZGVhMmY2NjFmMWQuLmU4NjllNjA5OTRjZSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZiLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZiLmMKQEAgLTExMyw3ICsxMTMsNyBAQCBz dGF0aWMgdm9pZCBhbWRncHVmYl9kZXN0cm95X3Bpbm5lZF9vYmplY3Qoc3RydWN0IGRybV9nZW1f b2JqZWN0ICpnb2JqKQogCXN0cnVjdCBhbWRncHVfYm8gKmFibyA9IGdlbV90b19hbWRncHVfYm8o Z29iaik7CiAJaW50IHJldDsKIAotCXJldCA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgZmFsc2Up OworCXJldCA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgdHJ1ZSk7CiAJaWYgKGxpa2VseShyZXQg PT0gMCkpIHsKIAkJYW1kZ3B1X2JvX2t1bm1hcChhYm8pOwogCQlhbWRncHVfYm9fdW5waW4oYWJv KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nYXJ0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2FydC5jCmluZGV4IDZkNjkxYWJl ODg5Yy4uZTc0MDZjZTcwOTNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZ2FydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9n YXJ0LmMKQEAgLTE4Myw3ICsxODMsNyBAQCB2b2lkIGFtZGdwdV9nYXJ0X3RhYmxlX3ZyYW1fdW5w aW4oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaWYgKGFkZXYtPmdhcnQucm9iaiA9PSBO VUxMKSB7CiAJCXJldHVybjsKIAl9Ci0JciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdhcnQu cm9iaiwgZmFsc2UpOworCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nYXJ0LnJvYmosIHRy dWUpOwogCWlmIChsaWtlbHkociA9PSAwKSkgewogCQlhbWRncHVfYm9fa3VubWFwKGFkZXYtPmdh cnQucm9iaik7CiAJCWFtZGdwdV9ib191bnBpbihhZGV2LT5nYXJ0LnJvYmopOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCmluZGV4IGVjNWIxYmMwZTQyOC4uZDQwYjhhYzc0 NWNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCkBAIC04MTksNyAr ODE5LDcgQEAgdm9pZCBhbWRncHVfZHJpdmVyX3Bvc3RjbG9zZV9rbXMoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAogCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRldikpIHsKIAkJLyogVE9ETzogaG93 IHRvIGhhbmRsZSByZXNlcnZlIGZhaWx1cmUgKi8KLQkJQlVHX09OKGFtZGdwdV9ib19yZXNlcnZl KGFkZXYtPnZpcnQuY3NhX29iaiwgZmFsc2UpKTsKKwkJQlVHX09OKGFtZGdwdV9ib19yZXNlcnZl KGFkZXYtPnZpcnQuY3NhX29iaiwgdHJ1ZSkpOwogCQlhbWRncHVfdm1fYm9fcm12KGFkZXYsIGZw cml2LT52bS5jc2FfYm9fdmEpOwogCQlmcHJpdi0+dm0uY3NhX2JvX3ZhID0gTlVMTDsKIAkJYW1k Z3B1X2JvX3VucmVzZXJ2ZShhZGV2LT52aXJ0LmNzYV9vYmopOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ByaW1lLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfcHJpbWUuYwppbmRleCAzODI2ZDVhZWEwYTYuLjZiZGM4NjY1NzBhYiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ByaW1lLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ByaW1lLmMKQEAgLTExMyw3ICsx MTMsNyBAQCB2b2lkIGFtZGdwdV9nZW1fcHJpbWVfdW5waW4oc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmopCiAJc3RydWN0IGFtZGdwdV9ibyAqYm8gPSBnZW1fdG9fYW1kZ3B1X2JvKG9iaik7CiAJ aW50IHJldCA9IDA7CiAKLQlyZXQgPSBhbWRncHVfYm9fcmVzZXJ2ZShibywgZmFsc2UpOworCXJl dCA9IGFtZGdwdV9ib19yZXNlcnZlKGJvLCB0cnVlKTsKIAlpZiAodW5saWtlbHkocmV0ICE9IDAp KQogCQlyZXR1cm47CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9zYS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3NhLmMKaW5kZXgg N2I1NmQ5OTg4YWJhLi5kZTRlYmNmNGFjMmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9zYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9zYS5jCkBAIC0xMzAsNyArMTMwLDcgQEAgaW50IGFtZGdwdV9zYV9ib19tYW5hZ2VyX3N1 c3BlbmQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCXJldHVybiAtRUlOVkFMOwogCX0K IAotCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShzYV9tYW5hZ2VyLT5ibywgZmFsc2UpOworCXIgPSBh bWRncHVfYm9fcmVzZXJ2ZShzYV9tYW5hZ2VyLT5ibywgdHJ1ZSk7CiAJaWYgKCFyKSB7CiAJCWFt ZGdwdV9ib19rdW5tYXAoc2FfbWFuYWdlci0+Ym8pOwogCQlhbWRncHVfYm9fdW5waW4oc2FfbWFu YWdlci0+Ym8pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3R0bS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCmluZGV4IDU4 ODczY2YwMjdlOC4uMTFjNmM0NDk0ZTBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfdHRtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3R0bS5jCkBAIC0xMTk4LDcgKzExOTgsNyBAQCB2b2lkIGFtZGdwdV90dG1fZmluaShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJcmV0dXJuOwogCWFtZGdwdV90dG1fZGVidWdmc19m aW5pKGFkZXYpOwogCWlmIChhZGV2LT5zdG9sbGVuX3ZnYV9tZW1vcnkpIHsKLQkJciA9IGFtZGdw dV9ib19yZXNlcnZlKGFkZXYtPnN0b2xsZW5fdmdhX21lbW9yeSwgZmFsc2UpOworCQlyID0gYW1k Z3B1X2JvX3Jlc2VydmUoYWRldi0+c3RvbGxlbl92Z2FfbWVtb3J5LCB0cnVlKTsKIAkJaWYgKHIg PT0gMCkgewogCQkJYW1kZ3B1X2JvX3VucGluKGFkZXYtPnN0b2xsZW5fdmdhX21lbW9yeSk7CiAJ CQlhbWRncHVfYm9fdW5yZXNlcnZlKGFkZXYtPnN0b2xsZW5fdmdhX21lbW9yeSk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjEwXzAuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2RjZV92MTBfMC5jCmluZGV4IDdkODZiYTQyZWZjOS4uZDYxOGY5MmFl NDZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjEwXzAuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjEwXzAuYwpAQCAtMjIzMSw3ICsy MjMxLDcgQEAgc3RhdGljIGludCBkY2VfdjEwXzBfY3J0Y19kb19zZXRfYmFzZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJaWYgKCFhdG9taWMgJiYgZmIgJiYgZmIgIT0gY3J0Yy0+cHJpbWFyeS0+ ZmIpIHsKIAkJYW1kZ3B1X2ZiID0gdG9fYW1kZ3B1X2ZyYW1lYnVmZmVyKGZiKTsKIAkJYWJvID0g Z2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfZmItPm9iaik7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2 ZShhYm8sIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgdHJ1ZSk7CiAJCWlm ICh1bmxpa2VseShyICE9IDApKQogCQkJcmV0dXJuIHI7CiAJCWFtZGdwdV9ib191bnBpbihhYm8p OwpAQCAtMjU5MCw3ICsyNTkwLDcgQEAgc3RhdGljIGludCBkY2VfdjEwXzBfY3J0Y19jdXJzb3Jf c2V0MihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB1bnBpbjoKIAlpZiAoYW1kZ3B1X2NydGMtPmN1 cnNvcl9ibykgewogCQlzdHJ1Y3QgYW1kZ3B1X2JvICphb2JqID0gZ2VtX3RvX2FtZGdwdV9ibyhh bWRncHVfY3J0Yy0+Y3Vyc29yX2JvKTsKLQkJcmV0ID0gYW1kZ3B1X2JvX3Jlc2VydmUoYW9iaiwg ZmFsc2UpOworCQlyZXQgPSBhbWRncHVfYm9fcmVzZXJ2ZShhb2JqLCB0cnVlKTsKIAkJaWYgKGxp a2VseShyZXQgPT0gMCkpIHsKIAkJCWFtZGdwdV9ib191bnBpbihhb2JqKTsKIAkJCWFtZGdwdV9i b191bnJlc2VydmUoYW9iaik7CkBAIC0yNzIwLDcgKzI3MjAsNyBAQCBzdGF0aWMgdm9pZCBkY2Vf djEwXzBfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCQlhbWRncHVfZmIg PSB0b19hbWRncHVfZnJhbWVidWZmZXIoY3J0Yy0+cHJpbWFyeS0+ZmIpOwogCQlhYm8gPSBnZW1f dG9fYW1kZ3B1X2JvKGFtZGdwdV9mYi0+b2JqKTsKLQkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFi bywgZmFsc2UpOworCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWJvLCB0cnVlKTsKIAkJaWYgKHVu bGlrZWx5KHIpKQogCQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcmVzZXJ2ZSBhYm8gYmVmb3JlIHVu cGluXG4iKTsKIAkJZWxzZSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjExXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jCmlu ZGV4IDNkODIxODFiYWZmZS4uZWE2MzQxNThhZTdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9kY2VfdjExXzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjExXzAuYwpAQCAtMjIxNSw3ICsyMjE1LDcgQEAgc3RhdGljIGludCBkY2VfdjExXzBf Y3J0Y19kb19zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKCFhdG9taWMgJiYg ZmIgJiYgZmIgIT0gY3J0Yy0+cHJpbWFyeS0+ZmIpIHsKIAkJYW1kZ3B1X2ZiID0gdG9fYW1kZ3B1 X2ZyYW1lYnVmZmVyKGZiKTsKIAkJYWJvID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfZmItPm9i aik7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhYm8sIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9i b19yZXNlcnZlKGFibywgdHJ1ZSk7CiAJCWlmICh1bmxpa2VseShyICE9IDApKQogCQkJcmV0dXJu IHI7CiAJCWFtZGdwdV9ib191bnBpbihhYm8pOwpAQCAtMjYxMCw3ICsyNjEwLDcgQEAgc3RhdGlj IGludCBkY2VfdjExXzBfY3J0Y19jdXJzb3Jfc2V0MihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB1 bnBpbjoKIAlpZiAoYW1kZ3B1X2NydGMtPmN1cnNvcl9ibykgewogCQlzdHJ1Y3QgYW1kZ3B1X2Jv ICphb2JqID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfY3J0Yy0+Y3Vyc29yX2JvKTsKLQkJcmV0 ID0gYW1kZ3B1X2JvX3Jlc2VydmUoYW9iaiwgZmFsc2UpOworCQlyZXQgPSBhbWRncHVfYm9fcmVz ZXJ2ZShhb2JqLCB0cnVlKTsKIAkJaWYgKGxpa2VseShyZXQgPT0gMCkpIHsKIAkJCWFtZGdwdV9i b191bnBpbihhb2JqKTsKIAkJCWFtZGdwdV9ib191bnJlc2VydmUoYW9iaik7CkBAIC0yNzQwLDcg KzI3NDAsNyBAQCBzdGF0aWMgdm9pZCBkY2VfdjExXzBfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAogCQlhbWRncHVfZmIgPSB0b19hbWRncHVfZnJhbWVidWZmZXIoY3J0Yy0+ cHJpbWFyeS0+ZmIpOwogCQlhYm8gPSBnZW1fdG9fYW1kZ3B1X2JvKGFtZGdwdV9mYi0+b2JqKTsK LQkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgZmFsc2UpOworCQlyID0gYW1kZ3B1X2JvX3Jl c2VydmUoYWJvLCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIpKQogCQkJRFJNX0VSUk9SKCJmYWls ZWQgdG8gcmVzZXJ2ZSBhYm8gYmVmb3JlIHVucGluXG4iKTsKIAkJZWxzZSB7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjZfMC5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZGNlX3Y2XzAuYwppbmRleCA1OWY2OTkzYWYwYjYuLmQ2OGMxZWFiZDBjZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3Y2XzAuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjZfMC5jCkBAIC0yMTUwLDcgKzIxNTAsNyBA QCBzdGF0aWMgaW50IGRjZV92Nl8wX2NydGNfZG9fc2V0X2Jhc2Uoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCWlmICghYXRvbWljICYmIGZiICYmIGZiICE9IGNydGMtPnByaW1hcnktPmZiKSB7CiAJ CWFtZGdwdV9mYiA9IHRvX2FtZGdwdV9mcmFtZWJ1ZmZlcihmYik7CiAJCWFibyA9IGdlbV90b19h bWRncHVfYm8oYW1kZ3B1X2ZiLT5vYmopOwotCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWJvLCBm YWxzZSk7CisJCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhYm8sIHRydWUpOwogCQlpZiAodW5saWtl bHkociAhPSAwKSkKIAkJCXJldHVybiByOwogCQlhbWRncHVfYm9fdW5waW4oYWJvKTsKQEAgLTI0 NjcsNyArMjQ2Nyw3IEBAIHN0YXRpYyBpbnQgZGNlX3Y2XzBfY3J0Y19jdXJzb3Jfc2V0MihzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiB1bnBpbjoKIAlpZiAoYW1kZ3B1X2NydGMtPmN1cnNvcl9ibykg ewogCQlzdHJ1Y3QgYW1kZ3B1X2JvICphb2JqID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfY3J0 Yy0+Y3Vyc29yX2JvKTsKLQkJcmV0ID0gYW1kZ3B1X2JvX3Jlc2VydmUoYW9iaiwgZmFsc2UpOwor CQlyZXQgPSBhbWRncHVfYm9fcmVzZXJ2ZShhb2JqLCB0cnVlKTsKIAkJaWYgKGxpa2VseShyZXQg PT0gMCkpIHsKIAkJCWFtZGdwdV9ib191bnBpbihhb2JqKTsKIAkJCWFtZGdwdV9ib191bnJlc2Vy dmUoYW9iaik7CkBAIC0yNTkyLDcgKzI1OTIsNyBAQCBzdGF0aWMgdm9pZCBkY2VfdjZfMF9jcnRj X2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJCWFtZGdwdV9mYiA9IHRvX2FtZGdw dV9mcmFtZWJ1ZmZlcihjcnRjLT5wcmltYXJ5LT5mYik7CiAJCWFibyA9IGdlbV90b19hbWRncHVf Ym8oYW1kZ3B1X2ZiLT5vYmopOwotCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWJvLCBmYWxzZSk7 CisJCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhYm8sIHRydWUpOwogCQlpZiAodW5saWtlbHkocikp CiAJCQlEUk1fRVJST1IoImZhaWxlZCB0byByZXNlcnZlIGFibyBiZWZvcmUgdW5waW5cbiIpOwog CQllbHNlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92OF8w LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjhfMC5jCmluZGV4IDE2MjlmZjlj Mzk0OS4uMWU2YzQwZTMyY2ZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92OF8wLmMK QEAgLTIwOTAsNyArMjA5MCw3IEBAIHN0YXRpYyBpbnQgZGNlX3Y4XzBfY3J0Y19kb19zZXRfYmFz ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKCFhdG9taWMgJiYgZmIgJiYgZmIgIT0gY3J0 Yy0+cHJpbWFyeS0+ZmIpIHsKIAkJYW1kZ3B1X2ZiID0gdG9fYW1kZ3B1X2ZyYW1lYnVmZmVyKGZi KTsKIAkJYWJvID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfZmItPm9iaik7Ci0JCXIgPSBhbWRn cHVfYm9fcmVzZXJ2ZShhYm8sIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywg dHJ1ZSk7CiAJCWlmICh1bmxpa2VseShyICE9IDApKQogCQkJcmV0dXJuIHI7CiAJCWFtZGdwdV9i b191bnBpbihhYm8pOwpAQCAtMjQ0MSw3ICsyNDQxLDcgQEAgc3RhdGljIGludCBkY2VfdjhfMF9j cnRjX2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIHVucGluOgogCWlmIChhbWRn cHVfY3J0Yy0+Y3Vyc29yX2JvKSB7CiAJCXN0cnVjdCBhbWRncHVfYm8gKmFvYmogPSBnZW1fdG9f YW1kZ3B1X2JvKGFtZGdwdV9jcnRjLT5jdXJzb3JfYm8pOwotCQlyZXQgPSBhbWRncHVfYm9fcmVz ZXJ2ZShhb2JqLCBmYWxzZSk7CisJCXJldCA9IGFtZGdwdV9ib19yZXNlcnZlKGFvYmosIHRydWUp OwogCQlpZiAobGlrZWx5KHJldCA9PSAwKSkgewogCQkJYW1kZ3B1X2JvX3VucGluKGFvYmopOwog CQkJYW1kZ3B1X2JvX3VucmVzZXJ2ZShhb2JqKTsKQEAgLTI1NzEsNyArMjU3MSw3IEBAIHN0YXRp YyB2b2lkIGRjZV92OF8wX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAkJ YW1kZ3B1X2ZiID0gdG9fYW1kZ3B1X2ZyYW1lYnVmZmVyKGNydGMtPnByaW1hcnktPmZiKTsKIAkJ YWJvID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfZmItPm9iaik7Ci0JCXIgPSBhbWRncHVfYm9f cmVzZXJ2ZShhYm8sIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgdHJ1ZSk7 CiAJCWlmICh1bmxpa2VseShyKSkKIAkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHJlc2VydmUgYWJv IGJlZm9yZSB1bnBpblxuIik7CiAJCWVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZGNlX3ZpcnR1YWwuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Rj ZV92aXJ0dWFsLmMKaW5kZXggOGJiOWNmZGU1MDhkLi4wODQ1MTgzMDFmNGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92aXJ0dWFsLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZGNlX3ZpcnR1YWwuYwpAQCAtMjQ3LDcgKzI0Nyw3IEBAIHN0YXRp YyB2b2lkIGRjZV92aXJ0dWFsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAK IAkJYW1kZ3B1X2ZiID0gdG9fYW1kZ3B1X2ZyYW1lYnVmZmVyKGNydGMtPnByaW1hcnktPmZiKTsK IAkJYWJvID0gZ2VtX3RvX2FtZGdwdV9ibyhhbWRncHVfZmItPm9iaik7Ci0JCXIgPSBhbWRncHVf Ym9fcmVzZXJ2ZShhYm8sIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFibywgdHJ1 ZSk7CiAJCWlmICh1bmxpa2VseShyKSkKIAkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHJlc2VydmUg YWJvIGJlZm9yZSB1bnBpblxuIik7CiAJCWVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92Nl8wLmMKaW5kZXggMjVjMzcwM2Y4MzhiLi4wM2QyYTBhMmU1MjMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYwpAQCAtMjQzNyw3ICsyNDM3LDcgQEAgc3RhdGljIHZvaWQg Z2Z4X3Y2XzBfcmxjX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IHI7CiAK IAlpZiAoYWRldi0+Z2Z4LnJsYy5zYXZlX3Jlc3RvcmVfb2JqKSB7Ci0JCXIgPSBhbWRncHVfYm9f cmVzZXJ2ZShhZGV2LT5nZngucmxjLnNhdmVfcmVzdG9yZV9vYmosIGZhbHNlKTsKKwkJciA9IGFt ZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5ybGMuc2F2ZV9yZXN0b3JlX29iaiwgdHJ1ZSk7CiAJ CWlmICh1bmxpa2VseShyICE9IDApKQogCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSByZXNl cnZlIFJMQyBzciBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVfYm9fdW5waW4oYWRldi0+Z2Z4 LnJsYy5zYXZlX3Jlc3RvcmVfb2JqKTsKQEAgLTI0NDgsNyArMjQ0OCw3IEBAIHN0YXRpYyB2b2lk IGdmeF92Nl8wX3JsY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAogCWlm IChhZGV2LT5nZngucmxjLmNsZWFyX3N0YXRlX29iaikgewotCQlyID0gYW1kZ3B1X2JvX3Jlc2Vy dmUoYWRldi0+Z2Z4LnJsYy5jbGVhcl9zdGF0ZV9vYmosIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9i b19yZXNlcnZlKGFkZXYtPmdmeC5ybGMuY2xlYXJfc3RhdGVfb2JqLCB0cnVlKTsKIAkJaWYgKHVu bGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2VydmUgUkxD IGMgYm8gZmFpbGVkXG4iLCByKTsKIAkJYW1kZ3B1X2JvX3VucGluKGFkZXYtPmdmeC5ybGMuY2xl YXJfc3RhdGVfb2JqKTsKQEAgLTI0NTksNyArMjQ1OSw3IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8w X3JsY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAogCWlmIChhZGV2LT5n ZngucmxjLmNwX3RhYmxlX29iaikgewotCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWRldi0+Z2Z4 LnJsYy5jcF90YWJsZV9vYmosIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYt PmdmeC5ybGMuY3BfdGFibGVfb2JqLCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJ CQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2VydmUgUkxDIGNwIHRhYmxlIGJvIGZhaWxl ZFxuIiwgcik7CiAJCWFtZGdwdV9ib191bnBpbihhZGV2LT5nZngucmxjLmNwX3RhYmxlX29iaik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYwppbmRleCA3NWNjYTU0ZmEyMTYuLmIy ZGY4ZTgxNGFiYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3 XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCkBAIC0yNzky LDcgKzI3OTIsNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9jcF9jb21wdXRlX2Zpbmkoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZhZGV2 LT5nZnguY29tcHV0ZV9yaW5nW2ldOwogCiAJCWlmIChyaW5nLT5tcWRfb2JqKSB7Ci0JCQlyID0g YW1kZ3B1X2JvX3Jlc2VydmUocmluZy0+bXFkX29iaiwgZmFsc2UpOworCQkJciA9IGFtZGdwdV9i b19yZXNlcnZlKHJpbmctPm1xZF9vYmosIHRydWUpOwogCQkJaWYgKHVubGlrZWx5KHIgIT0gMCkp CiAJCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIE1RRCBibyBmYWlsZWRcbiIs IHIpOwogCkBAIC0yODEwLDcgKzI4MTAsNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9tZWNfZmlu aShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQgcjsKIAogCWlmIChhZGV2LT5nZngu bWVjLmhwZF9lb3Bfb2JqKSB7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngubWVj LmhwZF9lb3Bfb2JqLCBmYWxzZSk7CisJCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngu bWVjLmhwZF9lb3Bfb2JqLCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZf d2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2VydmUgSFBEIEVPUCBibyBmYWlsZWRcbiIsIHIpOwog CQlhbWRncHVfYm9fdW5waW4oYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaik7CkBAIC0zMzU5LDcg KzMzNTksNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9ybGNfZmluaShzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIAogCS8qIHNhdmUgcmVzdG9yZSBibG9jayAqLwogCWlmIChhZGV2LT5nZngu cmxjLnNhdmVfcmVzdG9yZV9vYmopIHsKLQkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdm eC5ybGMuc2F2ZV9yZXN0b3JlX29iaiwgZmFsc2UpOworCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUo YWRldi0+Z2Z4LnJsYy5zYXZlX3Jlc3RvcmVfb2JqLCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIg IT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2VydmUgUkxDIHNyIGJvIGZh aWxlZFxuIiwgcik7CiAJCWFtZGdwdV9ib191bnBpbihhZGV2LT5nZngucmxjLnNhdmVfcmVzdG9y ZV9vYmopOwpAQCAtMzM3MSw3ICszMzcxLDcgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y3XzBfcmxjX2Zp bmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAkvKiBjbGVhciBzdGF0ZSBibG9jayAq LwogCWlmIChhZGV2LT5nZngucmxjLmNsZWFyX3N0YXRlX29iaikgewotCQlyID0gYW1kZ3B1X2Jv X3Jlc2VydmUoYWRldi0+Z2Z4LnJsYy5jbGVhcl9zdGF0ZV9vYmosIGZhbHNlKTsKKwkJciA9IGFt ZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5ybGMuY2xlYXJfc3RhdGVfb2JqLCB0cnVlKTsKIAkJ aWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2Vy dmUgUkxDIGMgYm8gZmFpbGVkXG4iLCByKTsKIAkJYW1kZ3B1X2JvX3VucGluKGFkZXYtPmdmeC5y bGMuY2xlYXJfc3RhdGVfb2JqKTsKQEAgLTMzODMsNyArMzM4Myw3IEBAIHN0YXRpYyB2b2lkIGdm eF92N18wX3JsY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiAJLyogY2xlYXIg c3RhdGUgYmxvY2sgKi8KIAlpZiAoYWRldi0+Z2Z4LnJsYy5jcF90YWJsZV9vYmopIHsKLQkJciA9 IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5ybGMuY3BfdGFibGVfb2JqLCBmYWxzZSk7CisJ CXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngucmxjLmNwX3RhYmxlX29iaiwgdHJ1ZSk7 CiAJCWlmICh1bmxpa2VseShyICE9IDApKQogCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBy ZXNlcnZlIFJMQyBjcCB0YWJsZSBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVfYm9fdW5waW4o YWRldi0+Z2Z4LnJsYy5jcF90YWJsZV9vYmopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMKaW5kZXggMmE1YjIwOTIwZWE2Li5hYzY0ZTAxYzY5MzggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYwpAQCAtMTI0NCw3ICsxMjQ0LDcgQEAgc3RhdGljIHZvaWQgZ2Z4 X3Y4XzBfcmxjX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAkvKiBjbGVhciBz dGF0ZSBibG9jayAqLwogCWlmIChhZGV2LT5nZngucmxjLmNsZWFyX3N0YXRlX29iaikgewotCQly ID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWRldi0+Z2Z4LnJsYy5jbGVhcl9zdGF0ZV9vYmosIGZhbHNl KTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5ybGMuY2xlYXJfc3RhdGVfb2Jq LCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYs ICIoJWQpIHJlc2VydmUgUkxDIGNicyBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVfYm9fdW5w aW4oYWRldi0+Z2Z4LnJsYy5jbGVhcl9zdGF0ZV9vYmopOwpAQCAtMTI1NSw3ICsxMjU1LDcgQEAg c3RhdGljIHZvaWQgZ2Z4X3Y4XzBfcmxjX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAKIAkvKiBqdW1wIHRhYmxlIGJsb2NrICovCiAJaWYgKGFkZXYtPmdmeC5ybGMuY3BfdGFibGVf b2JqKSB7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngucmxjLmNwX3RhYmxlX29i aiwgZmFsc2UpOworCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYWRldi0+Z2Z4LnJsYy5jcF90YWJs ZV9vYmosIHRydWUpOwogCQlpZiAodW5saWtlbHkociAhPSAwKSkKIAkJCWRldl93YXJuKGFkZXYt PmRldiwgIiglZCkgcmVzZXJ2ZSBSTEMgY3AgdGFibGUgYm8gZmFpbGVkXG4iLCByKTsKIAkJYW1k Z3B1X2JvX3VucGluKGFkZXYtPmdmeC5ybGMuY3BfdGFibGVfb2JqKTsKQEAgLTEzNjgsNyArMTM2 OCw3IEBAIHN0YXRpYyB2b2lkIGdmeF92OF8wX21lY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogCWludCByOwogCiAJaWYgKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmopIHsKLQkJ ciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmosIGZhbHNlKTsK KwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmosIHRydWUp OwogCQlpZiAodW5saWtlbHkociAhPSAwKSkKIAkJCWRldl93YXJuKGFkZXYtPmRldiwgIiglZCkg cmVzZXJ2ZSBIUEQgRU9QIGJvIGZhaWxlZFxuIiwgcik7CiAJCWFtZGdwdV9ib191bnBpbihhZGV2 LT5nZngubWVjLmhwZF9lb3Bfb2JqKTsKQEAgLTE0OTYsNyArMTQ5Niw3IEBAIHN0YXRpYyBpbnQg Z2Z4X3Y4XzBfa2lxX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAltZW1zZXQo aHBkLCAwLCBNRUNfSFBEX1NJWkUpOwogCi0JciA9IGFtZGdwdV9ib19yZXNlcnZlKGtpcS0+ZW9w X29iaiwgZmFsc2UpOworCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShraXEtPmVvcF9vYmosIHRydWUp OwogCWlmICh1bmxpa2VseShyICE9IDApKQogCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJl c2VydmUga2lxIGVvcCBibyBmYWlsZWRcbiIsIHIpOwogCWFtZGdwdV9ib19rdW5tYXAoa2lxLT5l b3Bfb2JqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8w LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmluZGV4IDUyNDliYzc5 NjRmYi4uMDhkYWEzZmQ2ODdiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjlfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMK QEAgLTQ1Myw3ICs0NTMsNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjlfMF9tZWNfZmluaShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQgcjsKIAogCWlmIChhZGV2LT5nZngubWVjLmhwZF9l b3Bfb2JqKSB7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngubWVjLmhwZF9lb3Bf b2JqLCBmYWxzZSk7CisJCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngubWVjLmhwZF9l b3Bfb2JqLCB0cnVlKTsKIAkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2 LT5kZXYsICIoJWQpIHJlc2VydmUgSFBEIEVPUCBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVf Ym9fdW5waW4oYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaik7CkBAIC00NjMsNyArNDYzLDcgQEAg c3RhdGljIHZvaWQgZ2Z4X3Y5XzBfbWVjX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAJCWFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmogPSBOVUxMOwogCX0KIAlpZiAoYWRldi0+Z2Z4 Lm1lYy5tZWNfZndfb2JqKSB7Ci0JCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZShhZGV2LT5nZngubWVj Lm1lY19md19vYmosIGZhbHNlKTsKKwkJciA9IGFtZGdwdV9ib19yZXNlcnZlKGFkZXYtPmdmeC5t ZWMubWVjX2Z3X29iaiwgdHJ1ZSk7CiAJCWlmICh1bmxpa2VseShyICE9IDApKQogCQkJZGV2X3dh cm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIG1lYyBmaXJtd2FyZSBibyBmYWlsZWRcbiIsIHIp OwogCQlhbWRncHVfYm9fdW5waW4oYWRldi0+Z2Z4Lm1lYy5tZWNfZndfb2JqKTsKQEAgLTU5OSw3 ICs1OTksNyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCiAJbWVtc2V0KGhwZCwgMCwgTUVDX0hQRF9TSVpFKTsKIAotCXIgPSBhbWRn cHVfYm9fcmVzZXJ2ZShraXEtPmVvcF9vYmosIGZhbHNlKTsKKwlyID0gYW1kZ3B1X2JvX3Jlc2Vy dmUoa2lxLT5lb3Bfb2JqLCB0cnVlKTsKIAlpZiAodW5saWtlbHkociAhPSAwKSkKIAkJZGV2X3dh cm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIGtpcSBlb3AgYm8gZmFpbGVkXG4iLCByKTsKIAlh bWRncHVfYm9fa3VubWFwKGtpcS0+ZW9wX29iaik7CkBAIC0xNzg2LDcgKzE3ODYsNyBAQCBzdGF0 aWMgdm9pZCBnZnhfdjlfMF9jcF9jb21wdXRlX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiAJCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5n W2ldOwogCiAJCWlmIChyaW5nLT5tcWRfb2JqKSB7Ci0JCQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUo cmluZy0+bXFkX29iaiwgZmFsc2UpOworCQkJciA9IGFtZGdwdV9ib19yZXNlcnZlKHJpbmctPm1x ZF9vYmosIHRydWUpOwogCQkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQkJZGV2X3dhcm4oYWRl di0+ZGV2LCAiKCVkKSByZXNlcnZlIE1RRCBibyBmYWlsZWRcbiIsIHIpOwogCi0tIAoyLjExLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZngg bWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=