From: Ramalingam C Subject: [PATCH v7 04/39] drm/i915: wrapping all hdcp var into intel_hdcp Date: Thu, 27 Sep 2018 12:24:55 +0530 Message-ID: <1538031330-21040-5-git-send-email-ramalingam.c@intel.com> References: <1538031330-21040-1-git-send-email-ramalingam.c@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1538031330-21040-1-git-send-email-ramalingam.c@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, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, tomas.winkler@intel.com List-Id: dri-devel@lists.freedesktop.org Q29uc2lkZXJpbmcgc2lnbmlmaWNhbnQgbnVtYmVyIG9mIEhEQ1Agc3BlY2lmaWMgdmFyaWFibGVz LCBpdCB3aWxsCmJlIGNsZWFuIHRvIGhhdmUgc2VwYXJhdGUgc3RydWN0IGZvciBIRENQLgoKTmV3 IHN0cnVjdHVyZSBjYWxsZWQgaW50ZWxfaGRjcCBpcyBhZGRlZCB3aXRoaW4gaW50ZWxfY29ubmVj dG9yLgoKdjI6CiAgc3RydWN0IGhkY3Agc3RhdGljYWxseSBhbGxvY2F0ZWQuIFtTZWFuIFBhdWxd CiAgZW5hYmxlIGFuZCBkaXNhYmxlIGZ1bmN0aW9uIHBhcmFtZXRlcnMgYXJlIHJldGFpbmVkLltT ZWFuIFBhdWxdCnYzOgogIE5vIENoYW5nZXMuCnY0OgogIENvbW1pdCBtc2cgaXMgcmVwaHJhc2Vk IFtVbWFdCnY1OgogIENvbW1lbnQgZm9yIG11dGV4IGRlZmluaXRpb24uCnY2OgogIGhkY3BfIHBy ZWZpeCBmcm9tIGFsbCBpbnRlbF9oZGNwIG1lbWJlcnMgYXJlIHJlbW92ZWQgW1NlYW4gUGF1bF0K ICBpbmxpbmUgZnVuY3Rpb24gaW50ZWxfaGRjcF90b19jb25uZWN0b3IgaXMgZGVmaW5lZCBbU2Vh biBQYXVsXQp2NzoKICAlcy91aW50NjRfdC91NjQKClNpZ25lZC1vZmYtYnk6IFJhbWFsaW5nYW0g QyA8cmFtYWxpbmdhbS5jQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFNlYW4gUGF1bCA8c2VhbnBh dWxAY2hyb21pdW0ub3JnPgpSZXZpZXdlZC1ieTogVW1hIFNoYW5rYXIgPHVtYS5zaGFua2FyQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgIDYg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxNSArKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRjcC5jICAgIHwgMTA3ICsrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDU2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0YzVj MmIzOWU2NWMuLjBmMTg2MThlNmExYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMTYwMzMsOSArMTYwMzMsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9ocGRfcG9sbF9maW5p KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yX2l0ZXIo Y29ubmVjdG9yLCAmY29ubl9pdGVyKSB7CiAJCWlmIChjb25uZWN0b3ItPm1vZGVzZXRfcmV0cnlf d29yay5mdW5jKQogCQkJY2FuY2VsX3dvcmtfc3luYygmY29ubmVjdG9yLT5tb2Rlc2V0X3JldHJ5 X3dvcmspOwotCQlpZiAoY29ubmVjdG9yLT5oZGNwX3NoaW0pIHsKLQkJCWNhbmNlbF9kZWxheWVk X3dvcmtfc3luYygmY29ubmVjdG9yLT5oZGNwX2NoZWNrX3dvcmspOwotCQkJY2FuY2VsX3dvcmtf c3luYygmY29ubmVjdG9yLT5oZGNwX3Byb3Bfd29yayk7CisJCWlmIChjb25uZWN0b3ItPmhkY3Au c2hpbSkgeworCQkJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZjb25uZWN0b3ItPmhkY3AuY2hl Y2tfd29yayk7CisJCQljYW5jZWxfd29ya19zeW5jKCZjb25uZWN0b3ItPmhkY3AucHJvcF93b3Jr KTsKIAkJfQogCX0KIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDRmY2JhOTlkMTJjMC4uNzYwYmUxNjNhNDFlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMzgxLDYgKzM4MSwxNSBAQCBzdHJ1Y3QgaW50 ZWxfaGRjcF9zaGltIHsKIAkJCSAgICBib29sICpoZGNwX2NhcGFibGUpOwogfTsKIAorc3RydWN0 IGludGVsX2hkY3AgeworCWNvbnN0IHN0cnVjdCBpbnRlbF9oZGNwX3NoaW0gKnNoaW07CisJLyog TXV0ZXggZm9yIGhkY3Agc3RhdGUgb2YgdGhlIGNvbm5lY3RvciAqLworCXN0cnVjdCBtdXRleCBt dXRleDsKKwl1NjQgdmFsdWU7CisJc3RydWN0IGRlbGF5ZWRfd29yayBjaGVja193b3JrOworCXN0 cnVjdCB3b3JrX3N0cnVjdCBwcm9wX3dvcms7Cit9OworCiBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9y IHsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBiYXNlOwogCS8qCkBAIC00MTMsMTEgKzQyMiw3IEBA IHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgewogCS8qIFdvcmsgc3RydWN0IHRvIHNjaGVkdWxlIGEg dWV2ZW50IG9uIGxpbmsgdHJhaW4gZmFpbHVyZSAqLwogCXN0cnVjdCB3b3JrX3N0cnVjdCBtb2Rl c2V0X3JldHJ5X3dvcms7CiAKLQljb25zdCBzdHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpoZGNwX3No aW07Ci0Jc3RydWN0IG11dGV4IGhkY3BfbXV0ZXg7Ci0JdWludDY0X3QgaGRjcF92YWx1ZTsgLyog cHJvdGVjdGVkIGJ5IGhkY3BfbXV0ZXggKi8KLQlzdHJ1Y3QgZGVsYXllZF93b3JrIGhkY3BfY2hl Y2tfd29yazsKLQlzdHJ1Y3Qgd29ya19zdHJ1Y3QgaGRjcF9wcm9wX3dvcms7CisJc3RydWN0IGlu dGVsX2hkY3AgaGRjcDsKIH07CiAKIHN0cnVjdCBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0 ZSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZGNwLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZGNwLmMKaW5kZXggMjZlNDhmYzk1NTQzLi40MjcyMDIw NDU3MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkY3AuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZGNwLmMKQEAgLTYyNiw2ICs2MjYsNyBAQCBz dHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpjb25uX3RvX2RpZ19wb3J0KHN0cnVjdCBpbnRlbF9j b25uZWN0b3IgKmNvbm5lY3RvcikKIAogc3RhdGljIGludCBfaW50ZWxfaGRjcF9kaXNhYmxlKHN0 cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKKwlzdHJ1Y3QgaW50ZWxfaGRjcCAq aGRjcCA9ICZjb25uZWN0b3ItPmhkY3A7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gY29ubmVjdG9yLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBjb25uX3RvX2RpZ19wb3J0KGNvbm5lY3Rvcik7 CiAJZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5wb3J0OwpAQCAtNjQxLDcg KzY0Miw3IEBAIHN0YXRpYyBpbnQgX2ludGVsX2hkY3BfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpjb25uZWN0b3IpCiAJCXJldHVybiAtRVRJTUVET1VUOwogCX0KIAotCXJldCA9IGNv bm5lY3Rvci0+aGRjcF9zaGltLT50b2dnbGVfc2lnbmFsbGluZyhpbnRlbF9kaWdfcG9ydCwgZmFs c2UpOworCXJldCA9IGhkY3AtPnNoaW0tPnRvZ2dsZV9zaWduYWxsaW5nKGludGVsX2RpZ19wb3J0 LCBmYWxzZSk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBkaXNhYmxlIEhE Q1Agc2lnbmFsbGluZ1xuIik7CiAJCXJldHVybiByZXQ7CkBAIC02NTMsNiArNjU0LDcgQEAgc3Rh dGljIGludCBfaW50ZWxfaGRjcF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcikKIAogc3RhdGljIGludCBfaW50ZWxfaGRjcF9lbmFibGUoc3RydWN0IGludGVsX2Nvbm5l Y3RvciAqY29ubmVjdG9yKQogeworCXN0cnVjdCBpbnRlbF9oZGNwICpoZGNwID0gJmNvbm5lY3Rv ci0+aGRjcDsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjb25uZWN0b3It PmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgaSwgcmV0LCB0cmllcyA9IDM7CiAKQEAgLTY3 Nyw4ICs2NzksNyBAQCBzdGF0aWMgaW50IF9pbnRlbF9oZGNwX2VuYWJsZShzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICpjb25uZWN0b3IpCiAKIAkvKiBJbmNhc2Ugb2YgYXV0aGVudGljYXRpb24gZmFp bHVyZXMsIEhEQ1Agc3BlYyBleHBlY3RzIHJlYXV0aC4gKi8KIAlmb3IgKGkgPSAwOyBpIDwgdHJp ZXM7IGkrKykgewotCQlyZXQgPSBpbnRlbF9oZGNwX2F1dGgoY29ubl90b19kaWdfcG9ydChjb25u ZWN0b3IpLAotCQkJCSAgICAgIGNvbm5lY3Rvci0+aGRjcF9zaGltKTsKKwkJcmV0ID0gaW50ZWxf aGRjcF9hdXRoKGNvbm5fdG9fZGlnX3BvcnQoY29ubmVjdG9yKSwgaGRjcC0+c2hpbSk7CiAJCWlm ICghcmV0KQogCQkJcmV0dXJuIDA7CiAKQEAgLTY5MiwzOCArNjkzLDQ2IEBAIHN0YXRpYyBpbnQg X2ludGVsX2hkY3BfZW5hYmxlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAly ZXR1cm4gcmV0OwogfQogCitzdGF0aWMgaW5saW5lCitzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpp bnRlbF9oZGNwX3RvX2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfaGRjcCAqaGRjcCkKK3sKKwlyZXR1 cm4gY29udGFpbmVyX29mKGhkY3AsIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IsIGhkY3ApOworfQor CiBzdGF0aWMgdm9pZCBpbnRlbF9oZGNwX2NoZWNrX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3 b3JrKQogewotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciA9IGNvbnRhaW5lcl9v Zih0b19kZWxheWVkX3dvcmsod29yayksCi0JCQkJCQkJIHN0cnVjdCBpbnRlbF9jb25uZWN0b3Is Ci0JCQkJCQkJIGhkY3BfY2hlY2tfd29yayk7CisJc3RydWN0IGludGVsX2hkY3AgKmhkY3AgPSBj b250YWluZXJfb2YodG9fZGVsYXllZF93b3JrKHdvcmspLAorCQkJCQkgICAgICAgc3RydWN0IGlu dGVsX2hkY3AsCisJCQkJCSAgICAgICBjaGVja193b3JrKTsKKwlzdHJ1Y3QgaW50ZWxfY29ubmVj dG9yICpjb25uZWN0b3IgPSBpbnRlbF9oZGNwX3RvX2Nvbm5lY3RvcihoZGNwKTsKKwogCWlmICgh aW50ZWxfaGRjcF9jaGVja19saW5rKGNvbm5lY3RvcikpCi0JCXNjaGVkdWxlX2RlbGF5ZWRfd29y aygmY29ubmVjdG9yLT5oZGNwX2NoZWNrX3dvcmssCisJCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygm aGRjcC0+Y2hlY2tfd29yaywKIAkJCQkgICAgICBEUk1fSERDUF9DSEVDS19QRVJJT0RfTVMpOwog fQogCiBzdGF0aWMgdm9pZCBpbnRlbF9oZGNwX3Byb3Bfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KndvcmspCiB7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yID0gY29udGFpbmVy X29mKHdvcmssCi0JCQkJCQkJIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IsCi0JCQkJCQkJIGhkY3Bf cHJvcF93b3JrKTsKKwlzdHJ1Y3QgaW50ZWxfaGRjcCAqaGRjcCA9IGNvbnRhaW5lcl9vZih3b3Jr LCBzdHJ1Y3QgaW50ZWxfaGRjcCwKKwkJCQkJICAgICAgIHByb3Bfd29yayk7CisJc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yID0gaW50ZWxfaGRjcF90b19jb25uZWN0b3IoaGRjcCk7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+YmFzZS5kZXY7CiAJc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKnN0YXRlOwogCiAJZHJtX21vZGVzZXRfbG9jaygmZGV2LT5t b2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCBOVUxMKTsKLQltdXRleF9sb2NrKCZjb25uZWN0 b3ItPmhkY3BfbXV0ZXgpOworCW11dGV4X2xvY2soJmhkY3AtPm11dGV4KTsKIAogCS8qCiAJICog VGhpcyB3b3JrZXIgaXMgb25seSB1c2VkIHRvIGZsaXAgYmV0d2VlbiBFTkFCTEVEL0RFU0lSRUQu IEVpdGhlciBvZgotCSAqIHRob3NlIHRvIFVOREVTSVJFRCBpcyBoYW5kbGVkIGJ5IGNvcmUuIElm IGhkY3BfdmFsdWUgPT0gVU5ERVNJUkVELAorCSAqIHRob3NlIHRvIFVOREVTSVJFRCBpcyBoYW5k bGVkIGJ5IGNvcmUuIElmIHZhbHVlID09IFVOREVTSVJFRCwKIAkgKiB3ZSdyZSBydW5uaW5nIGp1 c3QgYWZ0ZXIgaGRjcCBoYXMgYmVlbiBkaXNhYmxlZCwgc28ganVzdCBleGl0CiAJICovCi0JaWYg KGNvbm5lY3Rvci0+aGRjcF92YWx1ZSAhPSBEUk1fTU9ERV9DT05URU5UX1BST1RFQ1RJT05fVU5E RVNJUkVEKSB7CisJaWYgKGhkY3AtPnZhbHVlICE9IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElP Tl9VTkRFU0lSRUQpIHsKIAkJc3RhdGUgPSBjb25uZWN0b3ItPmJhc2Uuc3RhdGU7Ci0JCXN0YXRl LT5jb250ZW50X3Byb3RlY3Rpb24gPSBjb25uZWN0b3ItPmhkY3BfdmFsdWU7CisJCXN0YXRlLT5j b250ZW50X3Byb3RlY3Rpb24gPSBoZGNwLT52YWx1ZTsKIAl9CiAKLQltdXRleF91bmxvY2soJmNv bm5lY3Rvci0+aGRjcF9tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZoZGNwLT5tdXRleCk7CiAJZHJt X21vZGVzZXRfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOwogfQog CkBAIC03MzUsOCArNzQ0LDkgQEAgYm9vbCBpc19oZGNwX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KQogfQogCiBpbnQgaW50ZWxfaGRj cF9pbml0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwKLQkJICAgIGNvbnN0IHN0 cnVjdCBpbnRlbF9oZGNwX3NoaW0gKmhkY3Bfc2hpbSkKKwkJICAgIGNvbnN0IHN0cnVjdCBpbnRl bF9oZGNwX3NoaW0gKnNoaW0pCiB7CisJc3RydWN0IGludGVsX2hkY3AgKmhkY3AgPSAmY29ubmVj dG9yLT5oZGNwOwogCWludCByZXQ7CiAKIAlyZXQgPSBkcm1fY29ubmVjdG9yX2F0dGFjaF9jb250 ZW50X3Byb3RlY3Rpb25fcHJvcGVydHkoCkBAIC03NDQsNTEgKzc1NCw1MyBAQCBpbnQgaW50ZWxf aGRjcF9pbml0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCi0JY29ubmVjdG9yLT5oZGNwX3NoaW0gPSBoZGNwX3NoaW07Ci0JbXV0 ZXhfaW5pdCgmY29ubmVjdG9yLT5oZGNwX211dGV4KTsKLQlJTklUX0RFTEFZRURfV09SSygmY29u bmVjdG9yLT5oZGNwX2NoZWNrX3dvcmssIGludGVsX2hkY3BfY2hlY2tfd29yayk7Ci0JSU5JVF9X T1JLKCZjb25uZWN0b3ItPmhkY3BfcHJvcF93b3JrLCBpbnRlbF9oZGNwX3Byb3Bfd29yayk7CisJ aGRjcC0+c2hpbSA9IHNoaW07CisJbXV0ZXhfaW5pdCgmaGRjcC0+bXV0ZXgpOworCUlOSVRfREVM QVlFRF9XT1JLKCZoZGNwLT5jaGVja193b3JrLCBpbnRlbF9oZGNwX2NoZWNrX3dvcmspOworCUlO SVRfV09SSygmaGRjcC0+cHJvcF93b3JrLCBpbnRlbF9oZGNwX3Byb3Bfd29yayk7CiAJcmV0dXJu IDA7CiB9CiAKIGludCBpbnRlbF9oZGNwX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpj b25uZWN0b3IpCiB7CisJc3RydWN0IGludGVsX2hkY3AgKmhkY3AgPSAmY29ubmVjdG9yLT5oZGNw OwogCWludCByZXQ7CiAKLQlpZiAoIWNvbm5lY3Rvci0+aGRjcF9zaGltKQorCWlmICghaGRjcC0+ c2hpbSkKIAkJcmV0dXJuIC1FTk9FTlQ7CiAKLQltdXRleF9sb2NrKCZjb25uZWN0b3ItPmhkY3Bf bXV0ZXgpOworCW11dGV4X2xvY2soJmhkY3AtPm11dGV4KTsKIAogCXJldCA9IF9pbnRlbF9oZGNw X2VuYWJsZShjb25uZWN0b3IpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0JY29ubmVjdG9y LT5oZGNwX3ZhbHVlID0gRFJNX01PREVfQ09OVEVOVF9QUk9URUNUSU9OX0VOQUJMRUQ7Ci0Jc2No ZWR1bGVfd29yaygmY29ubmVjdG9yLT5oZGNwX3Byb3Bfd29yayk7Ci0Jc2NoZWR1bGVfZGVsYXll ZF93b3JrKCZjb25uZWN0b3ItPmhkY3BfY2hlY2tfd29yaywKKwloZGNwLT52YWx1ZSA9IERSTV9N T0RFX0NPTlRFTlRfUFJPVEVDVElPTl9FTkFCTEVEOworCXNjaGVkdWxlX3dvcmsoJmhkY3AtPnBy b3Bfd29yayk7CisJc2NoZWR1bGVfZGVsYXllZF93b3JrKCZoZGNwLT5jaGVja193b3JrLAogCQkJ ICAgICAgRFJNX0hEQ1BfQ0hFQ0tfUEVSSU9EX01TKTsKIG91dDoKLQltdXRleF91bmxvY2soJmNv bm5lY3Rvci0+aGRjcF9tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZoZGNwLT5tdXRleCk7CiAJcmV0 dXJuIHJldDsKIH0KIAogaW50IGludGVsX2hkY3BfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY29ubmVj dG9yICpjb25uZWN0b3IpCiB7CisJc3RydWN0IGludGVsX2hkY3AgKmhkY3AgPSAmY29ubmVjdG9y LT5oZGNwOwogCWludCByZXQgPSAwOwogCi0JaWYgKCFjb25uZWN0b3ItPmhkY3Bfc2hpbSkKKwlp ZiAoIWhkY3AtPnNoaW0pCiAJCXJldHVybiAtRU5PRU5UOwogCi0JbXV0ZXhfbG9jaygmY29ubmVj dG9yLT5oZGNwX211dGV4KTsKKwltdXRleF9sb2NrKCZoZGNwLT5tdXRleCk7CiAKLQlpZiAoY29u bmVjdG9yLT5oZGNwX3ZhbHVlICE9IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElPTl9VTkRFU0lS RUQpIHsKLQkJY29ubmVjdG9yLT5oZGNwX3ZhbHVlID0gRFJNX01PREVfQ09OVEVOVF9QUk9URUNU SU9OX1VOREVTSVJFRDsKKwlpZiAoaGRjcC0+dmFsdWUgIT0gRFJNX01PREVfQ09OVEVOVF9QUk9U RUNUSU9OX1VOREVTSVJFRCkgeworCQloZGNwLT52YWx1ZSA9IERSTV9NT0RFX0NPTlRFTlRfUFJP VEVDVElPTl9VTkRFU0lSRUQ7CiAJCXJldCA9IF9pbnRlbF9oZGNwX2Rpc2FibGUoY29ubmVjdG9y KTsKIAl9CiAKLQltdXRleF91bmxvY2soJmNvbm5lY3Rvci0+aGRjcF9tdXRleCk7Ci0JY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZjb25uZWN0b3ItPmhkY3BfY2hlY2tfd29yayk7CisJbXV0ZXhf dW5sb2NrKCZoZGNwLT5tdXRleCk7CisJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZoZGNwLT5j aGVja193b3JrKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC04MjgsMTcgKzg0MCwxOCBAQCB2b2lk IGludGVsX2hkY3BfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is CiAvKiBJbXBsZW1lbnRzIFBhcnQgMyBvZiB0aGUgSERDUCBhdXRob3JpemF0aW9uIHByb2NlZHVy ZSAqLwogaW50IGludGVsX2hkY3BfY2hlY2tfbGluayhzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpj b25uZWN0b3IpCiB7CisJc3RydWN0IGludGVsX2hkY3AgKmhkY3AgPSAmY29ubmVjdG9yLT5oZGNw OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNvbm5lY3Rvci0+YmFzZS5k ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19w b3J0ID0gY29ubl90b19kaWdfcG9ydChjb25uZWN0b3IpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50 ZWxfZGlnX3BvcnQtPmJhc2UucG9ydDsKIAlpbnQgcmV0ID0gMDsKIAotCWlmICghY29ubmVjdG9y LT5oZGNwX3NoaW0pCisJaWYgKCFoZGNwLT5zaGltKQogCQlyZXR1cm4gLUVOT0VOVDsKIAotCW11 dGV4X2xvY2soJmNvbm5lY3Rvci0+aGRjcF9tdXRleCk7CisJbXV0ZXhfbG9jaygmaGRjcC0+bXV0 ZXgpOwogCi0JaWYgKGNvbm5lY3Rvci0+aGRjcF92YWx1ZSA9PSBEUk1fTU9ERV9DT05URU5UX1BS T1RFQ1RJT05fVU5ERVNJUkVEKQorCWlmIChoZGNwLT52YWx1ZSA9PSBEUk1fTU9ERV9DT05URU5U X1BST1RFQ1RJT05fVU5ERVNJUkVEKQogCQlnb3RvIG91dDsKIAogCWlmICghKEk5MTVfUkVBRChQ T1JUX0hEQ1BfU1RBVFVTKHBvcnQpKSAmIEhEQ1BfU1RBVFVTX0VOQykpIHsKQEAgLTg0NiwxNyAr ODU5LDE1IEBAIGludCBpbnRlbF9oZGNwX2NoZWNrX2xpbmsoc3RydWN0IGludGVsX2Nvbm5lY3Rv ciAqY29ubmVjdG9yKQogCQkJICBjb25uZWN0b3ItPmJhc2UubmFtZSwgY29ubmVjdG9yLT5iYXNl LmJhc2UuaWQsCiAJCQkgIEk5MTVfUkVBRChQT1JUX0hEQ1BfU1RBVFVTKHBvcnQpKSk7CiAJCXJl dCA9IC1FTlhJTzsKLQkJY29ubmVjdG9yLT5oZGNwX3ZhbHVlID0gRFJNX01PREVfQ09OVEVOVF9Q Uk9URUNUSU9OX0RFU0lSRUQ7Ci0JCXNjaGVkdWxlX3dvcmsoJmNvbm5lY3Rvci0+aGRjcF9wcm9w X3dvcmspOworCQloZGNwLT52YWx1ZSA9IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElPTl9ERVNJ UkVEOworCQlzY2hlZHVsZV93b3JrKCZoZGNwLT5wcm9wX3dvcmspOwogCQlnb3RvIG91dDsKIAl9 CiAKLQlpZiAoY29ubmVjdG9yLT5oZGNwX3NoaW0tPmNoZWNrX2xpbmsoaW50ZWxfZGlnX3BvcnQp KSB7Ci0JCWlmIChjb25uZWN0b3ItPmhkY3BfdmFsdWUgIT0KLQkJICAgIERSTV9NT0RFX0NPTlRF TlRfUFJPVEVDVElPTl9VTkRFU0lSRUQpIHsKLQkJCWNvbm5lY3Rvci0+aGRjcF92YWx1ZSA9Ci0J CQkJRFJNX01PREVfQ09OVEVOVF9QUk9URUNUSU9OX0VOQUJMRUQ7Ci0JCQlzY2hlZHVsZV93b3Jr KCZjb25uZWN0b3ItPmhkY3BfcHJvcF93b3JrKTsKKwlpZiAoaGRjcC0+c2hpbS0+Y2hlY2tfbGlu ayhpbnRlbF9kaWdfcG9ydCkpIHsKKwkJaWYgKGhkY3AtPnZhbHVlICE9IERSTV9NT0RFX0NPTlRF TlRfUFJPVEVDVElPTl9VTkRFU0lSRUQpIHsKKwkJCWhkY3AtPnZhbHVlID0gRFJNX01PREVfQ09O VEVOVF9QUk9URUNUSU9OX0VOQUJMRUQ7CisJCQlzY2hlZHVsZV93b3JrKCZoZGNwLT5wcm9wX3dv cmspOwogCQl9CiAJCWdvdG8gb3V0OwogCX0KQEAgLTg2NywyMCArODc4LDIwIEBAIGludCBpbnRl bF9oZGNwX2NoZWNrX2xpbmsoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCXJl dCA9IF9pbnRlbF9oZGNwX2Rpc2FibGUoY29ubmVjdG9yKTsKIAlpZiAocmV0KSB7CiAJCURSTV9F UlJPUigiRmFpbGVkIHRvIGRpc2FibGUgaGRjcCAoJWQpXG4iLCByZXQpOwotCQljb25uZWN0b3It PmhkY3BfdmFsdWUgPSBEUk1fTU9ERV9DT05URU5UX1BST1RFQ1RJT05fREVTSVJFRDsKLQkJc2No ZWR1bGVfd29yaygmY29ubmVjdG9yLT5oZGNwX3Byb3Bfd29yayk7CisJCWhkY3AtPnZhbHVlID0g RFJNX01PREVfQ09OVEVOVF9QUk9URUNUSU9OX0RFU0lSRUQ7CisJCXNjaGVkdWxlX3dvcmsoJmhk Y3AtPnByb3Bfd29yayk7CiAJCWdvdG8gb3V0OwogCX0KIAogCXJldCA9IF9pbnRlbF9oZGNwX2Vu YWJsZShjb25uZWN0b3IpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZW5h YmxlIGhkY3AgKCVkKVxuIiwgcmV0KTsKLQkJY29ubmVjdG9yLT5oZGNwX3ZhbHVlID0gRFJNX01P REVfQ09OVEVOVF9QUk9URUNUSU9OX0RFU0lSRUQ7Ci0JCXNjaGVkdWxlX3dvcmsoJmNvbm5lY3Rv ci0+aGRjcF9wcm9wX3dvcmspOworCQloZGNwLT52YWx1ZSA9IERSTV9NT0RFX0NPTlRFTlRfUFJP VEVDVElPTl9ERVNJUkVEOworCQlzY2hlZHVsZV93b3JrKCZoZGNwLT5wcm9wX3dvcmspOwogCQln b3RvIG91dDsKIAl9CiAKIG91dDoKLQltdXRleF91bmxvY2soJmNvbm5lY3Rvci0+aGRjcF9tdXRl eCk7CisJbXV0ZXhfdW5sb2NrKCZoZGNwLT5tdXRleCk7CiAJcmV0dXJuIHJldDsKIH0KLS0gCjIu Ny40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK