From: Junwei Zhang Subject: [PATCH] drm/amdgpu: fix vm size and block size for VMPT (v3) Date: Sat, 1 Apr 2017 10:43:32 +0800 Message-ID: <1491014612-12448-1-git-send-email-Jerry.Zhang@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: alexander.deucher-5C7GfCeVMHo@public.gmane.org, christian.koenig-5C7GfCeVMHo@public.gmane.org Cc: "Zhang, Jerry" , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogIlpoYW5nLCBKZXJyeSIgPEplcnJ5LlpoYW5nQGFtZC5jb20+Cgp2Mjogc2V0IGJvdGgg b2YgdGhlbSBpbiBnbWMKdjM6IG1vdmUgdm0gc2l6ZSBhbmQgYmxvY2sgc2l6ZSBpbiB2bSBtYW5h Z2VyCgpTaWduZWQtb2ZmLWJ5OiBKdW53ZWkgWmhhbmcgPEplcnJ5LlpoYW5nQGFtZC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIHwgIDggLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jICAgICB8IDIyICsrKysr KysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5o ICAgICB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeGh1Yl92MV8wLmMg ICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jICAgICAgfCAx MCArKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jICAgICAg fCAgOSArKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMgICAg ICB8ICA5ICsrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyAg ICAgIHwgMjEgKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9tbWh1Yl92MV8wLmMgICAgfCAgMiArLQogOSBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25z KCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf ZGV2aWNlLmMKaW5kZXggZmJiNGFmYi4uMWQwYzc0MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMTA0MSwxNCArMTA0MSw2IEBAIHN0YXRpYyBib29s IGFtZGdwdV9jaGVja19wb3RfYXJndW1lbnQoaW50IGFyZykKIAogc3RhdGljIHZvaWQgYW1kZ3B1 X2dldF9ibG9ja19zaXplKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCS8qIGZyb20g QUksIGFzaWMgc3RhcnRzIHRvIHN1cHBvcnQgbXVsdGlwbGUgbGV2ZWwgVk1QVCAqLwotCWlmIChh ZGV2LT5hc2ljX3R5cGUgPj0gQ0hJUF9WRUdBMTApIHsKLQkJaWYgKGFtZGdwdV92bV9ibG9ja19z aXplICE9IDkpCi0JCQlkZXZfd2FybihhZGV2LT5kZXYsCi0JCQkJICJNdWx0aS1WTVBUIGxpbWl0 cyBibG9jayBzaXplIHRvIG9uZSBwYWdlIVxuIik7Ci0JCWFtZGdwdV92bV9ibG9ja19zaXplID0g OTsKLQkJcmV0dXJuOwotCX0KIAkvKiBkZWZpbmVzIG51bWJlciBvZiBiaXRzIGluIHBhZ2UgdGFi bGUgdmVyc3VzIHBhZ2UgZGlyZWN0b3J5LAogCSAqIGEgcGFnZSBpcyA0S0Igc28gd2UgaGF2ZSAx MiBiaXRzIG9mZnNldCwgbWluaW11bSA5IGJpdHMgaW4gdGhlCiAJICogcGFnZSB0YWJsZSBhbmQg dGhlIHJlbWFpbmluZyBiaXRzIGFyZSBpbiB0aGUgcGFnZSBkaXJlY3RvcnkgKi8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKaW5kZXggNDNhZGM0Yi4uNDZkM2YxYSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTEwMCwxMyArMTAwLDE0IEBAIHN0 YXRpYyB1bnNpZ25lZCBhbWRncHVfdm1fbnVtX2VudHJpZXMoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJaWYgKGxldmVsID09IDApCiAJCS8qIEZvciB0aGUgcm9vdCBkaXJlY3RvcnkgKi8K IAkJcmV0dXJuIGFkZXYtPnZtX21hbmFnZXIubWF4X3BmbiA+PgotCQkJKGFtZGdwdV92bV9ibG9j a19zaXplICogYWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWwpOworCQkJKGFkZXYtPnZtX21hbmFn ZXIuYmxvY2tfc2l6ZSAqCisJCQkgYWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWwpOwogCWVsc2Ug aWYgKGxldmVsID09IGFkZXYtPnZtX21hbmFnZXIubnVtX2xldmVsKQogCQkvKiBGb3IgdGhlIHBh Z2UgdGFibGVzIG9uIHRoZSBsZWF2ZXMgKi8KLQkJcmV0dXJuIEFNREdQVV9WTV9QVEVfQ09VTlQ7 CisJCXJldHVybiBBTURHUFVfVk1fUFRFX0NPVU5UKGFkZXYpOwogCWVsc2UKIAkJLyogRXZlcnl0 aGluZyBpbiBiZXR3ZWVuICovCi0JCXJldHVybiAxIDw8IGFtZGdwdV92bV9ibG9ja19zaXplOwor CQlyZXR1cm4gMSA8PCBhZGV2LT52bV9tYW5hZ2VyLmJsb2NrX3NpemU7CiB9CiAKIC8qKgpAQCAt MjcxLDcgKzI3Miw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX2FsbG9jX2xldmVscyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkgIHVuc2lnbmVkIGxldmVsKQogewogCXVuc2lnbmVk IHNoaWZ0ID0gKGFkZXYtPnZtX21hbmFnZXIubnVtX2xldmVsIC0gbGV2ZWwpICoKLQkJYW1kZ3B1 X3ZtX2Jsb2NrX3NpemU7CisJCWFkZXYtPnZtX21hbmFnZXIuYmxvY2tfc2l6ZTsKIAl1bnNpZ25l ZCBwdF9pZHgsIGZyb20sIHRvOwogCWludCByOwogCkBAIC05NzAsNyArOTcxLDcgQEAgc3RhdGlj IHN0cnVjdCBhbWRncHVfYm8gKmFtZGdwdV92bV9nZXRfcHQoc3RydWN0IGFtZGdwdV9wdGVfdXBk YXRlX3BhcmFtcyAqcCwKIAl1bnNpZ25lZCBpZHgsIGxldmVsID0gcC0+YWRldi0+dm1fbWFuYWdl ci5udW1fbGV2ZWw7CiAKIAl3aGlsZSAoZW50cnktPmVudHJpZXMpIHsKLQkJaWR4ID0gYWRkciA+ PiAoYW1kZ3B1X3ZtX2Jsb2NrX3NpemUgKiBsZXZlbC0tKTsKKwkJaWR4ID0gYWRkciA+PiAocC0+ YWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplICogbGV2ZWwtLSk7CiAJCWlkeCAlPSBhbWRncHVf Ym9fc2l6ZShlbnRyeS0+Ym8pIC8gODsKIAkJZW50cnkgPSAmZW50cnktPmVudHJpZXNbaWR4XTsK IAl9CkBAIC05OTcsNyArOTk4LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3ZtX3VwZGF0ZV9wdGVz KHN0cnVjdCBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgKnBhcmFtcywKIAkJCQkgIHVpbnQ2NF90 IHN0YXJ0LCB1aW50NjRfdCBlbmQsCiAJCQkJICB1aW50NjRfdCBkc3QsIHVpbnQ2NF90IGZsYWdz KQogewotCWNvbnN0IHVpbnQ2NF90IG1hc2sgPSBBTURHUFVfVk1fUFRFX0NPVU5UIC0gMTsKKwlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHBhcmFtcy0+YWRldjsKKwljb25zdCB1aW50NjRf dCBtYXNrID0gQU1ER1BVX1ZNX1BURV9DT1VOVChhZGV2KSAtIDE7CiAKIAl1aW50NjRfdCBjdXJf cGVfc3RhcnQsIGN1cl9ucHRlcywgY3VyX2RzdDsKIAl1aW50NjRfdCBhZGRyOyAvKiBuZXh0IEdQ VSBhZGRyZXNzIHRvIGJlIHVwZGF0ZWQgKi8KQEAgLTEwMjEsNyArMTAyMyw3IEBAIHN0YXRpYyB2 b2lkIGFtZGdwdV92bV91cGRhdGVfcHRlcyhzdHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFyYW1z ICpwYXJhbXMsCiAJaWYgKChhZGRyICYgfm1hc2spID09IChlbmQgJiB+bWFzaykpCiAJCW5wdGVz ID0gZW5kIC0gYWRkcjsKIAllbHNlCi0JCW5wdGVzID0gQU1ER1BVX1ZNX1BURV9DT1VOVCAtIChh ZGRyICYgbWFzayk7CisJCW5wdGVzID0gQU1ER1BVX1ZNX1BURV9DT1VOVChhZGV2KSAtIChhZGRy ICYgbWFzayk7CiAKIAljdXJfcGVfc3RhcnQgPSBhbWRncHVfYm9fZ3B1X29mZnNldChwdCk7CiAJ Y3VyX3BlX3N0YXJ0ICs9IChhZGRyICYgbWFzaykgKiA4OwpAQCAtMTA0OSw3ICsxMDUxLDcgQEAg c3RhdGljIHZvaWQgYW1kZ3B1X3ZtX3VwZGF0ZV9wdGVzKHN0cnVjdCBhbWRncHVfcHRlX3VwZGF0 ZV9wYXJhbXMgKnBhcmFtcywKIAkJaWYgKChhZGRyICYgfm1hc2spID09IChlbmQgJiB+bWFzaykp CiAJCQlucHRlcyA9IGVuZCAtIGFkZHI7CiAJCWVsc2UKLQkJCW5wdGVzID0gQU1ER1BVX1ZNX1BU RV9DT1VOVCAtIChhZGRyICYgbWFzayk7CisJCQlucHRlcyA9IEFNREdQVV9WTV9QVEVfQ09VTlQo YWRldikgLSAoYWRkciAmIG1hc2spOwogCiAJCW5leHRfcGVfc3RhcnQgPSBhbWRncHVfYm9fZ3B1 X29mZnNldChwdCk7CiAJCW5leHRfcGVfc3RhcnQgKz0gKGFkZHIgJiBtYXNrKSAqIDg7CkBAIC0x MTk2LDcgKzExOTgsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV9ib191cGRhdGVfbWFwcGluZyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkgKiByZXNlcnZlIHNwYWNlIGZvciBvbmUgY29t bWFuZCBldmVyeSAoMSA8PCBCTE9DS19TSVpFKQogCSAqICBlbnRyaWVzIG9yIDJrIGR3b3JkcyAo d2hhdGV2ZXIgaXMgc21hbGxlcikKIAkgKi8KLQluY21kcyA9IChucHRlcyA+PiBtaW4oYW1kZ3B1 X3ZtX2Jsb2NrX3NpemUsIDExKSkgKyAxOworCW5jbWRzID0gKG5wdGVzID4+IG1pbihhZGV2LT52 bV9tYW5hZ2VyLmJsb2NrX3NpemUsIDExKSkgKyAxOwogCiAJLyogcGFkZGluZywgZXRjLiAqLwog CW5kdyA9IDY0OwpAQCAtMjA2Nyw3ICsyMDY5LDcgQEAgdm9pZCBhbWRncHVfdm1fYm9faW52YWxp ZGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIGludCBhbWRncHVfdm1faW5pdChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV92bSAqdm0pCiB7CiAJY29uc3Qg dW5zaWduZWQgYWxpZ24gPSBtaW4oQU1ER1BVX1ZNX1BUQl9BTElHTl9TSVpFLAotCQlBTURHUFVf Vk1fUFRFX0NPVU5UICogOCk7CisJCUFNREdQVV9WTV9QVEVfQ09VTlQoYWRldikgKiA4KTsKIAl1 bnNpZ25lZCByaW5nX2luc3RhbmNlOwogCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAlzdHJ1 Y3QgYW1kX3NjaGVkX3JxICpycTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV92bS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmgK aW5kZXggMTAyYjFmNy4uMTI0MjI2NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3ZtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3ZtLmgKQEAgLTQ1LDcgKzQ1LDcgQEAKICNkZWZpbmUgQU1ER1BVX1ZNX01BWF9VUERBVEVfU0la RQkweDNGRkZGCiAKIC8qIG51bWJlciBvZiBlbnRyaWVzIGluIHBhZ2UgdGFibGUgKi8KLSNkZWZp bmUgQU1ER1BVX1ZNX1BURV9DT1VOVCAoMSA8PCBhbWRncHVfdm1fYmxvY2tfc2l6ZSkKKyNkZWZp bmUgQU1ER1BVX1ZNX1BURV9DT1VOVChhZGV2KSAoMSA8PCBhZGV2LT52bV9tYW5hZ2VyLmJsb2Nr X3NpemUpCiAKIC8qIFBUQnMgKFBhZ2UgVGFibGUgQmxvY2tzKSBuZWVkIHRvIGJlIGFsaWduZWQg dG8gMzJLICovCiAjZGVmaW5lIEFNREdQVV9WTV9QVEJfQUxJR05fU0laRSAgIDMyNzY4CkBAIC0x NTUsNiArMTU1LDggQEAgc3RydWN0IGFtZGdwdV92bV9tYW5hZ2VyIHsKIAogCXVpbnQ2NF90CQkJ CW1heF9wZm47CiAJdWludDMyX3QJCQkJbnVtX2xldmVsOworCXVpbnQ2NF90CQkJCXZtX3NpemU7 CisJdWludDMyX3QJCQkJYmxvY2tfc2l6ZTsKIAkvKiB2cmFtIGJhc2UgYWRkcmVzcyBmb3IgcGFn ZSB0YWJsZSBlbnRyeSAgKi8KIAl1NjQJCQkJCXZyYW1fYmFzZV9vZmZzZXQ7CiAJLyogaXMgdm0g ZW5hYmxlZD8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeGh1 Yl92MV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhodWJfdjFfMC5jCmluZGV4 IDMwZWYzMTIuLjkyMjNjMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2dmeGh1Yl92MV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4aHViX3Yx XzAuYwpAQCAtMjIyLDcgKzIyMiw3IEBAIGludCBnZnhodWJfdjFfMF9nYXJ0X2VuYWJsZShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCQlFWEVDVVRFX1BST1RFQ1RJT05fRkFVTFRfRU5B QkxFX0RFRkFVTFQsIDEpOwogCQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVk1fQ09OVEVYVDFf Q05UTCwKIAkJCQlQQUdFX1RBQkxFX0JMT0NLX1NJWkUsCi0JCQkJICAgIGFtZGdwdV92bV9ibG9j a19zaXplIC0gOSk7CisJCQkJYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplIC0gOSk7CiAJCVdS RUczMihTT0MxNV9SRUdfT0ZGU0VUKEdDLCAwLCBtbVZNX0NPTlRFWFQxX0NOVEwpICsgaSwgdG1w KTsKIAkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoR0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFHRV9U QUJMRV9TVEFSVF9BRERSX0xPMzIpICsgaSoyLCAwKTsKIAkJV1JFRzMyKFNPQzE1X1JFR19PRkZT RVQoR0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFHRV9UQUJMRV9TVEFSVF9BRERSX0hJMzIpICsgaSoy LCAwKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jCmluZGV4IGQ5NTg2NjAuLjMw ZDVjNDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y2XzAuYwpAQCAtNTQzLDcgKzU0 Myw4IEBAIHN0YXRpYyBpbnQgZ21jX3Y2XzBfZ2FydF9lbmFibGUoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJV1JFRzMyKG1tVk1fQ09OVEVYVDFfQ05UTCwKIAkgICAgICAgVk1fQ09OVEVY VDFfQ05UTF9fRU5BQkxFX0NPTlRFWFRfTUFTSyB8CiAJICAgICAgICgxVUwgPDwgVk1fQ09OVEVY VDFfQ05UTF9fUEFHRV9UQUJMRV9ERVBUSF9fU0hJRlQpIHwKLQkgICAgICAgKChhbWRncHVfdm1f YmxvY2tfc2l6ZSAtIDkpIDw8IFZNX0NPTlRFWFQxX0NOVExfX1BBR0VfVEFCTEVfQkxPQ0tfU0la RV9fU0hJRlQpKTsKKwkgICAgICAgKChhZGV2LT52bV9tYW5hZ2VyLmJsb2NrX3NpemUgLSA5KQor CSAgICAgICA8PCBWTV9DT05URVhUMV9DTlRMX19QQUdFX1RBQkxFX0JMT0NLX1NJWkVfX1NISUZU KSk7CiAJaWYgKGFtZGdwdV92bV9mYXVsdF9zdG9wID09IEFNREdQVV9WTV9GQVVMVF9TVE9QX0FM V0FZUykKIAkJZ21jX3Y2XzBfc2V0X2ZhdWx0X2VuYWJsZV9kZWZhdWx0KGFkZXYsIGZhbHNlKTsK IAllbHNlCkBAIC04NDgsNyArODQ5LDEyIEBAIHN0YXRpYyBpbnQgZ21jX3Y2XzBfc3dfaW5pdCh2 b2lkICpoYW5kbGUpCiAJaWYgKHIpCiAJCXJldHVybiByOwogCi0JYWRldi0+dm1fbWFuYWdlci5t YXhfcGZuID0gYW1kZ3B1X3ZtX3NpemUgPDwgMTg7CisJYWRldi0+dm1fbWFuYWdlci52bV9zaXpl ID0gYW1kZ3B1X3ZtX3NpemU7CisJYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplID0gYW1kZ3B1 X3ZtX2Jsb2NrX3NpemU7CisJYWRldi0+dm1fbWFuYWdlci5tYXhfcGZuID0gYWRldi0+dm1fbWFu YWdlci52bV9zaXplIDw8IDE4OworCisJRFJNX0lORk8oInZtIHNpemUgaXMgJWQgR0IsIGJsb2Nr IHNpemUgaXMgJWQtYml0XG4iLAorCQlhZGV2LT52bV9tYW5hZ2VyLnZtX3NpemUsIGFkZXYtPnZt X21hbmFnZXIuYmxvY2tfc2l6ZSk7CiAKIAlhZGV2LT5tYy5tY19tYXNrID0gMHhmZmZmZmZmZmZm VUxMOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYwppbmRleCAwYzBhNjAxLi45 NDI3YzdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192N18wLmMKQEAgLTYzOSw3ICs2 MzksNyBAQCBzdGF0aWMgaW50IGdtY192N18wX2dhcnRfZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCXRtcCA9IFJFR19TRVRfRklFTEQodG1wLCBWTV9DT05URVhUMV9DTlRMLCBF TkFCTEVfQ09OVEVYVCwgMSk7CiAJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIFZNX0NPTlRFWFQx X0NOVEwsIFBBR0VfVEFCTEVfREVQVEgsIDEpOwogCXRtcCA9IFJFR19TRVRfRklFTEQodG1wLCBW TV9DT05URVhUMV9DTlRMLCBQQUdFX1RBQkxFX0JMT0NLX1NJWkUsCi0JCQkgICAgYW1kZ3B1X3Zt X2Jsb2NrX3NpemUgLSA5KTsKKwkJCSAgICBhZGV2LT52bV9tYW5hZ2VyLmJsb2NrX3NpemUgLSA5 KTsKIAlXUkVHMzIobW1WTV9DT05URVhUMV9DTlRMLCB0bXApOwogCWlmIChhbWRncHVfdm1fZmF1 bHRfc3RvcCA9PSBBTURHUFVfVk1fRkFVTFRfU1RPUF9BTFdBWVMpCiAJCWdtY192N18wX3NldF9m YXVsdF9lbmFibGVfZGVmYXVsdChhZGV2LCBmYWxzZSk7CkBAIC05OTgsNyArOTk4LDEyIEBAIHN0 YXRpYyBpbnQgZ21jX3Y3XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJICogQ3VycmVudGx5IHNl dCB0byA0R0IgKCgxIDw8IDIwKSA0ayBwYWdlcykuCiAJICogTWF4IEdQVVZNIHNpemUgZm9yIGNh eW1hbiBhbmQgU0kgaXMgNDAgYml0cy4KIAkgKi8KLQlhZGV2LT52bV9tYW5hZ2VyLm1heF9wZm4g PSBhbWRncHVfdm1fc2l6ZSA8PCAxODsKKwlhZGV2LT52bV9tYW5hZ2VyLnZtX3NpemUgPSBhbWRn cHVfdm1fc2l6ZTsKKwlhZGV2LT52bV9tYW5hZ2VyLmJsb2NrX3NpemUgPSBhbWRncHVfdm1fYmxv Y2tfc2l6ZTsKKwlhZGV2LT52bV9tYW5hZ2VyLm1heF9wZm4gPSBhZGV2LT52bV9tYW5hZ2VyLnZt X3NpemUgPDwgMTg7CisKKwlEUk1fSU5GTygidm0gc2l6ZSBpcyAlZCBHQiwgYmxvY2sgc2l6ZSBp cyAlZC1iaXRcbiIsCisJCWFkZXYtPnZtX21hbmFnZXIudm1fc2l6ZSwgYWRldi0+dm1fbWFuYWdl ci5ibG9ja19zaXplKTsKIAogCS8qIFNldCB0aGUgaW50ZXJuYWwgTUMgYWRkcmVzcyBtYXNrCiAJ ICogVGhpcyBpcyB0aGUgbWF4IGFkZHJlc3Mgb2YgdGhlIEdQVSdzCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ21jX3Y4XzAuYwppbmRleCBkMTlkMWM1Li4xNjc0MmJlIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192OF8wLmMKQEAgLTg0OCw3ICs4NDgsNyBAQCBzdGF0aWMgaW50IGdtY192 OF8wX2dhcnRfZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXRtcCA9IFJFR19T RVRfRklFTEQodG1wLCBWTV9DT05URVhUMV9DTlRMLCBXUklURV9QUk9URUNUSU9OX0ZBVUxUX0VO QUJMRV9ERUZBVUxULCAxKTsKIAl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVk1fQ09OVEVYVDFf Q05UTCwgRVhFQ1VURV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9ERUZBVUxULCAxKTsKIAl0bXAg PSBSRUdfU0VUX0ZJRUxEKHRtcCwgVk1fQ09OVEVYVDFfQ05UTCwgUEFHRV9UQUJMRV9CTE9DS19T SVpFLAotCQkJICAgIGFtZGdwdV92bV9ibG9ja19zaXplIC0gOSk7CisJCQkgICAgYWRldi0+dm1f bWFuYWdlci5ibG9ja19zaXplIC0gOSk7CiAJV1JFRzMyKG1tVk1fQ09OVEVYVDFfQ05UTCwgdG1w KTsKIAlpZiAoYW1kZ3B1X3ZtX2ZhdWx0X3N0b3AgPT0gQU1ER1BVX1ZNX0ZBVUxUX1NUT1BfQUxX QVlTKQogCQlnbWNfdjhfMF9zZXRfZmF1bHRfZW5hYmxlX2RlZmF1bHQoYWRldiwgZmFsc2UpOwpA QCAtMTA4Miw3ICsxMDgyLDEyIEBAIHN0YXRpYyBpbnQgZ21jX3Y4XzBfc3dfaW5pdCh2b2lkICpo YW5kbGUpCiAJICogQ3VycmVudGx5IHNldCB0byA0R0IgKCgxIDw8IDIwKSA0ayBwYWdlcykuCiAJ ICogTWF4IEdQVVZNIHNpemUgZm9yIGNheW1hbiBhbmQgU0kgaXMgNDAgYml0cy4KIAkgKi8KLQlh ZGV2LT52bV9tYW5hZ2VyLm1heF9wZm4gPSBhbWRncHVfdm1fc2l6ZSA8PCAxODsKKwlhZGV2LT52 bV9tYW5hZ2VyLnZtX3NpemUgPSBhbWRncHVfdm1fc2l6ZTsKKwlhZGV2LT52bV9tYW5hZ2VyLmJs b2NrX3NpemUgPSBhbWRncHVfdm1fYmxvY2tfc2l6ZTsKKwlhZGV2LT52bV9tYW5hZ2VyLm1heF9w Zm4gPSBhZGV2LT52bV9tYW5hZ2VyLnZtX3NpemUgPDwgMTg7CisKKwlEUk1fSU5GTygidm0gc2l6 ZSBpcyAlZCBHQiwgYmxvY2sgc2l6ZSBpcyAlZC1iaXRcbiIsCisJCWFkZXYtPnZtX21hbmFnZXIu dm1fc2l6ZSwgYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplKTsKIAogCS8qIFNldCB0aGUgaW50 ZXJuYWwgTUMgYWRkcmVzcyBtYXNrCiAJICogVGhpcyBpcyB0aGUgbWF4IGFkZHJlc3Mgb2YgdGhl IEdQVSdzCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwppbmRleCBkZjY5YWFlLi4y MTgwZWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKQEAgLTU0MywxMSAr NTQzLDIzIEBAIHN0YXRpYyBpbnQgZ21jX3Y5XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAKIAlp ZiAoYWRldi0+ZmxhZ3MgJiBBTURfSVNfQVBVKSB7CiAJCWFkZXYtPm1jLnZyYW1fdHlwZSA9IEFN REdQVV9WUkFNX1RZUEVfVU5LTk9XTjsKKwkJYWRldi0+dm1fbWFuYWdlci52bV9zaXplID0gYW1k Z3B1X3ZtX3NpemU7CisJCWFkZXYtPnZtX21hbmFnZXIuYmxvY2tfc2l6ZSA9IGFtZGdwdV92bV9i bG9ja19zaXplOwogCX0gZWxzZSB7CiAJCS8qIFhYWCBEb24ndCBrbm93IGhvdyB0byBnZXQgVlJB TSB0eXBlIHlldC4gKi8KIAkJYWRldi0+bWMudnJhbV90eXBlID0gQU1ER1BVX1ZSQU1fVFlQRV9I Qk07CisJCS8qCisJCSAqIFRvIGZ1bGZpbGwgNC1sZXZlbCBwYWdlIHN1cHBvcnQsCisJCSAqIHZt IHNpemUgaXMgMjU2VEIgKDQ4Yml0KSwgbWF4aW11bSBzaXplIG9mIFZlZ2ExMCwKKwkJICogYmxv Y2sgc2l6ZSA1MTIgKDliaXQpCisJCSAqLworCQlhZGV2LT52bV9tYW5hZ2VyLnZtX3NpemUgPSAx VSA8PCAxODsKKwkJYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplID0gOTsKIAl9CiAKKwlEUk1f SU5GTygidm0gc2l6ZSBpcyAlZCBHQiwgYmxvY2sgc2l6ZSBpcyAlZC1iaXRcbiIsCisJCWFkZXYt PnZtX21hbmFnZXIudm1fc2l6ZSwgYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplKTsKKwogCS8q IFRoaXMgaW50ZXJydXB0IGlzIFZNQyBwYWdlIGZhdWx0LiovCiAJciA9IGFtZGdwdV9pcnFfYWRk X2lkKGFkZXYsIEFNREdQVV9JSF9DTElFTlRJRF9WTUMsIDAsCiAJCQkJJmFkZXYtPm1jLnZtX2Zh dWx0KTsKQEAgLTU1NywxNCArNTY5LDcgQEAgc3RhdGljIGludCBnbWNfdjlfMF9zd19pbml0KHZv aWQgKmhhbmRsZSkKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQkvKiBCZWNhdXNlIG9mIGZvdXIg bGV2ZWwgVk1QVHMsIHZtIHNpemUgaXMgYXQgbGVhc3QgNTEyR0IuCi0JICogVGhlIG1heGltdW0g c2l6ZSBpcyAyNTZUQiAoNDhiaXQpLgotCSAqLwotCWlmIChhbWRncHVfdm1fc2l6ZSA8IDUxMikg ewotCQlEUk1fV0FSTigiVk0gc2l6ZSBpcyBhdCBsZWFzdCA1MTJHQiFcbiIpOwotCQlhbWRncHVf dm1fc2l6ZSA9IDUxMjsKLQl9Ci0JYWRldi0+dm1fbWFuYWdlci5tYXhfcGZuID0gKHVpbnQ2NF90 KWFtZGdwdV92bV9zaXplIDw8IDE4OworCWFkZXYtPnZtX21hbmFnZXIubWF4X3BmbiA9IGFkZXYt PnZtX21hbmFnZXIudm1fc2l6ZSA8PCAxODsKIAogCS8qIFNldCB0aGUgaW50ZXJuYWwgTUMgYWRk cmVzcyBtYXNrCiAJICogVGhpcyBpcyB0aGUgbWF4IGFkZHJlc3Mgb2YgdGhlIEdQVSdzCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9tbWh1Yl92MV8wLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9tbWh1Yl92MV8wLmMKaW5kZXggMjY2YTBmNC4uMmNjMWQ1OCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbW1odWJfdjFfMC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L21taHViX3YxXzAuYwpAQCAtMjQyLDcgKzI0Miw3 IEBAIGludCBtbWh1Yl92MV8wX2dhcnRfZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQogCQkJCUVYRUNVVEVfUFJPVEVDVElPTl9GQVVMVF9FTkFCTEVfREVGQVVMVCwgMSk7CiAJCXRt cCA9IFJFR19TRVRfRklFTEQodG1wLCBWTV9DT05URVhUMV9DTlRMLAogCQkJCVBBR0VfVEFCTEVf QkxPQ0tfU0laRSwKLQkJCQlhbWRncHVfdm1fYmxvY2tfc2l6ZSAtIDkpOworCQkJCWFkZXYtPnZt X21hbmFnZXIuYmxvY2tfc2l6ZSAtIDkpOwogCQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNTUhV QiwgMCwgbW1WTV9DT05URVhUMV9DTlRMKSArIGksIHRtcCk7CiAJCVdSRUczMihTT0MxNV9SRUdf T0ZGU0VUKE1NSFVCLCAwLCBtbVZNX0NPTlRFWFQxX1BBR0VfVEFCTEVfU1RBUlRfQUREUl9MTzMy KSArIGkqMiwgMCk7CiAJCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1NSFVCLCAwLCBtbVZNX0NP TlRFWFQxX1BBR0VfVEFCTEVfU1RBUlRfQUREUl9ISTMyKSArIGkqMiwgMCk7Ci0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==