From: Matthew Auld Subject: [PATCH 5/9] drm/i915: make dsm struct resource centric Date: Thu, 7 Dec 2017 12:28:35 +0000 Message-ID: <20171207122839.29925-6-matthew.auld@intel.com> References: <20171207122839.29925-1-matthew.auld@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 ESMTPS id E70426E7F3 for ; Thu, 7 Dec 2017 12:28:54 +0000 (UTC) In-Reply-To: <20171207122839.29925-1-matthew.auld@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: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgd2UgYXJlIHVzaW5nIHN0cnVjdCByZXNvdXJjZSB0byB0cmFjayB0aGUgc3RvbGVu IHJlZ2lvbiwgaXQgaXMKbW9yZSBjb252ZW5pZW50IGlmIHdlIHRyYWNrIGRzbSBpbiBhIHJlc291 cmNlIGFzIHdlbGwuCgp2MjogY2hlY2sgcmFuZ2Vfb3ZlcmZsb3cgd2hlbiB3cml0aW5nIHRvIDMy YiByZWdpc3RlcnMgKENocmlzKQogICAgcGVwcGVyIGluIHNvbWUgY29tbWVudHMgKENocmlzKQp2 MzogcmVmaXQgaTkxNV9zdG9sZW5fdG9fZG1hKCkKdjQ6IGtpbGwgZ2d0dC0+c3RvbGVuX3NpemUK djU6IHNvbWUgbW9yZSBwb2xpc2gKClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhl dy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxp bnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2No YXIvYWdwL2ludGVsLWd0dC5jICAgICAgICAgICB8ICAgMiAtCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgICB8ICAxMiArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyAgICB8ICAgOCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oICAgIHwgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIHwg MTIyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZmJjLmMgICAgICAgfCAgMTMgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyAgICAgICAgfCAgMTUgKystLQogaW5jbHVkZS9kcm0vaW50ZWwtZ3R0LmggICAgICAg ICAgICAgICAgfCAgIDEgLQogOCBmaWxlcyBjaGFuZ2VkLCA4NSBpbnNlcnRpb25zKCspLCA4OSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2NoYXIvYWdwL2ludGVsLWd0dC5jIGIv ZHJpdmVycy9jaGFyL2FncC9pbnRlbC1ndHQuYwppbmRleCA5YjZiNjAyMzE5M2IuLjA1MDcwOGU0 NTYyZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9jaGFyL2FncC9pbnRlbC1ndHQuYworKysgYi9kcml2 ZXJzL2NoYXIvYWdwL2ludGVsLWd0dC5jCkBAIC0xNDIyLDEyICsxNDIyLDEwIEBAIGludCBpbnRl bF9nbWNoX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpicmlkZ2VfcGRldiwgc3RydWN0IHBjaV9kZXYg KmdwdV9wZGV2LAogRVhQT1JUX1NZTUJPTChpbnRlbF9nbWNoX3Byb2JlKTsKIAogdm9pZCBpbnRl bF9ndHRfZ2V0KHU2NCAqZ3R0X3RvdGFsLAotCQkgICB1MzIgKnN0b2xlbl9zaXplLAogCQkgICBw aHlzX2FkZHJfdCAqbWFwcGFibGVfYmFzZSwKIAkJICAgdTY0ICptYXBwYWJsZV9lbmQpCiB7CiAJ Kmd0dF90b3RhbCA9IGludGVsX3ByaXZhdGUuZ3R0X3RvdGFsX2VudHJpZXMgPDwgUEFHRV9TSElG VDsKLQkqc3RvbGVuX3NpemUgPSBpbnRlbF9wcml2YXRlLnN0b2xlbl9zaXplOwogCSptYXBwYWJs ZV9iYXNlID0gaW50ZWxfcHJpdmF0ZS5nbWFfYnVzX2FkZHI7CiAJKm1hcHBhYmxlX2VuZCA9IGlu dGVsX3ByaXZhdGUuZ3R0X21hcHBhYmxlX2VudHJpZXMgPDwgUEFHRV9TSElGVDsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IDAyNTUxYzc4MWYwYS4uZTg4ZmFiNTUyMjc4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE1MzcsOSArMTUzNyw2IEBAIHN0cnVjdCBpOTE1X2dlbV9t bSB7CiAJICovCiAJc3RydWN0IHBhZ2V2ZWMgd2Nfc3Rhc2g7CiAKLQkvKiogVXNhYmxlIHBvcnRp b24gb2YgdGhlIEdUVCBmb3IgR0VNICovCi0JZG1hX2FkZHJfdCBzdG9sZW5fYmFzZTsgLyogbGlt aXRlZCB0byBsb3cgbWVtb3J5ICgzMi1iaXQpICovCi0KIAkvKioKIAkgKiB0bXBmcyBpbnN0YW5j ZSB1c2VkIGZvciBzaG1lbSBiYWNrZWQgb2JqZWN0cwogCSAqLwpAQCAtMjI1Myw2ICsyMjUwLDE1 IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAogCWNvbnN0IHN0cnVjdCBpbnRlbF9kZXZp Y2VfaW5mbyBpbmZvOwogCisJLyoqCisJICogRGF0YSBTdG9sZW4gTWVtb3J5IC0gYWthICJpOTE1 IHN0b2xlbiBtZW1vcnkiIGdpdmVzIHVzIHRoZSBzdGFydCBhbmQKKwkgKiBlbmQgb2Ygc3RvbGVu IHdoaWNoIHdlIGNhbiBvcHRpb25hbGx5IHVzZSB0byBjcmVhdGUgR0VNIG9iamVjdHMKKwkgKiBi YWNrZWQgYnkgc3RvbGVuIG1lbW9yeS4gTm90ZSB0aGF0IGdndHQtPnN0b2xlbl91c2FibGVfc2l6 ZSB0ZWxscyB1cworCSAqIGV4YWN0bHkgaG93IG11Y2ggb2YgdGhpcyB3ZSBhcmUgYWN0dWFsbHkg YWxsb3dlZCB0byB1c2UsIGdpdmVuIHRoYXQKKwkgKiBzb21lIHBvcnRpb24gb2YgaXQgaXMgaW4g ZmFjdCByZXNlcnZlZCBmb3IgdXNlIGJ5IGhhcmR3YXJlIGZ1bmN0aW9ucy4KKwkgKi8KKwlzdHJ1 Y3QgcmVzb3VyY2UgZHNtOworCiAJdm9pZCBfX2lvbWVtICpyZWdzOwogCiAJc3RydWN0IGludGVs X3VuY29yZSB1bmNvcmU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDAzNmE3 OWZlMjUyZC4uNjJkZDkwZTAwYzNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpA QCAtMzI5OSw4ICszMjk5LDYgQEAgc3RhdGljIGludCBnZW44X2dtY2hfcHJvYmUoc3RydWN0IGk5 MTVfZ2d0dCAqZ2d0dCkKIAogCXBjaV9yZWFkX2NvbmZpZ193b3JkKHBkZXYsIFNOQl9HTUNIX0NU UkwsICZzbmJfZ21jaF9jdGwpOwogCi0JZ2d0dC0+c3RvbGVuX3NpemUgPSByZXNvdXJjZV9zaXpl KCZpbnRlbF9ncmFwaGljc19zdG9sZW5fcmVzKTsKLQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDkpIHsKIAkJc2l6ZSA9IGdlbjhfZ2V0X3RvdGFsX2d0dF9zaXplKHNuYl9nbWNoX2N0bCk7 CiAJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewpAQCAtMzM2Myw4ICszMzYx LDYgQEAgc3RhdGljIGludCBnZW42X2dtY2hfcHJvYmUoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkK IAkJRFJNX0VSUk9SKCJDYW4ndCBzZXQgRE1BIG1hc2svY29uc2lzdGVudCBtYXNrICglZClcbiIs IGVycik7CiAJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgU05CX0dNQ0hfQ1RSTCwgJnNuYl9n bWNoX2N0bCk7CiAKLQlnZ3R0LT5zdG9sZW5fc2l6ZSA9IHJlc291cmNlX3NpemUoJmludGVsX2dy YXBoaWNzX3N0b2xlbl9yZXMpOwotCiAJc2l6ZSA9IGdlbjZfZ2V0X3RvdGFsX2d0dF9zaXplKHNu Yl9nbWNoX2N0bCk7CiAJZ2d0dC0+YmFzZS50b3RhbCA9IChzaXplIC8gc2l6ZW9mKGdlbjZfcHRl X3QpKSA8PCBQQUdFX1NISUZUOwogCkBAIC0zNDEwLDcgKzM0MDYsNiBAQCBzdGF0aWMgaW50IGk5 MTVfZ21jaF9wcm9iZShzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0KQogCX0KIAogCWludGVsX2d0dF9n ZXQoJmdndHQtPmJhc2UudG90YWwsCi0JCSAgICAgICZnZ3R0LT5zdG9sZW5fc2l6ZSwKIAkJICAg ICAgJmdndHQtPm1hcHBhYmxlX2Jhc2UsCiAJCSAgICAgICZnZ3R0LT5tYXBwYWJsZV9lbmQpOwog CkBAIC0zNDgyLDcgKzM0NzcsOCBAQCBpbnQgaTkxNV9nZ3R0X3Byb2JlX2h3KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlEUk1fSU5GTygiTWVtb3J5IHVzYWJsZSBieSBncmFw aGljcyBkZXZpY2UgPSAlbGx1TVxuIiwKIAkJIGdndHQtPmJhc2UudG90YWwgPj4gMjApOwogCURS TV9ERUJVR19EUklWRVIoIkdNQURSIHNpemUgPSAlbGxkTVxuIiwgZ2d0dC0+bWFwcGFibGVfZW5k ID4+IDIwKTsKLQlEUk1fREVCVUdfRFJJVkVSKCJHVFQgc3RvbGVuIHNpemUgPSAldU1cbiIsIGdn dHQtPnN0b2xlbl9zaXplID4+IDIwKTsKKwlEUk1fREVCVUdfRFJJVkVSKCJHVFQgc3RvbGVuIHNp emUgPSAlbGx1TVxuIiwKKwkJCSAodTY0KXJlc291cmNlX3NpemUoJmludGVsX2dyYXBoaWNzX3N0 b2xlbl9yZXMpID4+IDIwKTsKIAlpZiAoaW50ZWxfdnRkX2FjdGl2ZSgpKQogCQlEUk1fSU5GTygi VlQtZCBhY3RpdmUgZm9yIGdmeCBhY2Nlc3NcbiIpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCmluZGV4IDkzMjExYTk2ZmRhZC4uMzBhMjkyMGIxMjkxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaApAQCAtMzgxLDcgKzM4MSw2IEBAIHN0cnVjdCBpOTE1X2dndHQgewog CSAqIGF2b2lkIHRoZSBmaXJzdCBwYWdlISBUaGUgdXBwZXIgZW5kIG9mIHN0b2xlbiBtZW1vcnkg aXMgcmVzZXJ2ZWQgZm9yCiAJICogaGFyZHdhcmUgZnVuY3Rpb25zIGFuZCBzaW1pbGFybHkgcmVt b3ZlZCBmcm9tIHRoZSBhY2Nlc3NpYmxlIHJhbmdlLgogCSAqLwotCXUzMiBzdG9sZW5fc2l6ZTsJ CS8qIFRvdGFsIHNpemUgb2Ygc3RvbGVuIG1lbW9yeSAqLwogCXUzMiBzdG9sZW5fdXNhYmxlX3Np emU7CS8qIFRvdGFsIHNpemUgbWludXMgcmVzZXJ2ZWQgcmFuZ2VzICovCiAJdTMyIHN0b2xlbl9y ZXNlcnZlZF9iYXNlOwogCXUzMiBzdG9sZW5fcmVzZXJ2ZWRfc2l6ZTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fc3RvbGVuLmMKaW5kZXggZjhhYzE0MzhjMzVkLi5mNDgyNDIxOGU0MGQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC03NiwyNyArNzYsMjEgQEAg dm9pZCBpOTE1X2dlbV9zdG9sZW5fcmVtb3ZlX25vZGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPm1tLnN0b2xlbl9sb2NrKTsKIH0K IAotc3RhdGljIGRtYV9hZGRyX3QgaTkxNV9zdG9sZW5fdG9fZG1hKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyBpbnQgaTkxNV9hZGp1c3Rfc3RvbGVuKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgIHN0cnVjdCByZXNvdXJjZSAqZHNt KQogewogCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7Ci0JZG1hX2Fk ZHJfdCBiYXNlID0gaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jlcy5zdGFydDsKIAlzdHJ1Y3QgcmVz b3VyY2UgKnI7CiAKLQlHRU1fQlVHX09OKG92ZXJmbG93c190eXBlKGludGVsX2dyYXBoaWNzX3N0 b2xlbl9yZXMuc3RhcnQsIGJhc2UpKTsKKwlpZiAoZHNtLT5zdGFydCA9PSAwIHx8IGRzbS0+ZW5k IDw9IGRzbS0+c3RhcnQpCisJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKGJhc2UgPT0gMCB8fCBh ZGRfb3ZlcmZsb3dzKGJhc2UsIGdndHQtPnN0b2xlbl9zaXplKSkKLQkJcmV0dXJuIDA7Ci0KLQkv KiBtYWtlIHN1cmUgd2UgZG9uJ3QgY2xvYmJlciB0aGUgR1RUIGlmIGl0J3Mgd2l0aGluIHN0b2xl biBtZW1vcnkgKi8KKwkvKiBNYWtlIHN1cmUgd2UgZG9uJ3QgY2xvYmJlciB0aGUgR1RUIGlmIGl0 J3Mgd2l0aGluIHN0b2xlbiBtZW1vcnkgKi8KIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8PSA0 ICYmCiAJICAgICFJU19HMzMoZGV2X3ByaXYpICYmICFJU19QSU5FVklFVyhkZXZfcHJpdikgJiYg IUlTX0c0WChkZXZfcHJpdikpIHsKLQkJc3RydWN0IHsKLQkJCWRtYV9hZGRyX3Qgc3RhcnQsIGVu ZDsKLQkJfSBzdG9sZW5bMl0gPSB7Ci0JCQl7IC5zdGFydCA9IGJhc2UsIC5lbmQgPSBiYXNlICsg Z2d0dC0+c3RvbGVuX3NpemUsIH0sCi0JCQl7IC5zdGFydCA9IGJhc2UsIC5lbmQgPSBiYXNlICsg Z2d0dC0+c3RvbGVuX3NpemUsIH0sCi0JCX07Ci0JCXU2NCBnZ3R0X3N0YXJ0LCBnZ3R0X2VuZDsK KwkJc3RydWN0IHJlc291cmNlIHN0b2xlblsyXSA9IHsqZHNtLCAqZHNtfTsKKwkJc3RydWN0IHJl c291cmNlIGdndHRfcmVzOworCQl1NjQgZ2d0dF9zdGFydDsKIAogCQlnZ3R0X3N0YXJ0ID0gSTkx NV9SRUFEKFBHVEJMX0NUTCk7CiAJCWlmIChJU19HRU40KGRldl9wcml2KSkKQEAgLTEwNCw3MCAr OTgsNjQgQEAgc3RhdGljIGRtYV9hZGRyX3QgaTkxNV9zdG9sZW5fdG9fZG1hKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCQkgICAgIChnZ3R0X3N0YXJ0ICYgUEdUQkxfQURE UkVTU19ISV9NQVNLKSA8PCAyODsKIAkJZWxzZQogCQkJZ2d0dF9zdGFydCAmPSBQR1RCTF9BRERS RVNTX0xPX01BU0s7Ci0JCWdndHRfZW5kID0gZ2d0dF9zdGFydCArIGdndHRfdG90YWxfZW50cmll cyhnZ3R0KSAqIDQ7Ci0KLQkJaWYgKGdndHRfc3RhcnQgPj0gc3RvbGVuWzBdLnN0YXJ0ICYmIGdn dHRfc3RhcnQgPCBzdG9sZW5bMF0uZW5kKQotCQkJc3RvbGVuWzBdLmVuZCA9IGdndHRfc3RhcnQ7 Ci0JCWlmIChnZ3R0X2VuZCA+IHN0b2xlblsxXS5zdGFydCAmJiBnZ3R0X2VuZCA8PSBzdG9sZW5b MV0uZW5kKQotCQkJc3RvbGVuWzFdLnN0YXJ0ID0gZ2d0dF9lbmQ7Ci0KLQkJLyogcGljayB0aGUg bGFyZ2VyIG9mIHRoZSB0d28gY2h1bmtzICovCi0JCWlmIChzdG9sZW5bMF0uZW5kIC0gc3RvbGVu WzBdLnN0YXJ0ID4KLQkJICAgIHN0b2xlblsxXS5lbmQgLSBzdG9sZW5bMV0uc3RhcnQpIHsKLQkJ CWJhc2UgPSBzdG9sZW5bMF0uc3RhcnQ7Ci0JCQlnZ3R0LT5zdG9sZW5fc2l6ZSA9IHN0b2xlblsw XS5lbmQgLSBzdG9sZW5bMF0uc3RhcnQ7Ci0JCX0gZWxzZSB7Ci0JCQliYXNlID0gc3RvbGVuWzFd LnN0YXJ0OwotCQkJZ2d0dC0+c3RvbGVuX3NpemUgPSBzdG9sZW5bMV0uZW5kIC0gc3RvbGVuWzFd LnN0YXJ0OwotCQl9CisKKwkJZ2d0dF9yZXMgPQorCQkJKHN0cnVjdCByZXNvdXJjZSkgREVGSU5F X1JFU19NRU0oZ2d0dF9zdGFydCwKKwkJCQkJCQkgZ2d0dF90b3RhbF9lbnRyaWVzKGdndHQpICog NCk7CisKKwkJaWYgKGdndHRfcmVzLnN0YXJ0ID49IHN0b2xlblswXS5zdGFydCAmJiBnZ3R0X3Jl cy5zdGFydCA8IHN0b2xlblswXS5lbmQpCisJCQlzdG9sZW5bMF0uZW5kID0gZ2d0dF9yZXMuc3Rh cnQ7CisJCWlmIChnZ3R0X3Jlcy5lbmQgPiBzdG9sZW5bMV0uc3RhcnQgJiYgZ2d0dF9yZXMuZW5k IDw9IHN0b2xlblsxXS5lbmQpCisJCQlzdG9sZW5bMV0uc3RhcnQgPSBnZ3R0X3Jlcy5lbmQ7CisK KwkJLyogUGljayB0aGUgbGFyZ2VyIG9mIHRoZSB0d28gY2h1bmtzICovCisJCWlmIChyZXNvdXJj ZV9zaXplKCZzdG9sZW5bMF0pID4gcmVzb3VyY2Vfc2l6ZSgmc3RvbGVuWzFdKSkKKwkJCSpkc20g PSBzdG9sZW5bMF07CisJCWVsc2UKKwkJCSpkc20gPSBzdG9sZW5bMV07CiAKIAkJaWYgKHN0b2xl blswXS5zdGFydCAhPSBzdG9sZW5bMV0uc3RhcnQgfHwKIAkJICAgIHN0b2xlblswXS5lbmQgIT0g c3RvbGVuWzFdLmVuZCkgewotCQkJZG1hX2FkZHJfdCBlbmQgPSBiYXNlICsgZ2d0dC0+c3RvbGVu X3NpemUgLSAxOwotCi0JCQlEUk1fREVCVUdfS01TKCJHVFQgd2l0aGluIHN0b2xlbiBtZW1vcnkg YXQgMHglbGx4LTB4JWxseFxuIiwKLQkJCQkgICAgICAodW5zaWduZWQgbG9uZyBsb25nKWdndHRf c3RhcnQsCi0JCQkJICAgICAgKHVuc2lnbmVkIGxvbmcgbG9uZylnZ3R0X2VuZCAtIDEpOwotCQkJ RFJNX0RFQlVHX0tNUygiU3RvbGVuIG1lbW9yeSBhZGp1c3RlZCB0byAlcGFkIC0gJXBhZFxuIiwK LQkJCQkgICAgICAmYmFzZSwgJmVuZCk7CisJCQlEUk1fREVCVUdfS01TKCJHVFQgd2l0aGluIHN0 b2xlbiBtZW1vcnkgYXQgJXBSXG4iLCAmZ2d0dF9yZXMpOworCQkJRFJNX0RFQlVHX0tNUygiU3Rv bGVuIG1lbW9yeSBhZGp1c3RlZCB0byAlcFJcbiIsIGRzbSk7CiAJCX0KIAl9CiAKLQotCS8qIFZl cmlmeSB0aGF0IG5vdGhpbmcgZWxzZSB1c2VzIHRoaXMgcGh5c2ljYWwgYWRkcmVzcy4gU3RvbGVu CisJLyoKKwkgKiBWZXJpZnkgdGhhdCBub3RoaW5nIGVsc2UgdXNlcyB0aGlzIHBoeXNpY2FsIGFk ZHJlc3MuIFN0b2xlbgogCSAqIG1lbW9yeSBzaG91bGQgYmUgcmVzZXJ2ZWQgYnkgdGhlIEJJT1Mg YW5kIGhpZGRlbiBmcm9tIHRoZQogCSAqIGtlcm5lbC4gU28gaWYgdGhlIHJlZ2lvbiBpcyBhbHJl YWR5IG1hcmtlZCBhcyBidXN5LCBzb21ldGhpbmcKIAkgKiBpcyBzZXJpb3VzbHkgd3JvbmcuCiAJ ICovCi0JciA9IGRldm1fcmVxdWVzdF9tZW1fcmVnaW9uKGRldl9wcml2LT5kcm0uZGV2LCBiYXNl LCBnZ3R0LT5zdG9sZW5fc2l6ZSwKKwlyID0gZGV2bV9yZXF1ZXN0X21lbV9yZWdpb24oZGV2X3By aXYtPmRybS5kZXYsIGRzbS0+c3RhcnQsCisJCQkJICAgIHJlc291cmNlX3NpemUoZHNtKSwKIAkJ CQkgICAgIkdyYXBoaWNzIFN0b2xlbiBNZW1vcnkiKTsKIAlpZiAociA9PSBOVUxMKSB7CiAJCS8q CiAJCSAqIE9uZSBtb3JlIGF0dGVtcHQgYnV0IHRoaXMgdGltZSByZXF1ZXN0aW5nIHJlZ2lvbiBm cm9tCi0JCSAqIGJhc2UgKyAxLCBhcyB3ZSBoYXZlIHNlZW4gdGhhdCB0aGlzIHJlc29sdmVzIHRo ZSByZWdpb24KKwkJICogc3RhcnQgKyAxLCBhcyB3ZSBoYXZlIHNlZW4gdGhhdCB0aGlzIHJlc29s dmVzIHRoZSByZWdpb24KIAkJICogY29uZmxpY3Qgd2l0aCB0aGUgUENJIEJ1cy4KIAkJICogVGhp cyBpcyBhIEJJT1Mgdy9hOiBTb21lIEJJT1Mgd3JhcCBzdG9sZW4gaW4gdGhlIHJvb3QKIAkJICog UENJIGJ1cywgYnV0IGhhdmUgYW4gb2ZmLWJ5LW9uZSBlcnJvci4gSGVuY2UgcmV0cnkgdGhlCiAJ CSAqIHJlc2VydmF0aW9uIHN0YXJ0aW5nIGZyb20gMSBpbnN0ZWFkIG9mIDAuCiAJCSAqIFRoZXJl J3MgYWxzbyBCSU9TIHdpdGggb2ZmLWJ5LW9uZSBvbiB0aGUgb3RoZXIgZW5kLgogCQkgKi8KLQkJ ciA9IGRldm1fcmVxdWVzdF9tZW1fcmVnaW9uKGRldl9wcml2LT5kcm0uZGV2LCBiYXNlICsgMSwK LQkJCQkJICAgIGdndHQtPnN0b2xlbl9zaXplIC0gMiwKKwkJciA9IGRldm1fcmVxdWVzdF9tZW1f cmVnaW9uKGRldl9wcml2LT5kcm0uZGV2LCBkc20tPnN0YXJ0ICsgMSwKKwkJCQkJICAgIHJlc291 cmNlX3NpemUoZHNtKSAtIDIsCiAJCQkJCSAgICAiR3JhcGhpY3MgU3RvbGVuIE1lbW9yeSIpOwog CQkvKgogCQkgKiBHRU4zIGZpcm13YXJlIGxpa2VzIHRvIHNtYXNoIHBjaSBicmlkZ2VzIGludG8g dGhlIHN0b2xlbgogCQkgKiByYW5nZS4gQXBwYXJlbnRseSB0aGlzIHdvcmtzLgogCQkgKi8KIAkJ aWYgKHIgPT0gTlVMTCAmJiAhSVNfR0VOMyhkZXZfcHJpdikpIHsKLQkJCWRtYV9hZGRyX3QgZW5k ID0gYmFzZSArIGdndHQtPnN0b2xlbl9zaXplOworCQkJRFJNX0VSUk9SKCJjb25mbGljdCBkZXRl Y3RlZCB3aXRoIHN0b2xlbiByZWdpb246ICVwUlxuIiwKKwkJCQkgIGRzbSk7CiAKLQkJCURSTV9F UlJPUigiY29uZmxpY3QgZGV0ZWN0ZWQgd2l0aCBzdG9sZW4gcmVnaW9uOiBbJXBhZCAtICVwYWRd XG4iLAotCQkJCSAgJmJhc2UsICZlbmQpOwotCQkJYmFzZSA9IDA7CisJCQlyZXR1cm4gLUVCVVNZ OwogCQl9CiAJfQogCi0JcmV0dXJuIGJhc2U7CisJcmV0dXJuIDA7CiB9CiAKIHZvaWQgaTkxNV9n ZW1fY2xlYW51cF9zdG9sZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTE4MywxMSArMTcx LDEwIEBAIHZvaWQgaTkxNV9nZW1fY2xlYW51cF9zdG9sZW4oc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHN0YXRpYyB2b2lkIGc0eF9nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgZG1hX2FkZHJfdCAqYmFzZSwgdTMyICpzaXplKQog ewotCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7CiAJdWludDMyX3Qg cmVnX3ZhbCA9IEk5MTVfUkVBRChJU19HTTQ1KGRldl9wcml2KSA/CiAJCQkJICAgICBDVEdfU1RP TEVOX1JFU0VSVkVEIDoKIAkJCQkgICAgIEVMS19TVE9MRU5fUkVTRVJWRUQpOwotCWRtYV9hZGRy X3Qgc3RvbGVuX3RvcCA9IGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGdndHQtPnN0b2xlbl9z aXplOworCWRtYV9hZGRyX3Qgc3RvbGVuX3RvcCA9IGRldl9wcml2LT5kc20uZW5kICsgMTsKIAog CWlmICgocmVnX3ZhbCAmIEc0WF9TVE9MRU5fUkVTRVJWRURfRU5BQkxFKSA9PSAwKSB7CiAJCSpi YXNlID0gMDsKQEAgLTMwOCw3ICsyOTUsNiBAQCBzdGF0aWMgdm9pZCBjaHZfZ2V0X3N0b2xlbl9y ZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZCBi ZHdfZ2V0X3N0b2xlbl9yZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCQkJICAgIGRtYV9hZGRyX3QgKmJhc2UsIHUzMiAqc2l6ZSkKIHsKLQlzdHJ1Y3QgaTkxNV9n Z3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwogCXVpbnQzMl90IHJlZ192YWwgPSBJOTE1X1JF QUQoR0VONl9TVE9MRU5fUkVTRVJWRUQpOwogCWRtYV9hZGRyX3Qgc3RvbGVuX3RvcDsKIApAQCAt MzE4LDcgKzMwNCw3IEBAIHN0YXRpYyB2b2lkIGJkd19nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcmV0dXJuOwogCX0KIAotCXN0b2xlbl90 b3AgPSBkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgKyBnZ3R0LT5zdG9sZW5fc2l6ZTsKKwlzdG9s ZW5fdG9wID0gZGV2X3ByaXYtPmRzbS5lbmQgKyAxOwogCiAJKmJhc2UgPSByZWdfdmFsICYgR0VO Nl9TVE9MRU5fUkVTRVJWRURfQUREUl9NQVNLOwogCkBAIC0zNTEsMTQgKzMzNywxOCBAQCBpbnQg aTkxNV9nZW1faW5pdF9zdG9sZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CQlyZXR1cm4gMDsKIAl9CiAKLQlpZiAoZ2d0dC0+c3RvbGVuX3NpemUgPT0gMCkKKwlpZiAocmVz b3VyY2Vfc2l6ZSgmaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3JlcykgPT0gMCkKIAkJcmV0dXJuIDA7 CiAKLQlkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPSBpOTE1X3N0b2xlbl90b19kbWEoZGV2X3By aXYpOwotCWlmIChkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPT0gMCkKKwlkZXZfcHJpdi0+ZHNt ID0gaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3JlczsKKworCWlmIChpOTE1X2FkanVzdF9zdG9sZW4o ZGV2X3ByaXYsICZkZXZfcHJpdi0+ZHNtKSkKIAkJcmV0dXJuIDA7CiAKLQlzdG9sZW5fdG9wID0g ZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsgZ2d0dC0+c3RvbGVuX3NpemU7CisJR0VNX0JVR19P TihkZXZfcHJpdi0+ZHNtLnN0YXJ0ID09IDApOworCUdFTV9CVUdfT04oZGV2X3ByaXYtPmRzbS5l bmQgPD0gZGV2X3ByaXYtPmRzbS5zdGFydCk7CisKKwlzdG9sZW5fdG9wID0gZGV2X3ByaXYtPmRz bS5lbmQgKyAxOwogCXJlc2VydmVkX2Jhc2UgPSAwOwogCXJlc2VydmVkX3NpemUgPSAwOwogCkBA IC0zOTksMTIgKzM4OSwxMSBAQCBpbnQgaTkxNV9nZW1faW5pdF9zdG9sZW4oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlyZXNlcnZlZF9iYXNlID0gc3RvbGVuX3RvcDsKIAl9 CiAKLQlpZiAocmVzZXJ2ZWRfYmFzZSA8IGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSB8fAorCWlm IChyZXNlcnZlZF9iYXNlIDwgZGV2X3ByaXYtPmRzbS5zdGFydCB8fAogCSAgICByZXNlcnZlZF9i YXNlICsgcmVzZXJ2ZWRfc2l6ZSA+IHN0b2xlbl90b3ApIHsKIAkJZG1hX2FkZHJfdCByZXNlcnZl ZF90b3AgPSByZXNlcnZlZF9iYXNlICsgcmVzZXJ2ZWRfc2l6ZTsKLQkJRFJNX0VSUk9SKCJTdG9s ZW4gcmVzZXJ2ZWQgYXJlYSBbJXBhZCAtICVwYWRdIG91dHNpZGUgc3RvbGVuIG1lbW9yeSBbJXBh ZCAtICVwYWRdXG4iLAotCQkJICAmcmVzZXJ2ZWRfYmFzZSwgJnJlc2VydmVkX3RvcCwKLQkJCSAg JmRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSwgJnN0b2xlbl90b3ApOworCQlEUk1fRVJST1IoIlN0 b2xlbiByZXNlcnZlZCBhcmVhIFslcGFkIC0gJXBhZF0gb3V0c2lkZSBzdG9sZW4gbWVtb3J5ICVw UlxuIiwKKwkJCSAgJnJlc2VydmVkX2Jhc2UsICZyZXNlcnZlZF90b3AsICZkZXZfcHJpdi0+ZHNt KTsKIAkJcmV0dXJuIDA7CiAJfQogCkBAIC00MTUsOSArNDA0LDkgQEAgaW50IGk5MTVfZ2VtX2lu aXRfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBtZW1vcnks IHNvIGp1c3QgY29uc2lkZXIgdGhlIHN0YXJ0LiAqLwogCXJlc2VydmVkX3RvdGFsID0gc3RvbGVu X3RvcCAtIHJlc2VydmVkX2Jhc2U7CiAKLQlEUk1fREVCVUdfS01TKCJNZW1vcnkgcmVzZXJ2ZWQg Zm9yIGdyYXBoaWNzIGRldmljZTogJXVLLCB1c2FibGU6ICV1S1xuIiwKLQkJICAgICAgZ2d0dC0+ c3RvbGVuX3NpemUgPj4gMTAsCi0JCSAgICAgIChnZ3R0LT5zdG9sZW5fc2l6ZSAtIHJlc2VydmVk X3RvdGFsKSA+PiAxMCk7CisJRFJNX0RFQlVHX0tNUygiTWVtb3J5IHJlc2VydmVkIGZvciBncmFw aGljcyBkZXZpY2U6ICVsbHVLLCB1c2FibGU6ICVsbHVLXG4iLAorCQkgICAgICAodTY0KXJlc291 cmNlX3NpemUoJmRldl9wcml2LT5kc20pID4+IDEwLAorCQkgICAgICAoKHU2NClyZXNvdXJjZV9z aXplKCZkZXZfcHJpdi0+ZHNtKSAtIHJlc2VydmVkX3RvdGFsKSA+PiAxMCk7CiAKIAlzdG9sZW5f dXNhYmxlX3N0YXJ0ID0gMDsKIAkvKiBXYVNraXBTdG9sZW5NZW1vcnlGaXJzdFBhZ2U6YmR3KyAq LwpAQCAtNDI1LDcgKzQxNCw3IEBAIGludCBpOTE1X2dlbV9pbml0X3N0b2xlbihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXN0b2xlbl91c2FibGVfc3RhcnQgPSA0MDk2Owog CiAJZ2d0dC0+c3RvbGVuX3VzYWJsZV9zaXplID0KLQkJZ2d0dC0+c3RvbGVuX3NpemUgLSByZXNl cnZlZF90b3RhbCAtIHN0b2xlbl91c2FibGVfc3RhcnQ7CisJCXJlc291cmNlX3NpemUoJmRldl9w cml2LT5kc20pIC0gcmVzZXJ2ZWRfdG90YWwgLSBzdG9sZW5fdXNhYmxlX3N0YXJ0OwogCiAJLyog QmFzaWMgbWVtcmFuZ2UgYWxsb2NhdG9yIGZvciBzdG9sZW4gc3BhY2UuICovCiAJZHJtX21tX2lu aXQoJmRldl9wcml2LT5tbS5zdG9sZW4sIHN0b2xlbl91c2FibGVfc3RhcnQsCkBAIC00NDIsNyAr NDMxLDggQEAgaTkxNV9wYWdlc19jcmVhdGVfZm9yX3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCXN0cnVjdCBzZ190YWJsZSAqc3Q7CiAJc3RydWN0IHNjYXR0ZXJsaXN0ICpzZzsKIAot CUdFTV9CVUdfT04ocmFuZ2Vfb3ZlcmZsb3dzKG9mZnNldCwgc2l6ZSwgZGV2X3ByaXYtPmdndHQu c3RvbGVuX3NpemUpKTsKKwlHRU1fQlVHX09OKHJhbmdlX292ZXJmbG93c190KHJlc291cmNlX3Np emVfdCwgb2Zmc2V0LCBzaXplLAorCQkJCSAgICAgcmVzb3VyY2Vfc2l6ZSgmZGV2X3ByaXYtPmRz bSkpKTsKIAogCS8qIFdlIGhpZGUgdGhhdCB3ZSBoYXZlIG5vIHN0cnVjdCBwYWdlIGJhY2tpbmcg b3VyIHN0b2xlbiBvYmplY3QKIAkgKiBieSB3cmFwcGluZyB0aGUgY29udGlndW91cyBwaHlzaWNh bCBhbGxvY2F0aW9uIHdpdGggYSBmYWtlCkBAIC00NjIsNyArNDUyLDcgQEAgaTkxNV9wYWdlc19j cmVhdGVfZm9yX3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXNnLT5vZmZzZXQgPSAw OwogCXNnLT5sZW5ndGggPSBzaXplOwogCi0Jc2dfZG1hX2FkZHJlc3Moc2cpID0gKGRtYV9hZGRy X3QpZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsgb2Zmc2V0OworCXNnX2RtYV9hZGRyZXNzKHNn KSA9IChkbWFfYWRkcl90KWRldl9wcml2LT5kc20uc3RhcnQgKyBvZmZzZXQ7CiAJc2dfZG1hX2xl bihzZykgPSBzaXplOwogCiAJcmV0dXJuIHN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwppbmRl eCA0YWVmYzY1OGE1Y2YuLmY4OGMxYjVkYWU0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMK QEAgLTUzMSw3ICs1MzEsNiBAQCBzdGF0aWMgaW50IGZpbmRfY29tcHJlc3Npb25fdGhyZXNob2xk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgICBpbnQgc2l6ZSwK IAkJCQkgICAgICBpbnQgZmJfY3BwKQogewotCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2 X3ByaXYtPmdndHQ7CiAJaW50IGNvbXByZXNzaW9uX3RocmVzaG9sZCA9IDE7CiAJaW50IHJldDsK IAl1NjQgZW5kOwpAQCAtNTQxLDcgKzU0MCw3IEBAIHN0YXRpYyBpbnQgZmluZF9jb21wcmVzc2lv bl90aHJlc2hvbGQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAqIElmIHdl IGVuYWJsZSBGQkMgdXNpbmcgYSBDRkIgb24gdGhhdCBtZW1vcnkgcmFuZ2Ugd2UnbGwgZ2V0IEZJ Rk8KIAkgKiB1bmRlcnJ1bnMsIGV2ZW4gaWYgdGhhdCByYW5nZSBpcyBub3QgcmVzZXJ2ZWQgYnkg dGhlIEJJT1MuICovCiAJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwgSVNfR0VOOV9CQyhk ZXZfcHJpdikpCi0JCWVuZCA9IGdndHQtPnN0b2xlbl9zaXplIC0gOCAqIDEwMjQgKiAxMDI0Owor CQllbmQgPSByZXNvdXJjZV9zaXplKCZkZXZfcHJpdi0+ZHNtKSAtIDggKiAxMDI0ICogMTAyNDsK IAllbHNlCiAJCWVuZCA9IFU2NF9NQVg7CiAKQEAgLTYxNSwxMCArNjE0LDE2IEBAIHN0YXRpYyBp bnQgaW50ZWxfZmJjX2FsbG9jX2NmYihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCQlmYmMt PmNvbXByZXNzZWRfbGxiID0gY29tcHJlc3NlZF9sbGI7CiAKKwkJR0VNX0JVR19PTihyYW5nZV9v dmVyZmxvd3NfdCh1NjQsIGRldl9wcml2LT5kc20uc3RhcnQsCisJCQkJCSAgICAgZmJjLT5jb21w cmVzc2VkX2ZiLnN0YXJ0LAorCQkJCQkgICAgIFUzMl9NQVgpKTsKKwkJR0VNX0JVR19PTihyYW5n ZV9vdmVyZmxvd3NfdCh1NjQsIGRldl9wcml2LT5kc20uc3RhcnQsCisJCQkJCSAgICAgZmJjLT5j b21wcmVzc2VkX2xsYi0+c3RhcnQsCisJCQkJCSAgICAgVTMyX01BWCkpOwogCQlJOTE1X1dSSVRF KEZCQ19DRkJfQkFTRSwKLQkJCSAgIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGZiYy0+Y29t cHJlc3NlZF9mYi5zdGFydCk7CisJCQkgICBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsgZmJjLT5jb21w cmVzc2VkX2ZiLnN0YXJ0KTsKIAkJSTkxNV9XUklURShGQkNfTExfQkFTRSwKLQkJCSAgIGRldl9w cml2LT5tbS5zdG9sZW5fYmFzZSArIGNvbXByZXNzZWRfbGxiLT5zdGFydCk7CisJCQkgICBkZXZf cHJpdi0+ZHNtLnN0YXJ0ICsgY29tcHJlc3NlZF9sbGItPnN0YXJ0KTsKIAl9CiAKIAlEUk1fREVC VUdfS01TKCJyZXNlcnZlZCAlbGx1IGJ5dGVzIG9mIGNvbnRpZ3VvdXMgc3RvbGVuIHNwYWNlIGZv ciBGQkMsIHRocmVzaG9sZDogJWRcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA1ODM2 MTgxZDZmOGEuLjc5YjNmZDYxN2RlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC03MDIw LDcgKzcwMjAsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NoZWNrX3BjdHgoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXVuc2lnbmVkIGxvbmcgcGN0eF9hZGRyID0g STkxNV9SRUFEKFZMVl9QQ0JSKSAmIH40MDk1OwogCi0JV0FSTl9PTihwY3R4X2FkZHIgIT0gZGV2 X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsKKwlXQVJOX09OKHBjdHhfYWRkciAhPSBkZXZfcHJpdi0+ ZHNtLnN0YXJ0ICsKIAkJCSAgICAgZGV2X3ByaXYtPnZsdl9wY3R4LT5zdG9sZW4tPnN0YXJ0KTsK IH0KIApAQCAtNzAzNSw3ICs3MDM1LDYgQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19jaGVja19w Y3R4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZvaWQgY2hl cnJ5dmlld19zZXR1cF9wY3R4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK LQlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwogCXVuc2lnbmVkIGxv bmcgcGN0eF9wYWRkciwgcGFkZHI7CiAJdTMyIHBjYnI7CiAJaW50IHBjdHhfc2l6ZSA9IDMyKjEw MjQ7CkBAIC03MDQzLDggKzcwNDIsOCBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X3NldHVwX3Bj dHgoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXBjYnIgPSBJOTE1X1JFQUQo VkxWX1BDQlIpOwogCWlmICgocGNiciA+PiBWTFZfUENCUl9BRERSX1NISUZUKSA9PSAwKSB7CiAJ CURSTV9ERUJVR19EUklWRVIoIkJJT1MgZGlkbid0IHNldCB1cCBQQ0JSLCBmaXhpbmcgdXBcbiIp OwotCQlwYWRkciA9IChkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgKwotCQkJIChnZ3R0LT5zdG9s ZW5fc2l6ZSAtIHBjdHhfc2l6ZSkpOworCQlwYWRkciA9IGRldl9wcml2LT5kc20uZW5kICsgMSAt IHBjdHhfc2l6ZTsKKwkJR0VNX0JVR19PTihwYWRkciA+IFUzMl9NQVgpOwogCiAJCXBjdHhfcGFk ZHIgPSAocGFkZHIgJiAofjQwOTUpKTsKIAkJSTkxNV9XUklURShWTFZfUENCUiwgcGN0eF9wYWRk cik7CkBAIC03MDY1LDcgKzcwNjQsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3NldHVwX3Bj dHgoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkvKiBCSU9TIHNldCBpdCB1 cCBhbHJlYWR5LCBncmFiIHRoZSBwcmUtYWxsb2MnZCBzcGFjZSAqLwogCQlpbnQgcGNicl9vZmZz ZXQ7CiAKLQkJcGNicl9vZmZzZXQgPSAocGNiciAmICh+NDA5NSkpIC0gZGV2X3ByaXYtPm1tLnN0 b2xlbl9iYXNlOworCQlwY2JyX29mZnNldCA9IChwY2JyICYgKH40MDk1KSkgLSBkZXZfcHJpdi0+ ZHNtLnN0YXJ0OwogCQlwY3R4ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9yX3By ZWFsbG9jYXRlZChkZXZfcHJpdiwKIAkJCQkJCQkJICAgICAgcGNicl9vZmZzZXQsCiAJCQkJCQkJ CSAgICAgIEk5MTVfR1RUX09GRlNFVF9OT05FLApAQCAtNzA4OSw3ICs3MDg4LDExIEBAIHN0YXRp YyB2b2lkIHZhbGxleXZpZXdfc2V0dXBfcGN0eChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJCWdvdG8gb3V0OwogCX0KIAotCXBjdHhfcGFkZHIgPSBkZXZfcHJpdi0+bW0uc3Rv bGVuX2Jhc2UgKyBwY3R4LT5zdG9sZW4tPnN0YXJ0OworCUdFTV9CVUdfT04ocmFuZ2Vfb3ZlcmZs b3dzX3QodTY0LAorCQkJCSAgICAgZGV2X3ByaXYtPmRzbS5zdGFydCwKKwkJCQkgICAgIHBjdHgt PnN0b2xlbi0+c3RhcnQsCisJCQkJICAgICBVMzJfTUFYKSk7CisJcGN0eF9wYWRkciA9IGRldl9w cml2LT5kc20uc3RhcnQgKyBwY3R4LT5zdG9sZW4tPnN0YXJ0OwogCUk5MTVfV1JJVEUoVkxWX1BD QlIsIHBjdHhfcGFkZHIpOwogCiBvdXQ6CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9pbnRlbC1n dHQuaCBiL2luY2x1ZGUvZHJtL2ludGVsLWd0dC5oCmluZGV4IGM1ZGI3OTc1YzY0MC4uOGM1Nzdj YTM4ZTJlIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9pbnRlbC1ndHQuaAorKysgYi9pbmNsdWRl L2RybS9pbnRlbC1ndHQuaApAQCAtNSw3ICs1LDYgQEAKICNkZWZpbmUJX0RSTV9JTlRFTF9HVFRf SAogCiB2b2lkIGludGVsX2d0dF9nZXQodTY0ICpndHRfdG90YWwsCi0JCSAgIHUzMiAqc3RvbGVu X3NpemUsCiAJCSAgIHBoeXNfYWRkcl90ICptYXBwYWJsZV9iYXNlLAogCQkgICB1NjQgKm1hcHBh YmxlX2VuZCk7CiAKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==