From: Mika Kuoppala Subject: [PATCH 2/8] drm/i915: Assert that runtime pm is active on user fw access Date: Mon, 8 Dec 2014 20:27:36 +0200 Message-ID: <1418063262-32256-2-git-send-email-mika.kuoppala@intel.com> References: <1418063262-32256-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 81D066E6C5 for ; Mon, 8 Dec 2014 10:24:31 -0800 (PST) In-Reply-To: <1418063262-32256-1-git-send-email-mika.kuoppala@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: miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpPbiB1c2VyIGZv cmNld2FrZSBhY2Nlc3MsIGFzc2VydCB0aGF0IHJ1bnRpbWUgcG0gcmVmZXJlbmNlIGlzIGhlbGQu CkZpeCBhbmQgY2xlYW51cCB0aGUgY2FsbHNpdGVzIGFjY29yZGluZ2x5LgoKU2lnbmVkLW9mZi1i eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6 IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICB8ICAyICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDE5ICstLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgICAgIHwgNTMgKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdW5jb3JlLmMgIHwgNzYgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDExOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGQwZTQ0NWUuLmUxNDI2Mjkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC00MjUwLDYgKzQyNTAsNyBAQCBz dGF0aWMgaW50IGk5MTVfZm9yY2V3YWtlX29wZW4oc3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0 IGZpbGUgKmZpbGUpCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKIAkJcmV0dXJuIDA7 CiAKKwlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAJZ2VuNl9ndF9mb3JjZV93YWtl X2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKIAlyZXR1cm4gMDsKQEAgLTQyNjQsNiAr NDI2NSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9mb3JjZXdha2VfcmVsZWFzZShzdHJ1Y3QgaW5vZGUg Kmlub2RlLCBzdHJ1Y3QgZmlsZSAqZmlsZSkKIAkJcmV0dXJuIDA7CiAKIAlnZW42X2d0X2ZvcmNl X3dha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKKwlpbnRlbF9ydW50aW1lX3BtX3B1 dChkZXZfcHJpdik7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBkNTE1M2E0Li44NmMyODg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC03ODYyLDE5ICs3ODYyLDggQEAgc3RhdGljIHZvaWQgaHN3X3Jlc3RvcmVfbGNw bGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCS8qCiAJICogTWFrZSBzdXJl IHdlJ3JlIG5vdCBvbiBQQzggc3RhdGUgYmVmb3JlIGRpc2FibGluZyBQQzgsIG90aGVyd2lzZQog CSAqIHdlJ2xsIGhhbmcgdGhlIG1hY2hpbmUuIFRvIHByZXZlbnQgUEM4IHN0YXRlLCBqdXN0IGVu YWJsZSBmb3JjZV93YWtlLgotCSAqCi0JICogVGhlIG90aGVyIHByb2JsZW0gaXMgdGhhdCBoc3df cmVzdG9yZV9sY3BsbCgpIGlzIGNhbGxlZCBhcyBwYXJ0IG9mCi0JICogdGhlIHJ1bnRpbWUgUE0g cmVzdW1lIHNlcXVlbmNlLCBzbyB3ZSBjYW4ndCBqdXN0IGNhbGwKLQkgKiBnZW42X2d0X2ZvcmNl X3dha2VfZ2V0KCkgYmVjYXVzZSB0aGF0IGZ1bmN0aW9uIGNhbGxzCi0JICogaW50ZWxfcnVudGlt ZV9wbV9nZXQoKSwgYW5kIHdlIGNhbid0IGNoYW5nZSB0aGUgcnVudGltZSBQTSByZWZjb3VudAot CSAqIHdoaWxlIHdlIGFyZSBvbiB0aGUgcmVzdW1lIHNlcXVlbmNlLiBTbyB0byBzb2x2ZSB0aGlz IHByb2JsZW0gd2UgaGF2ZQotCSAqIHRvIGNhbGwgc3BlY2lhbCBmb3JjZXdha2UgY29kZSB0aGF0 IGRvZXNuJ3QgdG91Y2ggcnVudGltZSBQTSBhbmQKLQkgKiBkb2Vzbid0IGVuYWJsZSB0aGUgZm9y Y2V3YWtlIGRlbGF5ZWQgd29yay4KIAkgKi8KLQlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+dW5j b3JlLmxvY2spOwotCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCsrID09IDAp Ci0JCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNF V0FLRV9BTEwpOwotCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrKTsKKwln ZW42X2d0X2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAogCWlmICh2 YWwgJiBMQ1BMTF9QT1dFUl9ET1dOX0FMTE9XKSB7CiAJCXZhbCAmPSB+TENQTExfUE9XRVJfRE9X Tl9BTExPVzsKQEAgLTc5MDQsMTEgKzc4OTMsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcmVzdG9yZV9s Y3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlEUk1fRVJST1IoIlN3 aXRjaGluZyBiYWNrIHRvIExDUExMIGZhaWxlZFxuIik7CiAJfQogCi0JLyogU2VlIHRoZSBiaWcg Y29tbWVudCBhYm92ZS4gKi8KLQlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2sp OwotCWlmICgtLWRldl9wcml2LT51bmNvcmUuZm9yY2V3YWtlX2NvdW50ID09IDApCi0JCWRldl9w cml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwp OwotCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrKTsKKwlnZW42X2d0X2Zv cmNlX3dha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIH0KIAogLyoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKaW5kZXggYTgyMDIwZS4uZmNiNTE0MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKQEAgLTI4NCw3ICsyODQsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZWxzcF93 cml0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdWludDY0X3QgdGVtcCA9IDA7CiAJ dWludDMyX3QgZGVzY1s0XTsKLQl1bnNpZ25lZCBsb25nIGZsYWdzOwogCiAJLyogWFhYOiBZb3Ug bXVzdCBhbHdheXMgd3JpdGUgYm90aCBkZXNjcmlwdG9ycyBpbiB0aGUgb3JkZXIgYmVsb3cuICov CiAJaWYgKGN0eF9vYmoxKQpAQCAtMjk4LDYzICsyOTcsMTcgQEAgc3RhdGljIHZvaWQgZXhlY2xp c3RzX2Vsc3Bfd3JpdGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlkZXNjWzNdID0g KHUzMikodGVtcCA+PiAzMik7CiAJZGVzY1syXSA9ICh1MzIpdGVtcDsKIAotCS8qIFNldCBGb3Jj ZSBXYWtldXAgYml0IHRvIHByZXZlbnQgR1QgZnJvbSBlbnRlcmluZyBDNiB3aGlsZSBFTFNQIHdy aXRlcwotCSAqIGFyZSBpbiBwcm9ncmVzcy4KLQkgKgotCSAqIFRoZSBvdGhlciBwcm9ibGVtIGlz IHRoYXQgd2UgY2FuJ3QganVzdCBjYWxsIGdlbjZfZ3RfZm9yY2Vfd2FrZV9nZXQoKQotCSAqIGJl Y2F1c2UgdGhhdCBmdW5jdGlvbiBjYWxscyBpbnRlbF9ydW50aW1lX3BtX2dldCgpLCB3aGljaCBt aWdodCBzbGVlcC4KLQkgKiBJbnN0ZWFkLCB3ZSBkbyB0aGUgcnVudGltZV9wbV9nZXQvcHV0IHdo ZW4gY3JlYXRpbmcvZGVzdHJveWluZyByZXF1ZXN0cy4KLQkgKi8KLQlzcGluX2xvY2tfaXJxc2F2 ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBmbGFncyk7Ci0JaWYgKElTX0NIRVJSWVZJRVcoZGV2 KSB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7Ci0JCWlmIChkZXZfcHJpdi0+dW5jb3Jl LmZ3X3JlbmRlcmNvdW50KysgPT0gMCkKLQkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vf d2FrZV9nZXQoZGV2X3ByaXYsCi0JCQkJCQkJICAgICAgRk9SQ0VXQUtFX1JFTkRFUik7Ci0JCWlm IChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQrKyA9PSAwKQotCQkJZGV2X3ByaXYtPnVu Y29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwKLQkJCQkJCQkgICAgICBGT1JDRVdB S0VfTUVESUEpOwotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewotCQkJaWYgKGRl dl9wcml2LT51bmNvcmUuZndfYmxpdHRlcmNvdW50KysgPT0gMCkKLQkJCQlkZXZfcHJpdi0+dW5j b3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LAotCQkJCQkJCUZPUkNFV0FLRV9CTElU VEVSKTsKLQkJfQotCX0gZWxzZSB7Ci0JCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9j b3VudCsrID09IDApCi0JCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRl dl9wcml2LAotCQkJCQkJCSAgICAgIEZPUkNFV0FLRV9BTEwpOwotCX0KLQlzcGluX3VubG9ja19p cnFyZXN0b3JlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGZsYWdzKTsKLQorCWdlbjZfZ3RfZm9y Y2Vfd2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCUk5MTVfV1JJVEUoUklOR19F TFNQKHJpbmcpLCBkZXNjWzFdKTsKIAlJOTE1X1dSSVRFKFJJTkdfRUxTUChyaW5nKSwgZGVzY1sw XSk7CiAJSTkxNV9XUklURShSSU5HX0VMU1AocmluZyksIGRlc2NbM10pOworCiAJLyogVGhlIGNv bnRleHQgaXMgYXV0b21hdGljYWxseSBsb2FkZWQgYWZ0ZXIgdGhlIGZvbGxvd2luZyAqLwogCUk5 MTVfV1JJVEUoUklOR19FTFNQKHJpbmcpLCBkZXNjWzJdKTsKIAogCS8qIEVMU1AgaXMgYSB3byBy ZWdpc3Rlciwgc28gdXNlIGFub3RoZXIgbmVhcmJ5IHJlZyBmb3IgcG9zdGluZyBpbnN0ZWFkICov CiAJUE9TVElOR19SRUFEKFJJTkdfRVhFQ0xJU1RfU1RBVFVTKHJpbmcpKTsKLQotCS8qIFJlbGVh c2UgRm9yY2UgV2FrZXVwIChzZWUgdGhlIGJpZyBjb21tZW50IGFib3ZlKS4gKi8KLQlzcGluX2xv Y2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBmbGFncyk7Ci0JaWYgKElTX0NIRVJS WVZJRVcoZGV2KSB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7Ci0JCWlmICgtLWRldl9w cml2LT51bmNvcmUuZndfcmVuZGVyY291bnQgPT0gMCkKLQkJCWRldl9wcml2LT51bmNvcmUuZnVu Y3MuZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsCi0JCQkJCQkJICAgICAgRk9SQ0VXQUtFX1JFTkRF Uik7Ci0JCWlmICgtLWRldl9wcml2LT51bmNvcmUuZndfbWVkaWFjb3VudCA9PSAwKQotCQkJZGV2 X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwKLQkJCQkJCQkgICAg ICBGT1JDRVdBS0VfTUVESUEpOwotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewot CQkJaWYgKC0tZGV2X3ByaXYtPnVuY29yZS5md19ibGl0dGVyY291bnQgPT0gMCkKLQkJCQlkZXZf cHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2LAotCQkJCQkJCUZPUkNF V0FLRV9CTElUVEVSKTsKLQkJfQotCX0gZWxzZSB7Ci0JCWlmICgtLWRldl9wcml2LT51bmNvcmUu Zm9yY2V3YWtlX2NvdW50ID09IDApCi0JCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dh a2VfcHV0KGRldl9wcml2LAotCQkJCQkJCSAgICAgIEZPUkNFV0FLRV9BTEwpOwotCX0KLQotCXNw aW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgZmxhZ3MpOworCWdl bjZfZ3RfZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogfQogCiBzdGF0 aWMgaW50IGV4ZWNsaXN0c191cGRhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqY3R4X29iaiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggMzhhYzM4OS4u YTFjZWI5MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTI0LDYgKzI0LDgg QEAKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogI2luY2x1ZGUgImludGVsX2Rydi5oIgogCisjaW5j bHVkZSA8bGludXgvcG1fcnVudGltZS5oPgorCiAjZGVmaW5lIEZPUkNFV0FLRV9BQ0tfVElNRU9V VF9NUyAyCiAKICNkZWZpbmUgX19yYXdfaTkxNV9yZWFkOChkZXZfcHJpdl9fLCByZWdfXykgcmVh ZGIoKGRldl9wcml2X18pLT5yZWdzICsgKHJlZ19fKSkKQEAgLTI0NywxMCArMjQ5LDYgQEAgc3Rh dGljIHZvaWQgX192bHZfZm9yY2Vfd2FrZV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiBzdGF0aWMgdm9pZCB2bHZfZm9yY2Vfd2FrZV9nZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5lKQogewotCXVuc2lnbmVkIGxvbmcgaXJx ZmxhZ3M7Ci0KLQlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFm bGFncyk7Ci0KIAlpZiAoZndfZW5naW5lICYgRk9SQ0VXQUtFX1JFTkRFUiAmJgogCSAgICBkZXZf cHJpdi0+dW5jb3JlLmZ3X3JlbmRlcmNvdW50KysgIT0gMCkKIAkJZndfZW5naW5lICY9IH5GT1JD RVdBS0VfUkVOREVSOwpAQCAtMjYwLDE2ICsyNTgsMTAgQEAgc3RhdGljIHZvaWQgdmx2X2ZvcmNl X3dha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2lu ZSkKIAogCWlmIChmd19lbmdpbmUpCiAJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2Fr ZV9nZXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7Ci0KLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZk ZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIAogc3RhdGljIHZvaWQgdmx2X2Zv cmNlX3dha2VfcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2Vu Z2luZSkKIHsKLQl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwotCi0Jc3Bpbl9sb2NrX2lycXNhdmUo JmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwotCiAJaWYgKGZ3X2VuZ2luZSAmIEZP UkNFV0FLRV9SRU5ERVIpIHsKIAkJV0FSTl9PTighZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJj b3VudCk7CiAJCWlmICgtLWRldl9wcml2LT51bmNvcmUuZndfcmVuZGVyY291bnQgIT0gMCkKQEAg LTI4NCw4ICsyNzYsNiBAQCBzdGF0aWMgdm9pZCB2bHZfZm9yY2Vfd2FrZV9wdXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5lKQogCiAJaWYgKGZ3X2VuZ2lu ZSkKIAkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgZndf ZW5naW5lKTsKLQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9j aywgaXJxZmxhZ3MpOwogfQogCiBzdGF0aWMgdm9pZCBfX2dlbjlfZ3RfZm9yY2Vfd2FrZV9tdF9y ZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0zODAsMTAgKzM3MCw2 IEBAIF9fZ2VuOV9mb3JjZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGludCBmd19lbmdpbmUpCiBzdGF0aWMgdm9pZAogZ2VuOV9mb3JjZV93YWtlX2dldChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBmd19lbmdpbmUpCiB7Ci0JdW5zaWdu ZWQgbG9uZyBpcnFmbGFnczsKLQotCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3Jl LmxvY2ssIGlycWZsYWdzKTsKLQogCWlmIChGT1JDRVdBS0VfUkVOREVSICYgZndfZW5naW5lKSB7 CiAJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRlcmNvdW50KysgPT0gMCkKIAkJCWRldl9w cml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsCkBAIC00MDEsMTcgKzM4 NywxMSBAQCBnZW45X2ZvcmNlX3dha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgaW50IGZ3X2VuZ2luZSkKIAkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2Fr ZV9nZXQoZGV2X3ByaXYsCiAJCQkJCQkJRk9SQ0VXQUtFX0JMSVRURVIpOwogCX0KLQotCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogfQog CiBzdGF0aWMgdm9pZAogZ2VuOV9mb3JjZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGludCBmd19lbmdpbmUpCiB7Ci0JdW5zaWduZWQgbG9uZyBpcnFmbGFnczsK LQotCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsK LQogCWlmIChGT1JDRVdBS0VfUkVOREVSICYgZndfZW5naW5lKSB7CiAJCVdBUk5fT04oZGV2X3By aXYtPnVuY29yZS5md19yZW5kZXJjb3VudCA9PSAwKTsKIAkJaWYgKC0tZGV2X3ByaXYtPnVuY29y ZS5md19yZW5kZXJjb3VudCA9PSAwKQpAQCAtNDMyLDggKzQxMiw2IEBAIGdlbjlfZm9yY2Vfd2Fr ZV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5lKQog CQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwKIAkJCQkJ CQlGT1JDRVdBS0VfQkxJVFRFUik7CiAJfQotCi0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2 X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjZfZm9y Y2Vfd2FrZV90aW1lcih1bnNpZ25lZCBsb25nIGFyZykKQEAgLTU2NCwxNyArNTQyLDIwIEBAIHZv aWQgZ2VuNl9ndF9mb3JjZV93YWtlX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGludCBmd19lbmdpbmUpCiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAK LQkvKiBSZWRpcmVjdCB0byBHZW45IHNwZWNpZmljIHJvdXRpbmUgKi8KLQlpZiAoSVNfR0VOOShk ZXZfcHJpdi0+ZGV2KSkKLQkJcmV0dXJuIGdlbjlfZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3 X2VuZ2luZSk7Ci0KLQkvKiBSZWRpcmVjdCB0byBWTFYgc3BlY2lmaWMgcm91dGluZSAqLwotCWlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2LT5kZXYpKQotCQlyZXR1cm4gdmx2X2ZvcmNlX3dha2Vf Z2V0KGRldl9wcml2LCBmd19lbmdpbmUpOworCVdBUk5fT04oIXBtX3J1bnRpbWVfYWN0aXZlKCZk ZXZfcHJpdi0+ZGV2LT5wZGV2LT5kZXYpKTsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJp di0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKLQlpZiAoZGV2X3ByaXYtPnVuY29yZS5mb3JjZXdh a2VfY291bnQrKyA9PSAwKQotCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0 KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKKworCWlmIChJU19HRU45KGRldl9wcml2LT5kZXYp KSB7CisJCWdlbjlfZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7CisJfSBlbHNl IGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2LT5kZXYpKSB7CisJCXZsdl9mb3JjZV93YWtlX2dl dChkZXZfcHJpdiwgZndfZW5naW5lKTsKKwl9IGVsc2UgeworCQlpZiAoZGV2X3ByaXYtPnVuY29y ZS5mb3JjZXdha2VfY291bnQrKyA9PSAwKQorCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3Jj ZV93YWtlX2dldChkZXZfcHJpdiwKKwkJCQkJCQkgICAgICBGT1JDRVdBS0VfQUxMKTsKKwl9CisK IAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdz KTsKIH0KIApAQCAtNTg4LDMxICs1NjksMjIgQEAgdm9pZCBnZW42X2d0X2ZvcmNlX3dha2VfcHV0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2luZSkKIAlpZiAo IWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQpCiAJCXJldHVybjsKIAotCS8q IFJlZGlyZWN0IHRvIEdlbjkgc3BlY2lmaWMgcm91dGluZSAqLworCXNwaW5fbG9ja19pcnFzYXZl KCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKKwogCWlmIChJU19HRU45KGRldl9w cml2LT5kZXYpKSB7CiAJCWdlbjlfZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7 Ci0JCWdvdG8gb3V0OwotCX0KLQotCS8qIFJlZGlyZWN0IHRvIFZMViBzcGVjaWZpYyByb3V0aW5l ICovCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYtPmRldikpIHsKKwl9IGVsc2UgaWYgKElT X1ZBTExFWVZJRVcoZGV2X3ByaXYtPmRldikpIHsKIAkJdmx2X2ZvcmNlX3dha2VfcHV0KGRldl9w cml2LCBmd19lbmdpbmUpOwotCQlnb3RvIG91dDsKLQl9Ci0KLQlzcGluX2xvY2tfaXJxc2F2ZSgm ZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7Ci0JV0FSTl9PTighZGV2X3ByaXYtPnVu Y29yZS5mb3JjZXdha2VfY291bnQpOwotCi0JaWYgKC0tZGV2X3ByaXYtPnVuY29yZS5mb3JjZXdh a2VfY291bnQgPT0gMCkgewotCQlkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCsrOwot CQltb2RfdGltZXJfcGlubmVkKCZkZXZfcHJpdi0+dW5jb3JlLmZvcmNlX3dha2VfdGltZXIsCi0J CQkJIGppZmZpZXMgKyAxKTsKKwl9IGVsc2UgeworCQlXQVJOX09OKCFkZXZfcHJpdi0+dW5jb3Jl LmZvcmNld2FrZV9jb3VudCk7CisJCWlmICgtLWRldl9wcml2LT51bmNvcmUuZm9yY2V3YWtlX2Nv dW50ID09IDApIHsKKwkJCWRldl9wcml2LT51bmNvcmUuZm9yY2V3YWtlX2NvdW50Kys7CisJCQlt b2RfdGltZXJfcGlubmVkKCZkZXZfcHJpdi0+dW5jb3JlLmZvcmNlX3dha2VfdGltZXIsCisJCQkJ CSBqaWZmaWVzICsgMSk7CisJCX0KIAl9CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZf cHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKLQotb3V0OgotCWludGVsX3J1bnRpbWVfcG1f cHV0KGRldl9wcml2KTsKIH0KIAogdm9pZCBhc3NlcnRfZm9yY2Vfd2FrZV9pbmFjdGl2ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK