From: Monk Liu Subject: [PATCH 1/6] drm/amdgpu:implement new TDR feature Date: Tue, 24 Oct 2017 13:57:02 +0800 Message-ID: <1508824627-19489-1-git-send-email-Monk.Liu@amd.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 Cc: Monk Liu MSxuZXcgaW1wbGUgbmFtZXMgYW1kZ3B1X2dwdV9yZWNvdmVyIHdoaWNoIGdpdmVzIG1vcmUgaGlu dApvbiB3aGF0IGl0IGRvZXMgY29tcGFyZWQgd2l0aCBncHVfcmVzZXQKCjIsZ3B1X3JlY292ZXIg dW5pZnkgYmFyZS1tZXRhbCBhbmQgU1ItSU9WLCBvbmx5IHRoZSByZXNldCBwYXJ0CmlzIGltcGxl bWVudGVkIGRpZmZlcmVudGx5CgozLGdwdV9yZWNvdmVyIHdpbGwgaW5jcmVhc2UgaGFuZyBqb2Ig a2FybWEgYW5kIGl0cyBjb250ZXh0IGd1aWx0eQppZiBleGNlZWRzIGxpbWl0LCB3aGljaCB3aWxs IGJlIGNhbmNlbGVkIGluIHJ1bl9qb2IoKSByb3V0aW5lIG9mCmdwdSBzY2hlZHVsZXIgd2l0aCBh biBlcnJvciAiLUVDQU5DRUxFRCIgc2V0LgoKNCxncHVfcmVjb3ZlciBrbm93cyBpZiB0aGlzIHJl c2V0IGNvbWVzIHdpdGggVlJBTSBsb3N0IG9yIG5vdCBhbmQKYWxsIGpvYnMgd2lsbCBiZSBjYW5j ZWxlZCBpbiBydW5fam9iKCkgaW4gc2NoZWQgcmVjb3ZlcnkgaWYgVlJBTSBsb3N0IGhpdC4KCkNo YW5nZS1JZDogSWYzYzkzODBlMzhmNjhmNzNkN2ExY2RiM2ZhYTUzZTVhYTMzZDFmYzUKU2lnbmVk LW9mZi1ieTogTW9uayBMaXUgPE1vbmsuTGl1QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgICAgIHwgICA0ICsKIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyAgICB8IDI1MiArKysrKysrKysrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jICAgICAgIHwgIDIx ICsrLQogZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5jIHwgICA0 ICstCiA0IGZpbGVzIGNoYW5nZWQsIDI3NiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggNmE0MTc4Yi4uNTY0NmU2MSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTE3OCw2ICsxNzgsMTAgQEAgZXh0ZXJu IGludCBhbWRncHVfY2lrX3N1cHBvcnQ7CiAjZGVmaW5lIENJS19DVVJTT1JfV0lEVEggMTI4CiAj ZGVmaW5lIENJS19DVVJTT1JfSEVJR0hUIDEyOAogCisvKiBHUFUgUkVTRVQgZmxhZ3MgKi8KKyNk ZWZpbmUgQU1ER1BVX1JFU0VUX0lORk9fVlJBTV9MT1NUICAoMSA8PCAwKQorI2RlZmluZSBBTURH UFVfUkVTRVRfSU5GT19GVUxMUkVTRVQJICgxIDw8IDEpCisKIHN0cnVjdCBhbWRncHVfZGV2aWNl Owogc3RydWN0IGFtZGdwdV9pYjsKIHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IGEwNzU0NGQuLjE1OWQzZDUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKQEAgLTMxMTYs NiArMzExNiwyNTggQEAgaW50IGFtZGdwdV9ncHVfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJcmV0dXJuIHI7CiB9CiAKK3N0YXRpYyBpbnQgYW1kZ3B1X3Jlc2V0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCB1aW50NjRfdCogcmVzZXRfZmxhZ3MpCit7CisJaW50IHI7CisJ Ym9vbCBuZWVkX2Z1bGxfcmVzZXQsIHZyYW1fbG9zdCA9IDA7CisKKwluZWVkX2Z1bGxfcmVzZXQg PSBhbWRncHVfbmVlZF9mdWxsX3Jlc2V0KGFkZXYpOworCisJaWYgKCFuZWVkX2Z1bGxfcmVzZXQp IHsKKwkJYW1kZ3B1X3ByZV9zb2Z0X3Jlc2V0KGFkZXYpOworCQlyID0gYW1kZ3B1X3NvZnRfcmVz ZXQoYWRldik7CisJCWFtZGdwdV9wb3N0X3NvZnRfcmVzZXQoYWRldik7CisJCWlmIChyIHx8IGFt ZGdwdV9jaGVja19zb2Z0X3Jlc2V0KGFkZXYpKSB7CisJCQlEUk1fSU5GTygic29mdCByZXNldCBm YWlsZWQsIHdpbGwgZmFsbGJhY2sgdG8gZnVsbCByZXNldCFcbiIpOworCQkJbmVlZF9mdWxsX3Jl c2V0ID0gdHJ1ZTsKKwkJfQorCisJfQorCisJaWYgKG5lZWRfZnVsbF9yZXNldCkgeworCQlyID0g YW1kZ3B1X3N1c3BlbmQoYWRldik7CisKK3JldHJ5OgorCQlhbWRncHVfYXRvbWJpb3Nfc2NyYXRj aF9yZWdzX3NhdmUoYWRldik7CisJCXIgPSBhbWRncHVfYXNpY19yZXNldChhZGV2KTsKKwkJYW1k Z3B1X2F0b21iaW9zX3NjcmF0Y2hfcmVnc19yZXN0b3JlKGFkZXYpOworCQkvKiBwb3N0IGNhcmQg Ki8KKwkJYW1kZ3B1X2F0b21fYXNpY19pbml0KGFkZXYtPm1vZGVfaW5mby5hdG9tX2NvbnRleHQp OworCisJCWlmICghcikgeworCQkJZGV2X2luZm8oYWRldi0+ZGV2LCAiR1BVIHJlc2V0IHN1Y2Nl ZWRlZCwgdHJ5aW5nIHRvIHJlc3VtZVxuIik7CisJCQlyID0gYW1kZ3B1X3Jlc3VtZV9waGFzZTEo YWRldik7CisJCQlpZiAocikKKwkJCQlnb3RvIG91dDsKKworCQkJdnJhbV9sb3N0ID0gYW1kZ3B1 X2NoZWNrX3ZyYW1fbG9zdChhZGV2KTsKKwkJCWlmICh2cmFtX2xvc3QpIHsKKwkJCQlEUk1fRVJS T1IoIlZSQU0gaXMgbG9zdCFcbiIpOworCQkJCWF0b21pY19pbmMoJmFkZXYtPnZyYW1fbG9zdF9j b3VudGVyKTsKKwkJCX0KKworCQkJciA9IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KGFkZXYpOwor CQkJaWYgKHIpCisJCQkJZ290byBvdXQ7CisKKwkJCXIgPSBhbWRncHVfcmVzdW1lX3BoYXNlMihh ZGV2KTsKKwkJCWlmIChyKQorCQkJCWdvdG8gb3V0OworCisJCQlpZiAodnJhbV9sb3N0KQorCQkJ CWFtZGdwdV9maWxsX3Jlc2V0X21hZ2ljKGFkZXYpOworCQl9CisJfQorCitvdXQ6CisJaWYgKCFy KSB7CisJCWFtZGdwdV9pcnFfZ3B1X3Jlc2V0X3Jlc3VtZV9oZWxwZXIoYWRldik7CisJCXIgPSBh bWRncHVfaWJfcmluZ190ZXN0cyhhZGV2KTsKKwkJaWYgKHIpIHsKKwkJCWRldl9lcnIoYWRldi0+ ZGV2LCAiaWIgcmluZyB0ZXN0IGZhaWxlZCAoJWQpLlxuIiwgcik7CisJCQlyID0gYW1kZ3B1X3N1 c3BlbmQoYWRldik7CisJCQluZWVkX2Z1bGxfcmVzZXQgPSB0cnVlOworCQkJZ290byByZXRyeTsK KwkJfQorCX0KKworCWlmIChyZXNldF9mbGFncykgeworCQlpZiAodnJhbV9sb3N0KQorCQkJKCpy ZXNldF9mbGFncykgfD0gQU1ER1BVX1JFU0VUX0lORk9fVlJBTV9MT1NUOworCisJCWlmIChuZWVk X2Z1bGxfcmVzZXQpCisJCQkoKnJlc2V0X2ZsYWdzKSB8PSBBTURHUFVfUkVTRVRfSU5GT19GVUxM UkVTRVQ7CisJfQorCisJcmV0dXJuIHI7Cit9CisKK3N0YXRpYyBpbnQgYW1kZ3B1X3Jlc2V0X3Ny aW92KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50NjRfdCAqcmVzZXRfZmxhZ3MsIGJv b2wgZnJvbV9oeXBlcnZpc29yKQoreworCWludCByOworCisJaWYgKGZyb21faHlwZXJ2aXNvcikK KwkJciA9IGFtZGdwdV92aXJ0X3JlcXVlc3RfZnVsbF9ncHUoYWRldiwgdHJ1ZSk7CisJZWxzZQor CQlyID0gYW1kZ3B1X3ZpcnRfcmVzZXRfZ3B1KGFkZXYpOworCWlmIChyKQorCQlyZXR1cm4gcjsK KworCS8qIFJlc3VtZSBJUCBwcmlvciB0byBTTUMgKi8KKwlyID0gYW1kZ3B1X3NyaW92X3JlaW5p dF9lYXJseShhZGV2KTsKKwlpZiAocikKKwkJZ290byBlcnJvcjsKKworCS8qIHdlIG5lZWQgcmVj b3ZlciBnYXJ0IHByaW9yIHRvIHJ1biBTTUMvQ1AvU0RNQSByZXN1bWUgKi8KKwlhbWRncHVfdHRt X3JlY292ZXJfZ2FydChhZGV2KTsKKworCS8qIG5vdyB3ZSBhcmUgb2theSB0byByZXN1bWUgU01D L0NQL1NETUEgKi8KKwlyID0gYW1kZ3B1X3NyaW92X3JlaW5pdF9sYXRlKGFkZXYpOworCWlmIChy KQorCQlnb3RvIGVycm9yOworCisJYW1kZ3B1X2lycV9ncHVfcmVzZXRfcmVzdW1lX2hlbHBlcihh ZGV2KTsKKwlyID0gYW1kZ3B1X2liX3JpbmdfdGVzdHMoYWRldik7CisJaWYgKHIpCisJCWRldl9l cnIoYWRldi0+ZGV2LCAiW0dQVV9SRVNFVF0gaWIgcmluZyB0ZXN0IGZhaWxlZCAoJWQpLlxuIiwg cik7CisKK2Vycm9yOgorCS8qIHJlbGVhc2UgZnVsbCBjb250cm9sIG9mIEdQVSBhZnRlciBpYiB0 ZXN0ICovCisJYW1kZ3B1X3ZpcnRfcmVsZWFzZV9mdWxsX2dwdShhZGV2LCB0cnVlKTsKKworCWlm IChyZXNldF9mbGFncykgeworCQkvKiB3aWxsIGdldCB2cmFtX2xvc3QgZnJvbSBHSU0gaW4gZnV0 dXJlLCBub3cgYWxsCisJCSAqIHJlc2V0IHJlcXVlc3QgY29uc2lkZXJlZCBWUkFNIExPU1QKKwkJ ICovCisJCSgqcmVzZXRfZmxhZ3MpIHw9IH5BTURHUFVfUkVTRVRfSU5GT19WUkFNX0xPU1Q7CisJ CWF0b21pY19pbmMoJmFkZXYtPnZyYW1fbG9zdF9jb3VudGVyKTsKKworCQkvKiBWRiBGTFIgb3Ig aG90bGluayByZXNldCBpcyBhbHdheXMgZnVsbC1yZXNldCAqLworCQkoKnJlc2V0X2ZsYWdzKSB8 PSBBTURHUFVfUkVTRVRfSU5GT19GVUxMUkVTRVQ7CisJfQorCisJcmV0dXJuIHI7Cit9CisKK2lu dCBhbWRncHVfZ3B1X3JlY292ZXIoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBh bWRncHVfam9iICpqb2IpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gTlVM TDsKKwl1aW50NjRfdCByZXNldF9mbGFncyA9IDA7CisJaW50IGksIHIsIHJlc2NoZWQ7CisKKwlp ZiAoIWFtZGdwdV9jaGVja19zb2Z0X3Jlc2V0KGFkZXYpKSB7CisJCURSTV9JTkZPKCJObyBoYXJk d2FyZSBoYW5nIGRldGVjdGVkLiBEaWQgc29tZSBibG9ja3Mgc3RhbGw/XG4iKTsKKwkJcmV0dXJu IDA7CisJfQorCisJZGV2X2luZm8oYWRldi0+ZGV2LCAiR1BVIHJlc2V0IGJlZ2luIVxuIik7CisK KwltdXRleF9sb2NrKCZhZGV2LT52aXJ0LmxvY2tfcmVzZXQpOworCWF0b21pY19pbmMoJmFkZXYt PmdwdV9yZXNldF9jb3VudGVyKTsKKwlhZGV2LT5pbl9zcmlvdl9yZXNldCA9IDE7CisKKwkvKiBi bG9jayBUVE0gKi8KKwlyZXNjaGVkID0gdHRtX2JvX2xvY2tfZGVsYXllZF93b3JrcXVldWUoJmFk ZXYtPm1tYW4uYmRldik7CisJLyogc3RvcmUgbW9kZXNldHRpbmcgKi8KKwlpZiAoYW1kZ3B1X2Rl dmljZV9oYXNfZGNfc3VwcG9ydChhZGV2KSkKKwkJc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9z dXNwZW5kKGFkZXYtPmRkZXYpOworCisJLyogYmxvY2sgc2NoZWR1bGVyICovCisJZm9yIChpID0g MDsgaSA8IEFNREdQVV9NQVhfUklOR1M7ICsraSkgeworCQlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcgPSBhZGV2LT5yaW5nc1tpXTsKKworCQlpZiAoIXJpbmcgfHwgIXJpbmctPnNjaGVkLnRocmVh ZCkKKwkJCWNvbnRpbnVlOworCisJCS8qIG9ubHkgZm9jdXMgb24gdGhlIHJpbmcgaGl0IHRpbWVv dXQgaWYgJmpvYiBub3QgTlVMTCAqLworCQlpZiAoam9iICYmIGpvYi0+cmluZy0+aWR4ICE9IGkp CisJCQljb250aW51ZTsKKworCQlrdGhyZWFkX3BhcmsocmluZy0+c2NoZWQudGhyZWFkKTsKKwkJ YW1kX3NjaGVkX2h3X2pvYl9yZXNldCgmcmluZy0+c2NoZWQsICZqb2ItPmJhc2UpOworCisJCS8q IGFmdGVyIGFsbCBodyBqb2JzIGFyZSByZXNldCwgaHcgZmVuY2UgaXMgbWVhbmluZ2xlc3MsIHNv IGZvcmNlX2NvbXBsZXRpb24gKi8KKwkJYW1kZ3B1X2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0 aW9uKHJpbmcpOworCX0KKworCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRldikpCisJCXIgPSBhbWRn cHVfcmVzZXRfc3Jpb3YoYWRldiwgJnJlc2V0X2ZsYWdzLCBqb2IgPyBmYWxzZSA6IHRydWUpOwor CWVsc2UKKwkJciA9IGFtZGdwdV9yZXNldChhZGV2LCAmcmVzZXRfZmxhZ3MpOworCisJaWYgKCFy KSB7CisJCWlmICgocmVzZXRfZmxhZ3MgJiBBTURHUFVfUkVTRVRfSU5GT19GVUxMUkVTRVQpICYm ICEoYWRldi0+ZmxhZ3MgJiBBTURfSVNfQVBVKSkgeworCQkJc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nID0gYWRldi0+bW1hbi5idWZmZXJfZnVuY3NfcmluZzsKKwkJCXN0cnVjdCBhbWRncHVfYm8g KmJvLCAqdG1wOworCQkJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UgPSBOVUxMLCAqbmV4dCA9IE5V TEw7CisKKwkJCURSTV9JTkZPKCJyZWNvdmVyIHZyYW0gYm8gZnJvbSBzaGFkb3dcbiIpOworCQkJ bXV0ZXhfbG9jaygmYWRldi0+c2hhZG93X2xpc3RfbG9jayk7CisJCQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUoYm8sIHRtcCwgJmFkZXYtPnNoYWRvd19saXN0LCBzaGFkb3dfbGlzdCkgeworCQkJ CW5leHQgPSBOVUxMOworCQkJCWFtZGdwdV9yZWNvdmVyX3ZyYW1fZnJvbV9zaGFkb3coYWRldiwg cmluZywgYm8sICZuZXh0KTsKKwkJCQlpZiAoZmVuY2UpIHsKKwkJCQkJciA9IGRtYV9mZW5jZV93 YWl0KGZlbmNlLCBmYWxzZSk7CisJCQkJCWlmIChyKSB7CisJCQkJCQlXQVJOKHIsICJyZWNvdmVy eSBmcm9tIHNoYWRvdyBpc24ndCBjb21wbGV0ZWRcbiIpOworCQkJCQkJYnJlYWs7CisJCQkJCX0K KwkJCQl9CisKKwkJCQlkbWFfZmVuY2VfcHV0KGZlbmNlKTsKKwkJCQlmZW5jZSA9IG5leHQ7CisJ CQl9CisJCQltdXRleF91bmxvY2soJmFkZXYtPnNoYWRvd19saXN0X2xvY2spOworCQkJaWYgKGZl bmNlKSB7CisJCQkJciA9IGRtYV9mZW5jZV93YWl0KGZlbmNlLCBmYWxzZSk7CisJCQkJaWYgKHIp CisJCQkJCVdBUk4ociwgInJlY292ZXJ5IGZyb20gc2hhZG93IGlzbid0IGNvbXBsZXRlZFxuIik7 CisJCQl9CisJCQlkbWFfZmVuY2VfcHV0KGZlbmNlKTsKKwkJfQorCisJCWZvciAoaSA9IDA7IGkg PCBBTURHUFVfTUFYX1JJTkdTOyArK2kpIHsKKwkJCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9 IGFkZXYtPnJpbmdzW2ldOworCisJCQlpZiAoIXJpbmcgfHwgIXJpbmctPnNjaGVkLnRocmVhZCkK KwkJCQljb250aW51ZTsKKworCQkJLyogb25seSBmb2N1cyBvbiB0aGUgcmluZyBoaXQgdGltZW91 dCBpZiAmam9iIG5vdCBOVUxMICovCisJCQlpZiAoam9iICYmIGpvYi0+cmluZy0+aWR4ICE9IGkp CisJCQkJY29udGludWU7CisKKwkJCWFtZF9zY2hlZF9qb2JfcmVjb3ZlcnkoJnJpbmctPnNjaGVk KTsKKwkJCWt0aHJlYWRfdW5wYXJrKHJpbmctPnNjaGVkLnRocmVhZCk7CisJCX0KKwl9IGVsc2Ug eworCQlmb3IgKGkgPSAwOyBpIDwgQU1ER1BVX01BWF9SSU5HUzsgKytpKSB7CisJCQlzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcgPSBhZGV2LT5yaW5nc1tpXTsKKworCQkJaWYgKCFyaW5nIHx8ICFy aW5nLT5zY2hlZC50aHJlYWQpCisJCQkJY29udGludWU7CisKKwkJCS8qIG9ubHkgZm9jdXMgb24g dGhlIHJpbmcgaGl0IHRpbWVvdXQgaWYgJmpvYiBub3QgTlVMTCAqLworCQkJaWYgKGpvYiAmJiBq b2ItPnJpbmctPmlkeCAhPSBpKQorCQkJCWNvbnRpbnVlOworCisJCQlrdGhyZWFkX3VucGFyayhh ZGV2LT5yaW5nc1tpXS0+c2NoZWQudGhyZWFkKTsKKwkJfQorCX0KKworCWlmIChhbWRncHVfZGV2 aWNlX2hhc19kY19zdXBwb3J0KGFkZXYpKSB7CisJCWlmIChkcm1fYXRvbWljX2hlbHBlcl9yZXN1 bWUoYWRldi0+ZGRldiwgc3RhdGUpKQorCQkJZGV2X2luZm8oYWRldi0+ZGV2LCAiZHJtIHJlc3Vt ZSBmYWlsZWQ6JWRcbiIsIHIpOworCQlhbWRncHVfZG1fZGlzcGxheV9yZXN1bWUoYWRldik7CisJ fSBlbHNlIHsKKwkJZHJtX2hlbHBlcl9yZXN1bWVfZm9yY2VfbW9kZShhZGV2LT5kZGV2KTsKKwl9 CisKKwl0dG1fYm9fdW5sb2NrX2RlbGF5ZWRfd29ya3F1ZXVlKCZhZGV2LT5tbWFuLmJkZXYsIHJl c2NoZWQpOworCisJaWYgKHIpIHsKKwkJLyogYmFkIG5ld3MsIGhvdyB0byB0ZWxsIGl0IHRvIHVz ZXJzcGFjZSA/ICovCisJCWRldl9pbmZvKGFkZXYtPmRldiwgIkdQVSByZXNldCglZCkgZmFpbGVk XG4iLCBhdG9taWNfcmVhZCgmYWRldi0+Z3B1X3Jlc2V0X2NvdW50ZXIpKTsKKwkJYW1kZ3B1X3Zm X2Vycm9yX3B1dChhZGV2LCBBTURHSU1fRVJST1JfVkZfR1BVX1JFU0VUX0ZBSUwsIDAsIHIpOwor CX0gZWxzZSB7CisJCWRldl9pbmZvKGFkZXYtPmRldiwgIkdQVSByZXNldCglZCkgc3VjY2Vzc2Vk IVxuIixhdG9taWNfcmVhZCgmYWRldi0+Z3B1X3Jlc2V0X2NvdW50ZXIpKTsKKwl9CisKKwlhbWRn cHVfdmZfZXJyb3JfdHJhbnNfYWxsKGFkZXYpOworCWFkZXYtPmluX3NyaW92X3Jlc2V0ID0gMDsK KwltdXRleF91bmxvY2soJmFkZXYtPnZpcnQubG9ja19yZXNldCk7CisJcmV0dXJuIHI7Cit9CisK IHZvaWQgYW1kZ3B1X2dldF9wY2llX2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7 CiAJdTMyIG1hc2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfam9iLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfam9iLmMKaW5kZXgg YTU4ZTNjNS4uYmQ4YzdjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2pvYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9qb2Iu YwpAQCAtMTc3LDYgKzE3NywyMSBAQCBzdGF0aWMgc3RydWN0IGRtYV9mZW5jZSAqYW1kZ3B1X2pv Yl9kZXBlbmRlbmN5KHN0cnVjdCBhbWRfc2NoZWRfam9iICpzY2hlZF9qb2IpCiAJcmV0dXJuIGZl bmNlOwogfQogCisvKiBHdWlsdHkgZm9yIGpvYnMgd2l0aCBhIGd1aWx0eSB1c2VyIGNvbnRleHQs CisgKiBvciBqb2JzIHdob3NlIGthcm1hIGV4Y2VlZCB0aGUgbGltaXQgZnJvbSBhIGtlcm5lbCBj b250ZXh0LAorICogb3Igam9icyB0aGF0IGVuY291bnRlcmVkIFZSQU0gTE9TVCBpc3N1ZQorICov CitzdGF0aWMgYm9vbCBhbWRncHVfam9iX25lZWRfY2FuY2VsZWQoc3RydWN0IGFtZGdwdV9qb2Ig KmpvYikgeworCWlmIChqb2ItPmJhc2Uuc19lbnRpdHktPmd1aWx0eSAmJiBhdG9taWNfcmVhZChq b2ItPmJhc2Uuc19lbnRpdHktPmd1aWx0eSkgPT0gMSkKKwkJcmV0dXJuIHRydWU7CisJZWxzZSBp ZiAoYXRvbWljX3JlYWQoJmpvYi0+YmFzZS5rYXJtYSkgPiBhbWRncHVfam9iX2hhbmdfbGltaXQp CisJCXJldHVybiB0cnVlOworCWVsc2UgaWYgKGpvYi0+dnJhbV9sb3N0X2NvdW50ZXIgIT0gYXRv bWljX3JlYWQoJmpvYi0+YWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpKQorCQlyZXR1cm4gdHJ1ZTsK KworCXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIHN0cnVjdCBkbWFfZmVuY2UgKmFtZGdwdV9q b2JfcnVuKHN0cnVjdCBhbWRfc2NoZWRfam9iICpzY2hlZF9qb2IpCiB7CiAJc3RydWN0IGRtYV9m ZW5jZSAqZmVuY2UgPSBOVUxMOwpAQCAtMTk0LDEwICsyMDksMTAgQEAgc3RhdGljIHN0cnVjdCBk bWFfZmVuY2UgKmFtZGdwdV9qb2JfcnVuKHN0cnVjdCBhbWRfc2NoZWRfam9iICpzY2hlZF9qb2Ip CiAJQlVHX09OKGFtZGdwdV9zeW5jX3BlZWtfZmVuY2UoJmpvYi0+c3luYywgTlVMTCkpOwogCiAJ dHJhY2VfYW1kZ3B1X3NjaGVkX3J1bl9qb2Ioam9iKTsKLQkvKiBza2lwIGliIHNjaGVkdWxlIHdo ZW4gdnJhbSBpcyBsb3N0ICovCi0JaWYgKGpvYi0+dnJhbV9sb3N0X2NvdW50ZXIgIT0gYXRvbWlj X3JlYWQoJmFkZXYtPnZyYW1fbG9zdF9jb3VudGVyKSkgeworCisJaWYgKGFtZGdwdV9qb2JfbmVl ZF9jYW5jZWxlZChqb2IpKSB7CisJCS8qIHNraXAgaWIgc2NoZWR1bGUgaWYgbG9va3MgbmVlZGVk LCBhbmQgc2V0IGVycm9yICovCiAJCWRtYV9mZW5jZV9zZXRfZXJyb3IoJmpvYi0+YmFzZS5zX2Zl bmNlLT5maW5pc2hlZCwgLUVDQU5DRUxFRCk7Ci0JCURSTV9FUlJPUigiU2tpcCBzY2hlZHVsaW5n IElCcyFcbiIpOwogCX0gZWxzZSB7CiAJCXIgPSBhbWRncHVfaWJfc2NoZWR1bGUoam9iLT5yaW5n LCBqb2ItPm51bV9pYnMsIGpvYi0+aWJzLCBqb2IsCiAJCQkJICAgICAgICZmZW5jZSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMKaW5kZXggOWNiZWFk ZS4uNzJlYWQ4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1 X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hl ZHVsZXIuYwpAQCAtNTI1LDcgKzUyNSw3IEBAIHZvaWQgYW1kX3NjaGVkX2pvYl9yZWNvdmVyeShz dHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVkKQogCQkJCQkgIHIpOwogCQkJZG1hX2ZlbmNl X3B1dChmZW5jZSk7CiAJCX0gZWxzZSB7Ci0JCQlEUk1fRVJST1IoIkZhaWxlZCB0byBydW4gam9i IVxuIik7CisJCQkvKiBmYWtlIHNpZ25hbCBzY2hlZHVsZSBmZW5jZSBoZXJlICovCiAJCQlhbWRf c2NoZWRfcHJvY2Vzc19qb2IoTlVMTCwgJnNfZmVuY2UtPmNiKTsKIAkJfQogCQlzcGluX2xvY2so JnNjaGVkLT5qb2JfbGlzdF9sb2NrKTsKQEAgLTY2NCw3ICs2NjQsNyBAQCBzdGF0aWMgaW50IGFt ZF9zY2hlZF9tYWluKHZvaWQgKnBhcmFtKQogCQkJCQkgIHIpOwogCQkJZG1hX2ZlbmNlX3B1dChm ZW5jZSk7CiAJCX0gZWxzZSB7Ci0JCQlEUk1fRVJST1IoIkZhaWxlZCB0byBydW4gam9iIVxuIik7 CisJCQlEUk1fSU5GTygiam9iIHNraXBwZWRcbiIpOwogCQkJYW1kX3NjaGVkX3Byb2Nlc3Nfam9i KE5VTEwsICZzX2ZlbmNlLT5jYik7CiAJCX0KIAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=