From: Imre Deak Subject: [PATCH 5/7] drm/i915: sseu: convert subslice count fields to subslice mask Date: Wed, 21 Oct 2015 18:40:35 +0300 Message-ID: <1445442037-1186-6-git-send-email-imre.deak@intel.com> References: <1445442037-1186-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 185236EEAD for ; Wed, 21 Oct 2015 08:41:08 -0700 (PDT) In-Reply-To: <1445442037-1186-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org SW4gYW4gdXBjb21pbmcgcGF0Y2ggd2UnbGwgbmVlZCB0aGUgYWN0dWFsIG1hc2sgb2Ygc3Vic2xp Y2VzIGluIGFkZGl0aW9uCnRvIHRoZWlyIGNvdW50LCBzbyBjb252ZXJ0IHRoZSBzdWJzbGljZV9w ZXJfc2xpY2UgZmllbGQgdG8gYSBtYXNrLgpBbHNvIHdlIGNhbiBlYXNpbHkgY2FsY3VsYXRlIHN1 YnNsaWNlX3RvdGFsIGZyb20gdGhlIG90aGVyIGZpZWxkcywgc28KaW5zdGVhZCBvZiBzdG9yaW5n IGEgY2FjaGVkIHZlcnNpb24gb2YgdGhpcywgYWRkIGEgaGVscGVyIHRvIGNhbGN1bGF0ZQppdC4K ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDM3ICsrKysrKysrLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgfCA2NCArKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICB8ICA4ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICB8ICAy ICstCiA0IGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDYwIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMzkwZGM1OS4uM2ZiODNlYSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTQ5NjYsNyArNDk2Niw3IEBAIHN0YXRp YyB2b2lkIGNoZXJyeXZpZXdfc3NldV9kZXZpY2Vfc3RhdHVzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJCQljb250aW51ZTsKIAogCQlzdGF0LT5zbGljZV9tYXNrID0gQklUKDApOwotCQlzdGF0 LT5zdWJzbGljZV9wZXJfc2xpY2UrKzsKKwkJc3RhdC0+c3Vic2xpY2VfbWFzayB8PSBCSVQoc3Mp OwogCQlldV9jbnQgPSAoKHNpZzFbc3NdICYgQ0hWX0VVMDhfUEdfRU5BQkxFKSA/IDAgOiAyKSAr CiAJCQkgKChzaWcxW3NzXSAmIENIVl9FVTE5X1BHX0VOQUJMRSkgPyAwIDogMikgKwogCQkJICgo c2lnMVtzc10gJiBDSFZfRVUyMTBfUEdfRU5BQkxFKSA/IDAgOiAyKSArCkBAIC00OTc1LDcgKzQ5 NzUsNiBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X3NzZXVfZGV2aWNlX3N0YXR1cyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQlzdGF0LT5ldV9wZXJfc3Vic2xpY2UgPSBtYXhfdCh1bnNpZ25l ZCBpbnQsCiAJCQkJCSAgICAgIHN0YXQtPmV1X3Blcl9zdWJzbGljZSwgZXVfY250KTsKIAl9Ci0J c3RhdC0+c3Vic2xpY2VfdG90YWwgPSBzdGF0LT5zdWJzbGljZV9wZXJfc2xpY2U7CiB9CiAKIHN0 YXRpYyB2b2lkIGdlbjlfc3NldV9kZXZpY2Vfc3RhdHVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CkBAIC01MDA4LDggKzUwMDcsNiBAQCBzdGF0aWMgdm9pZCBnZW45X3NzZXVfZGV2aWNlX3N0YXR1 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkgICAgIEdFTjlfUEdDVExfU1NCX0VVMzExX0FD SzsKIAogCWZvciAocyA9IDA7IHMgPCBzX21heDsgcysrKSB7Ci0JCXVuc2lnbmVkIGludCBzc19j bnQgPSAwOwotCiAJCWlmICgoc19yZWdbc10gJiBHRU45X1BHQ1RMX1NMSUNFX0FDSykgPT0gMCkK IAkJCS8qIHNraXAgZGlzYWJsZWQgc2xpY2UgKi8KIAkJCWNvbnRpbnVlOwpAQCAtNTAxNywxOCAr NTAxNCwxOSBAQCBzdGF0aWMgdm9pZCBnZW45X3NzZXVfZGV2aWNlX3N0YXR1cyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQlzdGF0LT5zbGljZV9tYXNrIHw9IEJJVChzKTsKIAogCQlpZiAoSVNf U0tZTEFLRShkZXYpKQotCQkJc3NfY250ID0gSU5URUxfSU5GTyhkZXYpLT5zc2V1LnN1YnNsaWNl X3Blcl9zbGljZTsKKwkJCXN0YXQtPnN1YnNsaWNlX21hc2sgPQorCQkJCUlOVEVMX0lORk8oZGV2 X3ByaXYpLT5zc2V1LnN1YnNsaWNlX21hc2s7CiAKIAkJZm9yIChzcyA9IDA7IHNzIDwgc3NfbWF4 OyBzcysrKSB7CiAJCQl1bnNpZ25lZCBpbnQgZXVfY250OwogCi0JCQlpZiAoSVNfQlJPWFRPTihk ZXYpICYmCi0JCQkgICAgIShzX3JlZ1tzXSAmIChHRU45X1BHQ1RMX1NTX0FDSyhzcykpKSkKLQkJ CQkvKiBza2lwIGRpc2FibGVkIHN1YnNsaWNlICovCi0JCQkJY29udGludWU7CisJCQlpZiAoSVNf QlJPWFRPTihkZXYpKSB7CisJCQkJaWYgKCEoc19yZWdbc10gJiAoR0VOOV9QR0NUTF9TU19BQ0so c3MpKSkpCisJCQkJCS8qIHNraXAgZGlzYWJsZWQgc3Vic2xpY2UgKi8KKwkJCQkJY29udGludWU7 CiAKLQkJCWlmIChJU19CUk9YVE9OKGRldikpCi0JCQkJc3NfY250Kys7CisJCQkJc3RhdC0+c3Vi c2xpY2VfbWFzayB8PSBCSVQoc3MpOworCQkJfQogCiAJCQlldV9jbnQgPSAyICogaHdlaWdodDMy KGV1X3JlZ1syKnMgKyBzcy8yXSAmCiAJCQkJCSAgICAgICBldV9tYXNrW3NzJTJdKTsKQEAgLTUw MzcsMTEgKzUwMzUsNiBAQCBzdGF0aWMgdm9pZCBnZW45X3NzZXVfZGV2aWNlX3N0YXR1cyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQkJICAgICAgc3RhdC0+ZXVfcGVyX3N1YnNsaWNlLAog CQkJCQkJICAgICAgZXVfY250KTsKIAkJfQotCi0JCXN0YXQtPnN1YnNsaWNlX3RvdGFsICs9IHNz X2NudDsKLQkJc3RhdC0+c3Vic2xpY2VfcGVyX3NsaWNlID0gbWF4X3QodW5zaWduZWQgaW50LAot CQkJCQkJIHN0YXQtPnN1YnNsaWNlX3Blcl9zbGljZSwKLQkJCQkJCSBzc19jbnQpOwogCX0KIH0K IApAQCAtNTA1NSwxMiArNTA0OCwxMCBAQCBzdGF0aWMgdm9pZCBicm9hZHdlbGxfc3NldV9kZXZp Y2Vfc3RhdHVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RhdC0+c2xpY2VfbWFzayA9IHNs aWNlX2luZm8gJiBHRU44X0xTTElDRVNUQVRfTUFTSzsKIAogCWlmIChzdGF0LT5zbGljZV9tYXNr KSB7Ci0JCXN0YXQtPnN1YnNsaWNlX3Blcl9zbGljZSA9Ci0JCQkJSU5URUxfSU5GTyhkZXYpLT5z c2V1LnN1YnNsaWNlX3Blcl9zbGljZTsKLQkJc3RhdC0+c3Vic2xpY2VfdG90YWwgPSBod2VpZ2h0 MzIoc3RhdC0+c2xpY2VfbWFzaykgKgotCQkJCSAgICAgICBzdGF0LT5zdWJzbGljZV9wZXJfc2xp Y2U7CisJCXN0YXQtPnN1YnNsaWNlX21hc2sgPSBJTlRFTF9JTkZPKGRldiktPnNzZXUuc3Vic2xp Y2VfbWFzazsKIAkJc3RhdC0+ZXVfcGVyX3N1YnNsaWNlID0gSU5URUxfSU5GTyhkZXYpLT5zc2V1 LmV1X3Blcl9zdWJzbGljZTsKLQkJc3RhdC0+ZXVfdG90YWwgPSBzdGF0LT5ldV9wZXJfc3Vic2xp Y2UgKiBzdGF0LT5zdWJzbGljZV90b3RhbDsKKwkJc3RhdC0+ZXVfdG90YWwgPSBzdGF0LT5ldV9w ZXJfc3Vic2xpY2UgKgorCQkJCSBzc2V1X3N1YnNsaWNlX3RvdGFsKHN0YXQpOwogCiAJCS8qIHN1 YnRyYWN0IGZ1c2VkIG9mZiBFVShzKSBmcm9tIGVuYWJsZWQgc2xpY2UocykgKi8KIAkJZm9yIChz ID0gMDsgcyA8IGh3ZWlnaHQzMihzdGF0LT5zbGljZV9tYXNrKTsgcysrKSB7CkBAIC01MDc5LDkg KzUwNzAsOSBAQCBzdGF0aWMgdm9pZCBpOTE1X3ByaW50X3NzZXVfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIGJvb2wgaXNfYXZhaWxhYmxlX2luZm8sCiAJc2VxX3ByaW50ZihtLCAiICAlcyBTbGlj ZSBUb3RhbDogJXVcbiIsIHR5cGUsCiAJCSAgIGh3ZWlnaHQzMihzc2V1LT5zbGljZV9tYXNrKSk7 CiAJc2VxX3ByaW50ZihtLCAiICAlcyBTdWJzbGljZSBUb3RhbDogJXVcbiIsIHR5cGUsCi0JCSAg IHNzZXUtPnN1YnNsaWNlX3RvdGFsKTsKKwkJICAgc3NldV9zdWJzbGljZV90b3RhbChzc2V1KSk7 CiAJc2VxX3ByaW50ZihtLCAiICAlcyBTdWJzbGljZSBQZXIgU2xpY2U6ICV1XG4iLCB0eXBlLAot CQkgICBzc2V1LT5zdWJzbGljZV9wZXJfc2xpY2UpOworCQkgICBod2VpZ2h0MzIoc3NldS0+c3Vi c2xpY2VfbWFzaykpOwogCXNlcV9wcmludGYobSwgIiAgJXMgRVUgVG90YWw6ICV1XG4iLCB0eXBl LAogCQkgICBzc2V1LT5ldV90b3RhbCk7CiAJc2VxX3ByaW50ZihtLCAiICAlcyBFVSBQZXIgU3Vi c2xpY2U6ICV1XG4iLCB0eXBlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggMWY1ZjNhN2Qu LjY5YTgxYWU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTE1NCw3ICsxNTQsNyBAQCBz dGF0aWMgaW50IGk5MTVfZ2V0cGFyYW0oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJdmFsdWUgPSAxOwogCQlicmVhazsKIAljYXNlIEk5MTVfUEFSQU1fU1VCU0xJQ0VfVE9U QUw6Ci0JCXZhbHVlID0gSU5URUxfSU5GTyhkZXYpLT5zc2V1LnN1YnNsaWNlX3RvdGFsOworCQl2 YWx1ZSA9IHNzZXVfc3Vic2xpY2VfdG90YWwoJklOVEVMX0lORk8oZGV2KS0+c3NldSk7CiAJCWlm ICghdmFsdWUpCiAJCQlyZXR1cm4gLUVOT0RFVjsKIAkJYnJlYWs7CkBAIC01NjIsMjYgKzU2Miwy NSBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X3NzZXVfaW5mb19pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJaW5mby0+c2xpY2VfbWFzayA9IEJJVCgwKTsKIAogCWlmICghKGZ1c2UgJiBD SFZfRkdUX0RJU0FCTEVfU1MwKSkgewotCQlpbmZvLT5zdWJzbGljZV9wZXJfc2xpY2UrKzsKKwkJ aW5mby0+c3Vic2xpY2VfbWFzayB8PSBCSVQoMCk7CiAJCWV1X2RpcyA9IGZ1c2UgJiAoQ0hWX0ZH VF9FVV9ESVNfU1MwX1IwX01BU0sgfAogCQkJCSBDSFZfRkdUX0VVX0RJU19TUzBfUjFfTUFTSyk7 CiAJCWluZm8tPmV1X3RvdGFsICs9IDggLSBod2VpZ2h0MzIoZXVfZGlzKTsKIAl9CiAKIAlpZiAo IShmdXNlICYgQ0hWX0ZHVF9ESVNBQkxFX1NTMSkpIHsKLQkJaW5mby0+c3Vic2xpY2VfcGVyX3Ns aWNlKys7CisJCWluZm8tPnN1YnNsaWNlX21hc2sgfD0gQklUKDEpOwogCQlldV9kaXMgPSBmdXNl ICYgKENIVl9GR1RfRVVfRElTX1NTMV9SMF9NQVNLIHwKIAkJCQkgQ0hWX0ZHVF9FVV9ESVNfU1Mx X1IxX01BU0spOwogCQlpbmZvLT5ldV90b3RhbCArPSA4IC0gaHdlaWdodDMyKGV1X2Rpcyk7CiAJ fQogCi0JaW5mby0+c3Vic2xpY2VfdG90YWwgPSBpbmZvLT5zdWJzbGljZV9wZXJfc2xpY2U7CiAJ LyoKIAkgKiBDSFYgZXhwZWN0ZWQgdG8gYWx3YXlzIGhhdmUgYSB1bmlmb3JtIGRpc3RyaWJ1dGlv biBvZiBFVQogCSAqIGFjcm9zcyBzdWJzbGljZXMuCiAJKi8KLQlpbmZvLT5ldV9wZXJfc3Vic2xp Y2UgPSBpbmZvLT5zdWJzbGljZV90b3RhbCA/Ci0JCQkJaW5mby0+ZXVfdG90YWwgLyBpbmZvLT5z dWJzbGljZV90b3RhbCA6CisJaW5mby0+ZXVfcGVyX3N1YnNsaWNlID0gc3NldV9zdWJzbGljZV90 b3RhbChpbmZvKSA/CisJCQkJaW5mby0+ZXVfdG90YWwgLyBzc2V1X3N1YnNsaWNlX3RvdGFsKGlu Zm8pIDoKIAkJCQkwOwogCS8qCiAJICogQ0hWIHN1cHBvcnRzIHN1YnNsaWNlIHBvd2VyIGdhdGlu ZyBvbiBkZXZpY2VzIHdpdGggbW9yZSB0aGFuCkBAIC01ODksNyArNTg4LDcgQEAgc3RhdGljIHZv aWQgY2hlcnJ5dmlld19zc2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAq IG1vcmUgdGhhbiBvbmUgRVUgcGFpciBwZXIgc3Vic2xpY2UuCiAJKi8KIAlpbmZvLT5oYXNfc2xp Y2VfcGcgPSAwOwotCWluZm8tPmhhc19zdWJzbGljZV9wZyA9IChpbmZvLT5zdWJzbGljZV90b3Rh bCA+IDEpOworCWluZm8tPmhhc19zdWJzbGljZV9wZyA9IHNzZXVfc3Vic2xpY2VfdG90YWwoaW5m bykgPiAxOwogCWluZm8tPmhhc19ldV9wZyA9IChpbmZvLT5ldV9wZXJfc3Vic2xpY2UgPiAyKTsK IH0KIApAQCAtNTk5LDIyICs1OTgsMTkgQEAgc3RhdGljIHZvaWQgZ2VuOV9zc2V1X2luZm9faW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXN0cnVjdCBzc2V1X2Rldl9pbmZvICppbmZvOwog CWludCBzX21heCA9IDMsIHNzX21heCA9IDQsIGV1X21heCA9IDg7CiAJaW50IHMsIHNzOwotCXUz MiBmdXNlMiwgc3NfZGlzYWJsZSwgZXVfZGlzYWJsZTsKKwl1MzIgZnVzZTIsIGV1X2Rpc2FibGU7 CiAJdTggZXVfbWFzayA9IDB4ZmY7CiAKIAlpbmZvID0gKHN0cnVjdCBzc2V1X2Rldl9pbmZvICop JklOVEVMX0lORk8oZGV2X3ByaXYpLT5zc2V1OwogCWZ1c2UyID0gSTkxNV9SRUFEKEdFTjhfRlVT RTIpOwogCWluZm8tPnNsaWNlX21hc2sgPSAoZnVzZTIgJiBHRU44X0YyX1NfRU5BX01BU0spID4+ IEdFTjhfRjJfU19FTkFfU0hJRlQ7Ci0Jc3NfZGlzYWJsZSA9IChmdXNlMiAmIEdFTjlfRjJfU1Nf RElTX01BU0spID4+Ci0JCSAgICAgR0VOOV9GMl9TU19ESVNfU0hJRlQ7Ci0KIAkvKgogCSAqIFRo ZSBzdWJzbGljZSBkaXNhYmxlIGZpZWxkIGlzIGdsb2JhbCwgaS5lLiBpdCBhcHBsaWVzCiAJICog dG8gZWFjaCBvZiB0aGUgZW5hYmxlZCBzbGljZXMuCiAJKi8KLQlpbmZvLT5zdWJzbGljZV9wZXJf c2xpY2UgPSBzc19tYXggLSBod2VpZ2h0MzIoc3NfZGlzYWJsZSk7Ci0JaW5mby0+c3Vic2xpY2Vf dG90YWwgPSBod2VpZ2h0MzIoaW5mby0+c2xpY2VfbWFzaykgKgotCQkJICAgICAgIGluZm8tPnN1 YnNsaWNlX3Blcl9zbGljZTsKKwlpbmZvLT5zdWJzbGljZV9tYXNrID0gKDEgPDwgc3NfbWF4KSAt IDE7CisJaW5mby0+c3Vic2xpY2VfbWFzayAmPSB+KChmdXNlMiAmIEdFTjlfRjJfU1NfRElTX01B U0spID4+CisJCQkJR0VOOV9GMl9TU19ESVNfU0hJRlQpOwogCiAJLyoKIAkgKiBJdGVyYXRlIHRo cm91Z2ggZW5hYmxlZCBzbGljZXMgYW5kIHN1YnNsaWNlcyB0bwpAQCAtNjI5LDcgKzYyNSw3IEBA IHN0YXRpYyB2b2lkIGdlbjlfc3NldV9pbmZvX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJZm9yIChzcyA9IDA7IHNzIDwgc3NfbWF4OyBzcysrKSB7CiAJCQlpbnQgZXVfcGVyX3NzOwog Ci0JCQlpZiAoc3NfZGlzYWJsZSAmICgweDEgPDwgc3MpKQorCQkJaWYgKCEoaW5mby0+c3Vic2xp Y2VfbWFzayAmIEJJVChzcykpKQogCQkJCS8qIHNraXAgZGlzYWJsZWQgc3Vic2xpY2UgKi8KIAkJ CQljb250aW51ZTsKIApAQCAtNjU1LDkgKzY1MSw5IEBAIHN0YXRpYyB2b2lkIGdlbjlfc3NldV9p bmZvX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKiByZWNvdmVyeS4gQlhUIGlzIGV4 cGVjdGVkIHRvIGJlIHBlcmZlY3RseSB1bmlmb3JtIGluIEVVCiAJICogZGlzdHJpYnV0aW9uLgog CSovCi0JaW5mby0+ZXVfcGVyX3N1YnNsaWNlID0gaW5mby0+c3Vic2xpY2VfdG90YWwgPworCWlu Zm8tPmV1X3Blcl9zdWJzbGljZSA9IHNzZXVfc3Vic2xpY2VfdG90YWwoaW5mbykgPwogCQkJCURJ Vl9ST1VORF9VUChpbmZvLT5ldV90b3RhbCwKLQkJCQkJICAgICBpbmZvLT5zdWJzbGljZV90b3Rh bCkgOiAwOworCQkJCQkgICAgIHNzZXVfc3Vic2xpY2VfdG90YWwoaW5mbykpIDogMDsKIAkvKgog CSAqIFNLTCBzdXBwb3J0cyBzbGljZSBwb3dlciBnYXRpbmcgb24gZGV2aWNlcyB3aXRoIG1vcmUg dGhhbgogCSAqIG9uZSBzbGljZSwgYW5kIHN1cHBvcnRzIEVVIHBvd2VyIGdhdGluZyBvbiBkZXZp Y2VzIHdpdGgKQEAgLTY2OCw3ICs2NjQsOCBAQCBzdGF0aWMgdm9pZCBnZW45X3NzZXVfaW5mb19p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJKi8KIAlpbmZvLT5oYXNfc2xpY2VfcGcgPSBJ U19TS1lMQUtFKGRldikgJiYKIAkJCSAgICAgaHdlaWdodDMyKGluZm8tPnNsaWNlX21hc2spID4g MTsKLQlpbmZvLT5oYXNfc3Vic2xpY2VfcGcgPSAoSVNfQlJPWFRPTihkZXYpICYmIChpbmZvLT5z dWJzbGljZV90b3RhbCA+IDEpKTsKKwlpbmZvLT5oYXNfc3Vic2xpY2VfcGcgPSBJU19CUk9YVE9O KGRldikgJiYKKwkJCQlzc2V1X3N1YnNsaWNlX3RvdGFsKGluZm8pID4gMTsKIAlpbmZvLT5oYXNf ZXVfcGcgPSAoaW5mby0+ZXVfcGVyX3N1YnNsaWNlID4gMik7CiB9CiAKQEAgLTY3OCw3ICs2NzUs NyBAQCBzdGF0aWMgdm9pZCBicm9hZHdlbGxfc3NldV9pbmZvX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlzdHJ1Y3Qgc3NldV9kZXZfaW5mbyAqaW5mbzsKIAljb25zdCBpbnQgc19tYXgg PSAzLCBzc19tYXggPSAzLCBldV9tYXggPSA4OwogCWludCBzLCBzczsKLQl1MzIgZnVzZTIsIGV1 X2Rpc2FibGVbc19tYXhdLCBzc19kaXNhYmxlOworCXUzMiBmdXNlMiwgZXVfZGlzYWJsZVtzX21h eF07CiAKIAlpbmZvID0gKHN0cnVjdCBzc2V1X2Rldl9pbmZvICopJmRldl9wcml2LT5pbmZvLnNz ZXU7CiAKQEAgLTY4Niw3ICs2ODMsMTMgQEAgc3RhdGljIHZvaWQgYnJvYWR3ZWxsX3NzZXVfaW5m b19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbmZvLT5zbGljZV9tYXNrID0gKGZ1 c2UyICYgR0VOOF9GMl9TX0VOQV9NQVNLKSA+PgogCQkJCUdFTjhfRjJfU19FTkFfU0hJRlQ7Ci0J c3NfZGlzYWJsZSA9IChmdXNlMiAmIEdFTjhfRjJfU1NfRElTX01BU0spID4+IEdFTjhfRjJfU1Nf RElTX1NISUZUOworCS8qCisJICogVGhlIHN1YnNsaWNlIGRpc2FibGUgZmllbGQgaXMgZ2xvYmFs LCBpLmUuIGl0IGFwcGxpZXMKKwkgKiB0byBlYWNoIG9mIHRoZSBlbmFibGVkIHNsaWNlcy4KKwkg Ki8KKwlpbmZvLT5zdWJzbGljZV9tYXNrID0gKDEgPDwgc3NfbWF4KSAtIDE7CisJaW5mby0+c3Vi c2xpY2VfbWFzayAmPSB+KChmdXNlMiAmIEdFTjhfRjJfU1NfRElTX01BU0spID4+CisJCQkJIEdF TjhfRjJfU1NfRElTX1NISUZUKTsKIAogCWV1X2Rpc2FibGVbMF0gPSBJOTE1X1JFQUQoR0VOOF9F VV9ESVNBQkxFMCkgJiBHRU44X0VVX0RJUzBfUzBfTUFTSzsKIAlldV9kaXNhYmxlWzFdID0gKEk5 MTVfUkVBRChHRU44X0VVX0RJU0FCTEUwKSA+PiBHRU44X0VVX0RJUzBfUzFfU0hJRlQpIHwKQEAg LTY5NiwxNSArNjk5LDYgQEAgc3RhdGljIHZvaWQgYnJvYWR3ZWxsX3NzZXVfaW5mb19pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkoKEk5MTVfUkVBRChHRU44X0VVX0RJU0FCTEUyKSAm IEdFTjhfRVVfRElTMl9TMl9NQVNLKSA8PAogCQkJICgzMiAtIEdFTjhfRVVfRElTMV9TMl9TSElG VCkpOwogCi0KLQkvKgotCSAqIFRoZSBzdWJzbGljZSBkaXNhYmxlIGZpZWxkIGlzIGdsb2JhbCwg aS5lLiBpdCBhcHBsaWVzCi0JICogdG8gZWFjaCBvZiB0aGUgZW5hYmxlZCBzbGljZXMuCi0JICov Ci0JaW5mby0+c3Vic2xpY2VfcGVyX3NsaWNlID0gc3NfbWF4IC0gaHdlaWdodDMyKHNzX2Rpc2Fi bGUpOwotCWluZm8tPnN1YnNsaWNlX3RvdGFsID0gaHdlaWdodDMyKGluZm8tPnNsaWNlX21hc2sp ICoKLQkJCSAgICAgICBpbmZvLT5zdWJzbGljZV9wZXJfc2xpY2U7Ci0KIAkvKgogCSAqIEl0ZXJh dGUgdGhyb3VnaCBlbmFibGVkIHNsaWNlcyBhbmQgc3Vic2xpY2VzIHRvCiAJICogY291bnQgdGhl IHRvdGFsIGVuYWJsZWQgRVUuCkBAIC03MTcsNyArNzExLDcgQEAgc3RhdGljIHZvaWQgYnJvYWR3 ZWxsX3NzZXVfaW5mb19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWZvciAoc3MgPSAw OyBzcyA8IHNzX21heDsgc3MrKykgewogCQkJdTMyIG5fZGlzYWJsZWQ7CiAKLQkJCWlmIChzc19k aXNhYmxlICYgKDB4MSA8PCBzcykpCisJCQlpZiAoIShpbmZvLT5zdWJzbGljZV9tYXNrICYgQklU KHNzKSkpCiAJCQkJLyogc2tpcCBkaXNhYmxlZCBzdWJzbGljZSAqLwogCQkJCWNvbnRpbnVlOwog CkBAIC03MzgsOCArNzMyLDkgQEAgc3RhdGljIHZvaWQgYnJvYWR3ZWxsX3NzZXVfaW5mb19pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogc3Vic2xpY2VzIHdpdGggdGhlIGV4Y2VwdGlv biB0aGF0IGFueSBvbmUgRVUgaW4gYW55IG9uZSBzdWJzbGljZSBtYXkKIAkgKiBiZSBmdXNlZCBv ZmYgZm9yIGRpZSByZWNvdmVyeS4KIAkgKi8KLQlpbmZvLT5ldV9wZXJfc3Vic2xpY2UgPSBpbmZv LT5zdWJzbGljZV90b3RhbCA/Ci0JCURJVl9ST1VORF9VUChpbmZvLT5ldV90b3RhbCwgaW5mby0+ c3Vic2xpY2VfdG90YWwpIDogMDsKKwlpbmZvLT5ldV9wZXJfc3Vic2xpY2UgPSBzc2V1X3N1YnNs aWNlX3RvdGFsKGluZm8pID8KKwkJCQlESVZfUk9VTkRfVVAoaW5mby0+ZXVfdG90YWwsCisJCQkJ CSAgICAgc3NldV9zdWJzbGljZV90b3RhbChpbmZvKSkgOiAwOwogCiAJLyoKIAkgKiBCRFcgc3Vw cG9ydHMgc2xpY2UgcG93ZXIgZ2F0aW5nIG9uIGRldmljZXMgd2l0aCBtb3JlIHRoYW4KQEAgLTgy Nyw5ICs4MjIsMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGV2aWNlX2luZm9fcnVudGltZV9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlEUk1fREVCVUdfRFJJVkVSKCJzbGljZSB0b3Rh bDogJXVcbiIsCiAJCQkgaHdlaWdodDMyKGluZm8tPnNzZXUuc2xpY2VfbWFzaykpOwotCURSTV9E RUJVR19EUklWRVIoInN1YnNsaWNlIHRvdGFsOiAldVxuIiwgaW5mby0+c3NldS5zdWJzbGljZV90 b3RhbCk7CisJRFJNX0RFQlVHX0RSSVZFUigic3Vic2xpY2UgdG90YWw6ICV1XG4iLAorCQkJIHNz ZXVfc3Vic2xpY2VfdG90YWwoJmluZm8tPnNzZXUpKTsKIAlEUk1fREVCVUdfRFJJVkVSKCJzdWJz bGljZSBwZXIgc2xpY2U6ICV1XG4iLAotCQkJCQkJaW5mby0+c3NldS5zdWJzbGljZV9wZXJfc2xp Y2UpOworCQkJIGh3ZWlnaHQzMihpbmZvLT5zc2V1LnN1YnNsaWNlX21hc2spKTsKIAlEUk1fREVC VUdfRFJJVkVSKCJFVSB0b3RhbDogJXVcbiIsIGluZm8tPnNzZXUuZXVfdG90YWwpOwogCURSTV9E RUJVR19EUklWRVIoIkVVIHBlciBzdWJzbGljZTogJXVcbiIsIGluZm8tPnNzZXUuZXVfcGVyX3N1 YnNsaWNlKTsKIAlEUk1fREVCVUdfRFJJVkVSKCJoYXMgc2xpY2UgcG93ZXIgZ2F0aW5nOiAlc1xu IiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDdjYzllYzguLmQ0N2U1NDQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaApAQCAtNzg0LDggKzc4NCw3IEBAIHN0cnVjdCBpbnRlbF9jc3Igewog CiBzdHJ1Y3Qgc3NldV9kZXZfaW5mbyB7CiAJdTggc2xpY2VfbWFzazsKLQl1OCBzdWJzbGljZV90 b3RhbDsKLQl1OCBzdWJzbGljZV9wZXJfc2xpY2U7CisJdTggc3Vic2xpY2VfbWFzazsKIAl1OCBl dV90b3RhbDsKIAl1OCBldV9wZXJfc3Vic2xpY2U7CiAJLyogRm9yIGVhY2ggc2xpY2UsIHdoaWNo IHN1YnNsaWNlKHMpIGhhcyhoYXZlKSA3IEVVcyAoYml0ZmllbGQpPyAqLwpAQCAtNzk1LDYgKzc5 NCwxMSBAQCBzdHJ1Y3Qgc3NldV9kZXZfaW5mbyB7CiAJdTggaGFzX2V1X3BnOjE7CiB9OwogCitz dGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBzc2V1X3N1YnNsaWNlX3RvdGFsKGNvbnN0IHN0cnVj dCBzc2V1X2Rldl9pbmZvICpzc2V1KQoreworCXJldHVybiBod2VpZ2h0MzIoKHNzZXUpLT5zbGlj ZV9tYXNrKSAqIGh3ZWlnaHQzMigoc3NldSktPnN1YnNsaWNlX21hc2spOworfQorCiBzdHJ1Y3Qg aW50ZWxfZGV2aWNlX2luZm8gewogCXUzMiBkaXNwbGF5X21taW9fb2Zmc2V0OwogCXUxNiBkZXZp Y2VfaWQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDQxMzBmZjEuLjE1OGYwMDggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yMjA5LDcgKzIyMDksNyBAQCBtYWtlX3JwY3Mo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPnNzZXUuaGFz X3N1YnNsaWNlX3BnKSB7CiAJCXJwY3MgfD0gR0VOOF9SUENTX1NTX0NOVF9FTkFCTEU7Ci0JCXJw Y3MgfD0gSU5URUxfSU5GTyhkZXYpLT5zc2V1LnN1YnNsaWNlX3Blcl9zbGljZSA8PAorCQlycGNz IHw9IGh3ZWlnaHQzMihJTlRFTF9JTkZPKGRldiktPnNzZXUuc3Vic2xpY2VfbWFzaykgPDwKIAkJ CUdFTjhfUlBDU19TU19DTlRfU0hJRlQ7CiAJCXJwY3MgfD0gR0VOOF9SUENTX0VOQUJMRTsKIAl9 Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK