From: Mika Kuoppala Subject: [PATCH 1/3] drm/i915: Introduce execlist_port_* accessors Date: Fri, 29 Sep 2017 15:42:47 +0300 Message-ID: <20170929124249.10202-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFA976EB40 for ; Fri, 29 Sep 2017 12:44:23 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org SW5zdGVhZCBvZiB0cnVzdGluZyB0aGF0IGZpcnN0IGF2YWlsYWJsZSBwb3J0IGlzIGF0IGluZGV4 IDAsCnVzZSBhY2Nlc3NvciB0byBoaWRlIHRoaXMuIFRoaXMgaXMgYSBwcmVwYXJhdGlvbiBmb3Ig YQpmb2xsb3dpbmcgcGF0Y2hlcyB3aGVyZSBoZWFkIGNhbiBiZSBhdCBhcmJpdHJhcnkgbG9jYXRp b24KaW4gdGhlIHBvcnQgYXJyYXkuCgp2MjogaW1wcm92ZWQgY29tbWl0IG1lc3NhZ2UsIGVsc3Bf cmVhZHkgcmVhZGFiaWxpdHkgKENocmlzKQp2Mzogcy9leGVjbGlzdF9wb3J0X2luZGV4L2V4ZWNs aXN0X3BvcnQgKENocmlzKQp2NDogcmViYXNlIHRvIG5ldyBuYW1pbmcKCkNjOiBNaWNoYcWCIFdp bmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4g PGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5r dW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMgICAgICAgIHwgMTYgKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYyAgICAgIHwgIDYgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jIHwgMTcgKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMgICAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVf Y3MuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAg ICAgIHwgNDcgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLQogNyBmaWxlcyBjaGFuZ2VkLCA5MiBpbnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGI0YTZhYzYwZTdjNi4uMDczYmQw YWM4ZjJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzM0OCwxNiArMzM0 OCwyMCBAQCBzdGF0aWMgaW50IGk5MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2 b2lkICp1bnVzZWQpCiAKIAkJCXJjdV9yZWFkX2xvY2soKTsKIAkJCWZvciAoaWR4ID0gMDsgaWR4 IDwgZXhlY2xpc3RzX251bV9wb3J0cyhleGVjbGlzdHMpOyBpZHgrKykgewotCQkJCXVuc2lnbmVk IGludCBjb3VudDsKKwkJCQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydDsKKwkJCQl1 bnNpZ25lZCBpbnQgY291bnQsIG47CiAKLQkJCQlycSA9IHBvcnRfdW5wYWNrKCZleGVjbGlzdHMt PnBvcnRbaWR4XSwgJmNvdW50KTsKKwkJCQlwb3J0ID0gZXhlY2xpc3RzX3BvcnQoZXhlY2xpc3Rz LCBpZHgpOworCQkJCW4gPSBwb3J0X2luZGV4KHBvcnQsIGV4ZWNsaXN0cyk7CisKKwkJCQlycSA9 IHBvcnRfdW5wYWNrKHBvcnQsICZjb3VudCk7CiAJCQkJaWYgKHJxKSB7Ci0JCQkJCXNlcV9wcmlu dGYobSwgIlx0XHRFTFNQWyVkXSBjb3VudD0lZCwgIiwKLQkJCQkJCSAgIGlkeCwgY291bnQpOwor CQkJCQlzZXFfcHJpbnRmKG0sICJcdFx0RUxTUFslZDolZF0gY291bnQ9JWQsICIsCisJCQkJCQkg ICBpZHgsIG4sIGNvdW50KTsKIAkJCQkJcHJpbnRfcmVxdWVzdChtLCBycSwgInJxOiAiKTsKIAkJ CQl9IGVsc2UgewotCQkJCQlzZXFfcHJpbnRmKG0sICJcdFx0RUxTUFslZF0gaWRsZVxuIiwKLQkJ CQkJCSAgIGlkeCk7CisJCQkJCXNlcV9wcmludGYobSwgIlx0XHRFTFNQWyVkOiVkXSBpZGxlXG4i LAorCQkJCQkJICAgaWR4LCBuKTsKIAkJCQl9CiAJCQl9CiAJCQlyY3VfcmVhZF91bmxvY2soKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IGMxNDU1MmFiMjcwYi4uOWYy MTQ1YzY5NjFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTEzMzIs MTEgKzEzMzIsMTMgQEAgc3RhdGljIHZvaWQgZW5naW5lX3JlY29yZF9yZXF1ZXN0cyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5naW5l X2V4ZWNsaXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkJCSAgc3RydWN0 IGRybV9pOTE1X2Vycm9yX2VuZ2luZSAqZWUpCiB7Ci0JY29uc3Qgc3RydWN0IGludGVsX2VuZ2lu ZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVjbGlzdHM7CisJc3Ry dWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5l eGVjbGlzdHM7CiAJdW5zaWduZWQgaW50IG47CiAKIAlmb3IgKG4gPSAwOyBuIDwgZXhlY2xpc3Rz X251bV9wb3J0cyhleGVjbGlzdHMpOyBuKyspIHsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpycSA9IHBvcnRfcmVxdWVzdCgmZXhlY2xpc3RzLT5wb3J0W25dKTsKKwkJc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycTsKKworCQlycSA9IHBvcnRfcmVxdWVzdChleGVjbGlzdHNf cG9ydChleGVjbGlzdHMsIG4pKTsKIAogCQlpZiAoIXJxKQogCQkJYnJlYWs7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMDRmMTI4MWQ4MWE1Li5jNmNk MDVhNTM0N2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMK QEAgLTU2Miw4ICs1NjIsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19kZXF1ZXVlKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAq IGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKIAlzdHJ1Y3QgZXhlY2xpc3Rf cG9ydCAqcG9ydCA9IGV4ZWNsaXN0cy0+cG9ydDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKmxhc3QgPSBOVUxMOwotCWNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgbGFz dF9wb3J0ID0KLQkJJmV4ZWNsaXN0cy0+cG9ydFtleGVjbGlzdHMtPnBvcnRfbWFza107CisJY29u c3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBsYXN0X3BvcnQgPSBleGVjbGlzdHNfcG9y dF90YWlsKGV4ZWNsaXN0cyk7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIAlzdHJ1Y3QgcmJfbm9k ZSAqcmI7CiAKQEAgLTU4Nyw3ICs1ODYsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19kZXF1ZXVl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCQkJCWlmIChzdWJtaXQpCiAJCQkJ CXBvcnRfYXNzaWduKHBvcnQsIGxhc3QpOwotCQkJCXBvcnQrKzsKKworCQkJCXBvcnQgPSBleGVj bGlzdHNfcG9ydF9uZXh0KGV4ZWNsaXN0cywgcG9ydCk7CiAJCQl9CiAKIAkJCUlOSVRfTElTVF9I RUFEKCZycS0+cHJpb3RyZWUubGluayk7CkBAIC02MTgsMTkgKzYxOCwxOCBAQCBzdGF0aWMgdm9p ZCBpOTE1X2d1Y19pcnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiB7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqIGNvbnN0IGVuZ2luZSA9IChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICop ZGF0YTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9 ICZlbmdpbmUtPmV4ZWNsaXN0czsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNs aXN0cy0+cG9ydDsKLQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9y dCA9Ci0JCSZleGVjbGlzdHMtPnBvcnRbZXhlY2xpc3RzLT5wb3J0X21hc2tdOworCXN0cnVjdCBl eGVjbGlzdF9wb3J0ICpwb3J0ID0gZXhlY2xpc3RzX3BvcnRfaGVhZChleGVjbGlzdHMpOworCWNv bnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgbGFzdF9wb3J0ID0gZXhlY2xpc3RzX3Bv cnRfdGFpbChleGVjbGlzdHMpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAK LQlycSA9IHBvcnRfcmVxdWVzdCgmcG9ydFswXSk7CisJcnEgPSBwb3J0X3JlcXVlc3QocG9ydCk7 CiAJd2hpbGUgKHJxICYmIGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJxKSkgewogCQl0cmFj ZV9pOTE1X2dlbV9yZXF1ZXN0X291dChycSk7CiAJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHJxKTsK IAotCQlleGVjbGlzdHNfcG9ydF9jb21wbGV0ZShleGVjbGlzdHMsIHBvcnQpOworCQlwb3J0ID0g ZXhlY2xpc3RzX3BvcnRfY29tcGxldGUoZXhlY2xpc3RzLCBwb3J0KTsKIAotCQlycSA9IHBvcnRf cmVxdWVzdCgmcG9ydFswXSk7CisJCXJxID0gcG9ydF9yZXF1ZXN0KHBvcnQpOwogCX0KIAogCWlm ICghcG9ydF9pc3NldChsYXN0X3BvcnQpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggZWZk NzgyN2ZmMTgxLi5iOWQxZjM3OWM1YTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMTM4 Miw3ICsxMzgyLDcgQEAgZ2VuOF9jc19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsIHUzMiBpaXIsIGludCB0ZXN0X3NoaWZ0KQogCWJvb2wgdGFza2xldCA9IGZhbHNl OwogCiAJaWYgKGlpciAmIChHVF9DT05URVhUX1NXSVRDSF9JTlRFUlJVUFQgPDwgdGVzdF9zaGlm dCkpIHsKLQkJaWYgKHBvcnRfY291bnQoJmV4ZWNsaXN0cy0+cG9ydFswXSkpIHsKKwkJaWYgKHBv cnRfY291bnQoZXhlY2xpc3RzX3BvcnRfaGVhZChleGVjbGlzdHMpKSkgewogCQkJX19zZXRfYml0 KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUtPmlycV9wb3N0ZWQpOwogCQkJdGFza2xldCA9 IHRydWU7CiAJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggYTI4 ZTJhODY0Y2YxLi4zZjg1Nzc4NmUyZWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jCkBAIC0xNTA1LDcgKzE1MDUsNyBAQCBib29sIGludGVsX2VuZ2luZV9pc19pZGxlKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJLyogQm90 aCBwb3J0cyBkcmFpbmVkLCBubyBtb3JlIEVMU1Agc3VibWlzc2lvbj8gKi8KLQlpZiAocG9ydF9y ZXF1ZXN0KCZlbmdpbmUtPmV4ZWNsaXN0cy5wb3J0WzBdKSkKKwlpZiAocG9ydF9yZXF1ZXN0KGV4 ZWNsaXN0c19wb3J0X2hlYWQoJmVuZ2luZS0+ZXhlY2xpc3RzKSkpCiAJCXJldHVybiBmYWxzZTsK IAogCS8qIEVMU1AgaXMgZW1wdHksIGJ1dCB0aGVyZSBhcmUgcmVhZHkgcmVxdWVzdHM/ICovCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDYxY2FjMjZhOGIwNS4uY2I3ZmIzYzY1MWNlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMzk0LDI0ICszOTQsMjYgQEAgc3RhdGljIHU2 NCBleGVjbGlzdHNfdXBkYXRlX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy cSkKIAogc3RhdGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pdF9wb3J0cyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUt PmV4ZWNsaXN0cy5wb3J0OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3Qg ZXhlY2xpc3RzID0gJmVuZ2luZS0+ZXhlY2xpc3RzOwogCXUzMiBfX2lvbWVtICplbHNwID0KIAkJ ZW5naW5lLT5pOTE1LT5yZWdzICsgaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19FTFNQKGVuZ2lu ZSkpOwogCXVuc2lnbmVkIGludCBuOwogCi0JZm9yIChuID0gZXhlY2xpc3RzX251bV9wb3J0cygm ZW5naW5lLT5leGVjbGlzdHMpOyBuLS07ICkgeworCWZvciAobiA9IGV4ZWNsaXN0c19udW1fcG9y dHMoZXhlY2xpc3RzKTsgbi0tOyApIHsKKwkJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQ7CiAJ CXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJCXVuc2lnbmVkIGludCBjb3VudDsK IAkJdTY0IGRlc2M7CiAKLQkJcnEgPSBwb3J0X3VucGFjaygmcG9ydFtuXSwgJmNvdW50KTsKKwkJ cG9ydCA9IGV4ZWNsaXN0c19wb3J0KGV4ZWNsaXN0cywgbik7CisJCXJxID0gcG9ydF91bnBhY2so cG9ydCwgJmNvdW50KTsKIAkJaWYgKHJxKSB7CiAJCQlHRU1fQlVHX09OKGNvdW50ID4gIW4pOwog CQkJaWYgKCFjb3VudCsrKQogCQkJCWV4ZWNsaXN0c19jb250ZXh0X3N0YXR1c19jaGFuZ2UocnEs IElOVEVMX0NPTlRFWFRfU0NIRURVTEVfSU4pOwotCQkJcG9ydF9zZXQoJnBvcnRbbl0sIHBvcnRf cGFjayhycSwgY291bnQpKTsKKwkJCXBvcnRfc2V0KHBvcnQsIHBvcnRfcGFjayhycSwgY291bnQp KTsKIAkJCWRlc2MgPSBleGVjbGlzdHNfdXBkYXRlX2NvbnRleHQocnEpOwotCQkJR0VNX0RFQlVH X0VYRUMocG9ydFtuXS5jb250ZXh0X2lkID0gdXBwZXJfMzJfYml0cyhkZXNjKSk7CisJCQlHRU1f REVCVUdfRVhFQyhwb3J0LT5jb250ZXh0X2lkID0gdXBwZXJfMzJfYml0cyhkZXNjKSk7CiAJCX0g ZWxzZSB7CiAJCQlHRU1fQlVHX09OKCFuKTsKIAkJCWRlc2MgPSAwOwpAQCAtNDU1LDkgKzQ1Nyw4 IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3Q7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVj bGlzdHM7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVjbGlzdHMtPnBvcnQ7Ci0J Y29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBsYXN0X3BvcnQgPQotCQkmZXhlY2xp c3RzLT5wb3J0W2V4ZWNsaXN0cy0+cG9ydF9tYXNrXTsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAq cG9ydCA9IGV4ZWNsaXN0c19wb3J0X2hlYWQoZXhlY2xpc3RzKTsKKwljb25zdCBzdHJ1Y3QgZXhl Y2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9IGV4ZWNsaXN0c19wb3J0X3RhaWwoZXhlY2xp c3RzKTsKIAlzdHJ1Y3QgcmJfbm9kZSAqcmI7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIApAQCAt NTQxLDcgKzU0Miw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCQkJCWlmIChzdWJtaXQpCiAJCQkJCXBvcnRfYXNzaWdu KHBvcnQsIGxhc3QpOwotCQkJCXBvcnQrKzsKKworCQkJCXBvcnQgPSBleGVjbGlzdHNfcG9ydF9u ZXh0KGV4ZWNsaXN0cywgcG9ydCk7CiAKIAkJCQlHRU1fQlVHX09OKHBvcnRfaXNzZXQocG9ydCkp OwogCQkJfQpAQCAtNTcyLDcgKzU3NCw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIH0KIAogc3RhdGljIHZvaWQKLWV4ZWNs aXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICpl eGVjbGlzdHMpCitleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoc3RydWN0IGludGVsX2Vu Z2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cykKIHsKIAlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9y dCA9IGV4ZWNsaXN0cy0+cG9ydDsKIAl1bnNpZ25lZCBpbnQgbnVtX3BvcnRzID0gQVJSQVlfU0la RShleGVjbGlzdHMtPnBvcnQpOwpAQCAtNTk4LDcgKzYwMCw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19jYW5jZWxfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXNw aW5fbG9ja19pcnFzYXZlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7CiAKIAkvKiBD YW5jZWwgdGhlIHJlcXVlc3RzIG9uIHRoZSBIVyBhbmQgY2xlYXIgdGhlIEVMU1AgdHJhY2tlci4g Ki8KLQlleGVjbGlzdF9jYW5jZWxfcG9ydF9yZXF1ZXN0cyhleGVjbGlzdHMpOworCWV4ZWNsaXN0 c19jYW5jZWxfcG9ydF9yZXF1ZXN0cyhleGVjbGlzdHMpOwogCiAJLyogTWFyayBhbGwgZXhlY3V0 aW5nIHJlcXVlc3RzIGFzIHNraXBwZWQuICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShycSwgJmVu Z2luZS0+dGltZWxpbmUtPnJlcXVlc3RzLCBsaW5rKSB7CkBAIC02NDUsMTEgKzY0NywxMiBAQCBz dGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5s b2NrLCBmbGFncyk7CiB9CiAKLXN0YXRpYyBib29sIGV4ZWNsaXN0c19lbHNwX3JlYWR5KGNvbnN0 IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyBib29sIGV4ZWNsaXN0c19l bHNwX3JlYWR5KHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3Rz KQogewotCWNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlz dHMucG9ydDsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IHBvcnQwID0gZXhlY2xpc3Rz X3BvcnRfaGVhZChleGVjbGlzdHMpOworCXN0cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgcG9y dDEgPSBleGVjbGlzdHNfcG9ydF9uZXh0KGV4ZWNsaXN0cywgcG9ydDApOwogCi0JcmV0dXJuIHBv cnRfY291bnQoJnBvcnRbMF0pICsgcG9ydF9jb3VudCgmcG9ydFsxXSkgPCAyOworCXJldHVybiBw b3J0X2NvdW50KHBvcnQwKSArIHBvcnRfY291bnQocG9ydDEpIDwgMjsKIH0KIAogLyoKQEAgLTY2 MCw3ICs2NjMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIodW5zaWduZWQg bG9uZyBkYXRhKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKiBjb25zdCBlbmdpbmUgPSAo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqKWRhdGE7CiAJc3RydWN0IGludGVsX2VuZ2luZV9leGVj bGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVjbGlzdHM7Ci0Jc3RydWN0IGV4 ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVjbGlzdHMtPnBvcnQ7CisJc3RydWN0IGV4ZWNsaXN0X3Bv cnQgKnBvcnQgPSBleGVjbGlzdHNfcG9ydF9oZWFkKGV4ZWNsaXN0cyk7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJLyogV2UgY2FuIHNraXAg YWNxdWlyaW5nIGludGVsX3J1bnRpbWVfcG1fZ2V0KCkgaGVyZSBhcyBpdCB3YXMgdGFrZW4KQEAg LTc1OCw3ICs3NjEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIodW5zaWdu ZWQgbG9uZyBkYXRhKQogCQkJCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfb3V0KHJxKTsKIAkJCQlp OTE1X2dlbV9yZXF1ZXN0X3B1dChycSk7CiAKLQkJCQlleGVjbGlzdHNfcG9ydF9jb21wbGV0ZShl eGVjbGlzdHMsIHBvcnQpOworCQkJCXBvcnQgPSBleGVjbGlzdHNfcG9ydF9jb21wbGV0ZShleGVj bGlzdHMsIHBvcnQpOwogCQkJfSBlbHNlIHsKIAkJCQlwb3J0X3NldChwb3J0LCBwb3J0X3BhY2so cnEsIGNvdW50KSk7CiAJCQl9CkBAIC03NzUsNyArNzc4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf bHJjX2lycV9oYW5kbGVyKHVuc2lnbmVkIGxvbmcgZGF0YSkKIAkJfQogCX0KIAotCWlmIChleGVj bGlzdHNfZWxzcF9yZWFkeShlbmdpbmUpKQorCWlmIChleGVjbGlzdHNfZWxzcF9yZWFkeShleGVj bGlzdHMpKQogCQlleGVjbGlzdHNfZGVxdWV1ZShlbmdpbmUpOwogCiAJaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9wdXQoZGV2X3ByaXYsIGV4ZWNsaXN0cy0+ZndfZG9tYWlucyk7CkBAIC03ODUsMTYg Kzc4OCwxOCBAQCBzdGF0aWMgdm9pZCBpbnNlcnRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJCQkgICBzdHJ1Y3QgaTkxNV9wcmlvdHJlZSAqcHQsCiAJCQkgICBpbnQg cHJpbykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0 cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKIAlzdHJ1Y3QgaTkxNV9wcmlvbGlzdCAqcCA9IGxvb2t1 cF9wcmlvbGlzdChlbmdpbmUsIHB0LCBwcmlvKTsKIAogCWxpc3RfYWRkX3RhaWwoJnB0LT5saW5r LCAmcHRyX21hc2tfYml0cyhwLCAxKS0+cmVxdWVzdHMpOwotCWlmIChwdHJfdW5tYXNrX2JpdHMo cCwgMSkgJiYgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoZW5naW5lKSkKLQkJdGFza2xldF9oaV9zY2hl ZHVsZSgmZW5naW5lLT5leGVjbGlzdHMuaXJxX3Rhc2tsZXQpOworCWlmIChwdHJfdW5tYXNrX2Jp dHMocCwgMSkgJiYgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoZXhlY2xpc3RzKSkKKwkJdGFza2xldF9o aV9zY2hlZHVsZSgmZXhlY2xpc3RzLT5pcnFfdGFza2xldCk7CiB9CiAKIHN0YXRpYyB2b2lkIGV4 ZWNsaXN0c19zdWJtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxdWVzdC0+ZW5naW5l OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0gJmVu Z2luZS0+ZXhlY2xpc3RzOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAKIAkvKiBXaWxsIGJlIGNh bGxlZCBmcm9tIGlycS1jb250ZXh0IHdoZW4gdXNpbmcgZm9yZWlnbiBmZW5jZXMuICovCkBAIC04 MDIsNyArODA3LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAogCWluc2VydF9yZXF1ZXN0KGVuZ2lu ZSwgJnJlcXVlc3QtPnByaW90cmVlLCByZXF1ZXN0LT5wcmlvdHJlZS5wcmlvcml0eSk7CiAKLQlH RU1fQlVHX09OKCFlbmdpbmUtPmV4ZWNsaXN0cy5maXJzdCk7CisJR0VNX0JVR19PTighZXhlY2xp c3RzLT5maXJzdCk7CiAJR0VNX0JVR19PTihsaXN0X2VtcHR5KCZyZXF1ZXN0LT5wcmlvdHJlZS5s aW5rKSk7CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2Nr LCBmbGFncyk7CkBAIC0xMzk3LDcgKzE0MDIsNyBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25f cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJICogZ3Vlc3NpbmcgdGhlIG1p c3NlZCBjb250ZXh0LXN3aXRjaCBldmVudHMgYnkgbG9va2luZyBhdCB3aGF0CiAJICogcmVxdWVz dHMgd2VyZSBjb21wbGV0ZWQuCiAJICovCi0JZXhlY2xpc3RfY2FuY2VsX3BvcnRfcmVxdWVzdHMo ZXhlY2xpc3RzKTsKKwlleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoZXhlY2xpc3RzKTsK IAogCS8qIFB1c2ggYmFjayBhbnkgaW5jb21wbGV0ZSByZXF1ZXN0cyBmb3IgcmVwbGF5IGFmdGVy IHRoZSByZXNldC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmVfcmV2ZXJzZShycSwgcm4s CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNTZkN2FlOWYyOThi Li4yZTc5NWI0NGE5NDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK QEAgLTI0NCw2ICsyNDQsMTEgQEAgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgewogCXVu c2lnbmVkIGludCBwb3J0X21hc2s7CiAKIAkvKioKKwkgKiBAcG9ydF9oZWFkOiBmaXJzdCB1c2Vk IGV4ZWNsaXN0IHBvcnQKKwkgKi8KKwl1bnNpZ25lZCBpbnQgcG9ydF9oZWFkOworCisJLyoqCiAJ ICogQHF1ZXVlOiBxdWV1ZSBvZiByZXF1ZXN0cywgaW4gcHJpb3JpdHkgbGlzdHMKIAkgKi8KIAlz dHJ1Y3QgcmJfcm9vdCBxdWV1ZTsKQEAgLTUyNCwxNiArNTI5LDQ3IEBAIGV4ZWNsaXN0c19udW1f cG9ydHMoY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlz dHMpCiAJcmV0dXJuIGV4ZWNsaXN0cy0+cG9ydF9tYXNrICsgMTsKIH0KIAotc3RhdGljIGlubGlu ZSB2b2lkCisjZGVmaW5lIF9fcG9ydF9uKHN0YXJ0LCBuLCBtYXNrKSAoKChzdGFydCkgKyAobikp ICYgKG1hc2spKQorI2RlZmluZSBwb3J0X24oZSwgbikgX19wb3J0X24oKGUpLT5wb3J0X2hlYWQs IG4sIChlKS0+cG9ydF9tYXNrKQorCisvKiBJbmRleCBzdGFydGluZyBmcm9tIHBvcnRfaGVhZCAq Lworc3RhdGljIGlubGluZSBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqCitleGVjbGlzdHNfcG9ydChz dHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cywKKwkgICAgICAg Y29uc3QgdW5zaWduZWQgaW50IG4pCit7CisJcmV0dXJuICZleGVjbGlzdHMtPnBvcnRbcG9ydF9u KGV4ZWNsaXN0cywgbildOworfQorCitzdGF0aWMgaW5saW5lIHN0cnVjdCBleGVjbGlzdF9wb3J0 ICoKK2V4ZWNsaXN0c19wb3J0X2hlYWQoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBj b25zdCBleGVjbGlzdHMpCit7CisJcmV0dXJuIGV4ZWNsaXN0c19wb3J0KGV4ZWNsaXN0cywgMCk7 Cit9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKgorZXhlY2xpc3RzX3Bv cnRfdGFpbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cykK K3sKKwlyZXR1cm4gZXhlY2xpc3RzX3BvcnQoZXhlY2xpc3RzLCAtMSk7Cit9CisKK3N0YXRpYyBp bmxpbmUgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKgorZXhlY2xpc3RzX3BvcnRfbmV4dChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cywKKwkJICAgIGNvbnN0IHN0 cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgcG9ydCkKK3sKKwljb25zdCB1bnNpZ25lZCBpbnQg biA9IHBvcnRfaW5kZXgocG9ydCwgZXhlY2xpc3RzKTsKKworCXJldHVybiBleGVjbGlzdHNfcG9y dChleGVjbGlzdHMsIG4gKyAxKTsKK30KKworc3RhdGljIGlubGluZSBzdHJ1Y3QgZXhlY2xpc3Rf cG9ydCAqCiBleGVjbGlzdHNfcG9ydF9jb21wbGV0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNs aXN0cyAqIGNvbnN0IGV4ZWNsaXN0cywKIAkJCXN0cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3Qg cG9ydCkKIHsKLQljb25zdCB1bnNpZ25lZCBpbnQgbSA9IGV4ZWNsaXN0cy0+cG9ydF9tYXNrOwot Ci0JR0VNX0JVR19PTihwb3J0X2luZGV4KHBvcnQsIGV4ZWNsaXN0cykgIT0gMCk7CisJR0VNX0JV R19PTihwb3J0X2luZGV4KHBvcnQsIGV4ZWNsaXN0cykgIT0gZXhlY2xpc3RzLT5wb3J0X2hlYWQp OwogCi0JbWVtbW92ZShwb3J0LCBwb3J0ICsgMSwgbSAqIHNpemVvZihzdHJ1Y3QgZXhlY2xpc3Rf cG9ydCkpOwotCW1lbXNldChwb3J0ICsgbSwgMCwgc2l6ZW9mKHN0cnVjdCBleGVjbGlzdF9wb3J0 KSk7CisJbWVtc2V0KHBvcnQsIDAsIHNpemVvZihzdHJ1Y3QgZXhlY2xpc3RfcG9ydCkpOworCWV4 ZWNsaXN0cy0+cG9ydF9oZWFkID0gcG9ydF9uKGV4ZWNsaXN0cywgMSk7CisJcmV0dXJuIGV4ZWNs aXN0c19wb3J0X2hlYWQoZXhlY2xpc3RzKTsKIH0KIAogc3RhdGljIGlubGluZSB1bnNpZ25lZCBp bnQKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==