From: Mika Kuoppala Subject: [PATCH 8/8] drm/i915: Keep track of reserved execlist ports Date: Tue, 12 Sep 2017 11:36:18 +0300 Message-ID: <20170912083618.13009-9-mika.kuoppala@intel.com> References: <20170912083618.13009-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C36E76E588 for ; Tue, 12 Sep 2017 08:39:53 +0000 (UTC) In-Reply-To: <20170912083618.13009-1-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 List-Id: intel-gfx@lists.freedesktop.org VG8gZnVydGhlciBlbmNoYW5jZSBwb3J0IHByb2Nlc3NpbmcsIGtlZXAgdHJhY2sgb2YKcmVzZXJ2 ZWQgcG9ydHMuIFRoaXMgd2F5IHdlIGNhbiBpdGVyYXRlIG9ubHkgdGhlIHVzZWQgc3Vic2V0Cm9m IHBvcnQgc3BhY2UuIE5vdGUgdGhhdCB3ZSBsaWZ0IHRoZSByZXNwb25zaWJpbGl0eSBvZgpleGVj bGlzdHNfc3VibWl0X3JlcXVlc3QoKSB0byBpbnNwZWN0IGh3IGF2YWlsYWJpbGl0eSBhbmQKYWx3 YXlzIGRvIGRlcXVldWluZy4gVGhpcyBpcyB0byBlbnN1cmUgdGhhdCBvbmx5IHRoZSBpcnEKaGFu ZGxlciB3aWxsIGJlIHJlc3BvbnNpYmxlIGZvciBrZWVwaW5nIHRyYWNrIG9mIGF2YWlsYWJsZSBw b3J0cy4KClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDQz ICsrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jICAgICB8 ICA1ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCA4NCAr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaCAgICB8IDUwICsrKysrKysrKysrKystLS0tLQogNSBmaWxlcyBjaGFuZ2Vk LCAxMTcgaW5zZXJ0aW9ucygrKSwgNjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDBkZmIwM2EwY2VlNC4uZmRkYTNhMTgzNWFk IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC02NjIs MTIgKzY2MiwxOSBAQCBzdGF0aWMgdm9pZCBwb3J0X2Fzc2lnbihzdHJ1Y3QgZXhlY2xpc3RfcG9y dCAqcG9ydCwKIHN0YXRpYyBib29sIGk5MTVfZ3VjX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBl bCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwotCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZXhl Y2xpc3RfcG9ydF9oZWFkKGVsKTsKLQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0 IGxhc3RfcG9ydCA9IGV4ZWNsaXN0X3BvcnRfdGFpbChlbCk7Ci0Jc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpsYXN0ID0gcG9ydF9yZXF1ZXN0KHBvcnQpOworCXN0cnVjdCBleGVjbGlzdF9w b3J0ICpwb3J0OworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqbGFzdDsKIAlzdHJ1Y3Qg cmJfbm9kZSAqcmI7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIAorCWlmIChleGVjbGlzdF9hY3Rp dmVfcG9ydHMoZWwpKSB7CisJCXBvcnQgPSBleGVjbGlzdF9wb3J0X3RhaWwoZWwpOworCQlsYXN0 ID0gcG9ydF9yZXF1ZXN0KHBvcnQpOworCX0gZWxzZSB7CisJCXBvcnQgPSBOVUxMOworCQlsYXN0 ID0gTlVMTDsKKwl9CisKIAlzcGluX2xvY2tfaXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsK IAlyYiA9IGVsLT5maXJzdDsKIAlHRU1fQlVHX09OKHJiX2ZpcnN0KCZlbC0+cXVldWUpICE9IHJi KTsKQEAgLTY3NSw5ICs2ODIsMTIgQEAgc3RhdGljIGJvb2wgaTkxNV9ndWNfZGVxdWV1ZShzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCXN0cnVjdCBpOTE1X3ByaW9saXN0ICpwID0g cmJfZW50cnkocmIsIHR5cGVvZigqcCksIG5vZGUpOwogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJxLCAqcm47CiAKKwkJaWYgKCFwb3J0KQorCQkJcG9ydCA9IGV4ZWNsaXN0X3JlcXVl c3RfcG9ydChlbCk7CisKIAkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJxLCBybiwgJnAtPnJl cXVlc3RzLCBwcmlvdHJlZS5saW5rKSB7CiAJCQlpZiAobGFzdCAmJiBycS0+Y3R4ICE9IGxhc3Qt PmN0eCkgewotCQkJCWlmIChwb3J0ID09IGxhc3RfcG9ydCkgeworCQkJCWlmICghZXhlY2xpc3Rf aW5hY3RpdmVfcG9ydHMoZWwpKSB7CiAJCQkJCV9fbGlzdF9kZWxfbWFueSgmcC0+cmVxdWVzdHMs CiAJCQkJCQkJJnJxLT5wcmlvdHJlZS5saW5rKTsKIAkJCQkJZ290byBkb25lOwpAQCAtNjg2LDcg KzY5Niw4IEBAIHN0YXRpYyBib29sIGk5MTVfZ3VjX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogCQkJCWlmIChzdWJtaXQpCiAJCQkJCXBvcnRfYXNzaWduKHBvcnQsIGxh c3QpOwogCi0JCQkJcG9ydCA9IGV4ZWNsaXN0X3BvcnRfbmV4dChlbCwgcG9ydCk7CisJCQkJcG9y dCA9IGV4ZWNsaXN0X3JlcXVlc3RfcG9ydChlbCk7CisJCQkJR0VNX0JVR19PTihwb3J0X2lzc2V0 KHBvcnQpKTsKIAkJCX0KIAogCQkJSU5JVF9MSVNUX0hFQUQoJnJxLT5wcmlvdHJlZS5saW5rKTsK QEAgLTcxNywyNiArNzI4LDIyIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2lycV9oYW5kbGVyKHVu c2lnbmVkIGxvbmcgZGF0YSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICogY29uc3QgZW5n aW5lID0gKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKilkYXRhOwogCXN0cnVjdCBpbnRlbF9lbmdp bmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwotCXN0cnVjdCBleGVj bGlzdF9wb3J0ICpwb3J0ID0gZXhlY2xpc3RfcG9ydF9oZWFkKGVsKTsKLQljb25zdCBzdHJ1Y3Qg ZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9IGV4ZWNsaXN0X3BvcnRfdGFpbChlbCk7 Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycTsKLQlib29sIHN1Ym1pdDsKIAogCWRv IHsKLQkJcnEgPSBwb3J0X3JlcXVlc3QocG9ydCk7Ci0JCXdoaWxlIChycSAmJiBpOTE1X2dlbV9y ZXF1ZXN0X2NvbXBsZXRlZChycSkpIHsKKwkJd2hpbGUgKGV4ZWNsaXN0X2FjdGl2ZV9wb3J0cyhl bCkpIHsKKwkJCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZXhlY2xpc3RfcG9ydF9oZWFk KGVsKTsKKwkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEgPSBwb3J0X3JlcXVlc3Qo cG9ydCk7CisKKwkJCWlmICghaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocnEpKQorCQkJCWJy ZWFrOworCiAJCQl0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0X291dChycSk7CiAJCQlpOTE1X2dlbV9y ZXF1ZXN0X3B1dChycSk7CiAKLQkJCXBvcnQgPSBleGVjbGlzdF9wb3J0X2NvbXBsZXRlKGVsLCBw b3J0KTsKLQotCQkJcnEgPSBwb3J0X3JlcXVlc3QocG9ydCk7CisJCQlleGVjbGlzdF9yZWxlYXNl X3BvcnQoZWwsIHBvcnQpOwogCQl9CiAKLQkJc3VibWl0ID0gZmFsc2U7Ci0JCWlmICghcG9ydF9j b3VudChsYXN0X3BvcnQpKQotCQkJc3VibWl0ID0gaTkxNV9ndWNfZGVxdWV1ZShlbmdpbmUpOwot CX0gd2hpbGUgKHN1Ym1pdCk7CisJfSB3aGlsZSAoZXhlY2xpc3RfaW5hY3RpdmVfcG9ydHMoZWwp ICYmIGk5MTVfZ3VjX2RlcXVldWUoZW5naW5lKSk7CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYwppbmRleCAxOTE5YWMwYjdiMGYuLmRlNGU2MDg3ODZhOCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCkBAIC0xMzEyLDcgKzEzMTIsNyBAQCBnZW44X2NzX2lycV9oYW5kbGVyKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyIGlpciwgaW50IHRlc3Rfc2hpZnQpCiAJYm9vbCB0 YXNrbGV0ID0gZmFsc2U7CiAKIAlpZiAoaWlyICYgKEdUX0NPTlRFWFRfU1dJVENIX0lOVEVSUlVQ VCA8PCB0ZXN0X3NoaWZ0KSkgewotCQlpZiAocG9ydF9jb3VudChleGVjbGlzdF9wb3J0X2hlYWQo ZWwpKSkgeworCQlpZiAoZXhlY2xpc3RfYWN0aXZlX3BvcnRzKGVsKSkgewogCQkJX19zZXRfYml0 KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUtPmlycV9wb3N0ZWQpOwogCQkJdGFza2xldCA9 IHRydWU7CiAJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggNGI5 ZWFlYzUwMDcwLi5iMDkyMTJiYjY2YjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jCkBAIC0zODksNiArMzg5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5naW5lX2luaXRf ZXhlY2xpc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCUdFTV9CVUdfT04oZWwt PnBvcnRfbWFzayA+PSBFWEVDTElTVF9NQVhfUE9SVFMpOwogCiAJZWwtPnBvcnRfaGVhZCA9IDA7 CisJZWwtPnBvcnRfY291bnQgPSAwOwogCiAJZWwtPnF1ZXVlID0gUkJfUk9PVDsKIAllbC0+Zmly c3QgPSBOVUxMOwpAQCAtMTM0NSw4ICsxMzQ2LDggQEAgYm9vbCBpbnRlbF9lbmdpbmVfaXNfaWRs ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaWYgKHRlc3RfYml0KEVOR0lORV9J UlFfRVhFQ0xJU1QsICZlbmdpbmUtPmlycV9wb3N0ZWQpKQogCQlyZXR1cm4gZmFsc2U7CiAKLQkv KiBCb3RoIHBvcnRzIGRyYWluZWQsIG5vIG1vcmUgRUxTUCBzdWJtaXNzaW9uPyAqLwotCWlmIChw b3J0X3JlcXVlc3QoZXhlY2xpc3RfcG9ydF9oZWFkKCZlbmdpbmUtPmV4ZWNsaXN0KSkpCisJLyog QWxsIHBvcnRzIGRyYWluZWQsIG5vIG1vcmUgRUxTUCBzdWJtaXNzaW9uPyAqLworCWlmIChleGVj bGlzdF9hY3RpdmVfcG9ydHMoJmVuZ2luZS0+ZXhlY2xpc3QpKQogCQlyZXR1cm4gZmFsc2U7CiAK IAkvKiBFTFNQIGlzIGVtcHR5LCBidXQgdGhlcmUgYXJlIHJlYWR5IHJlcXVlc3RzPyAqLwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAxYTFjNjhjNTNmYmQuLjE4YTg3Y2Y1NmI4MSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTM0NCwyMyArMzQ0LDI3IEBAIHN0YXRpYyB2b2lk IGV4ZWNsaXN0c19zdWJtaXRfcG9ydHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog CXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0OwogCXVuc2lnbmVkIGludCBuOwogCisJZm9yIChu ID0gMDsgbiA8IGV4ZWNsaXN0X2luYWN0aXZlX3BvcnRzKGVsKTsgbisrKSB7CisJCXdyaXRlbCgw LCBlbHNwKTsKKwkJd3JpdGVsKDAsIGVsc3ApOworCX0KKwogCWZvcl9lYWNoX2V4ZWNsaXN0X3Bv cnRfcmV2ZXJzZShlbCwgcG9ydCwgbikgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJxOwogCQl1bnNpZ25lZCBpbnQgY291bnQ7CiAJCXU2NCBkZXNjOwogCiAJCXJxID0gcG9ydF91 bnBhY2socG9ydCwgJmNvdW50KTsKLQkJaWYgKHJxKSB7Ci0JCQlHRU1fQlVHX09OKGNvdW50ID4g IW4pOwotCQkJaWYgKCFjb3VudCsrKQotCQkJCWV4ZWNsaXN0c19jb250ZXh0X3N0YXR1c19jaGFu Z2UocnEsIElOVEVMX0NPTlRFWFRfU0NIRURVTEVfSU4pOwotCQkJcG9ydF9zZXQocG9ydCwgcG9y dF9wYWNrKHJxLCBjb3VudCkpOwotCQkJZGVzYyA9IGV4ZWNsaXN0c191cGRhdGVfY29udGV4dChy cSk7Ci0JCQlHRU1fREVCVUdfRVhFQyhwb3J0LT5jb250ZXh0X2lkID0gdXBwZXJfMzJfYml0cyhk ZXNjKSk7Ci0JCX0gZWxzZSB7Ci0JCQlHRU1fQlVHX09OKCFuKTsKLQkJCWRlc2MgPSAwOwotCQl9 CisKKwkJR0VNX0JVR19PTighcnEpOworCQlHRU1fQlVHX09OKGNvdW50ID4gIW4pOworCisJCWlm ICghY291bnQrKykKKwkJCWV4ZWNsaXN0c19jb250ZXh0X3N0YXR1c19jaGFuZ2UocnEsIElOVEVM X0NPTlRFWFRfU0NIRURVTEVfSU4pOworCisJCXBvcnRfc2V0KHBvcnQsIHBvcnRfcGFjayhycSwg Y291bnQpKTsKKwkJZGVzYyA9IGV4ZWNsaXN0c191cGRhdGVfY29udGV4dChycSk7CisJCUdFTV9E RUJVR19FWEVDKHBvcnQtPmNvbnRleHRfaWQgPSB1cHBlcl8zMl9iaXRzKGRlc2MpKTsKIAogCQl3 cml0ZWwodXBwZXJfMzJfYml0cyhkZXNjKSwgZWxzcCk7CiAJCXdyaXRlbChsb3dlcl8zMl9iaXRz KGRlc2MpLCBlbHNwKTsKQEAgLTM5OCwxNSArNDAyLDE2IEBAIHN0YXRpYyB2b2lkIHBvcnRfYXNz aWduKHN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0LAogCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNf ZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpsYXN0OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBj b25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwotCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0 ID0gZXhlY2xpc3RfcG9ydF9oZWFkKGVsKTsKLQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAq IGNvbnN0IGxhc3RfcG9ydCA9IGV4ZWNsaXN0X3BvcnRfdGFpbChlbCk7CisJc3RydWN0IGV4ZWNs aXN0X3BvcnQgKnBvcnQ7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpsYXN0OwogCXN0 cnVjdCByYl9ub2RlICpyYjsKIAlib29sIHN1Ym1pdCA9IGZhbHNlOwogCi0JbGFzdCA9IHBvcnRf cmVxdWVzdChwb3J0KTsKLQlpZiAobGFzdCkKKwlpZiAoZXhlY2xpc3RfYWN0aXZlX3BvcnRzKGVs KSkgeworCQlwb3J0ID0gZXhlY2xpc3RfcG9ydF90YWlsKGVsKTsKKwkJbGFzdCA9IHBvcnRfcmVx dWVzdChwb3J0KTsKKwogCQkvKiBXYUlkbGVMaXRlUmVzdG9yZTpiZHcsc2tsCiAJCSAqIEFwcGx5 IHRoZSB3YSBOT09QcyB0byBwcmV2ZW50IHJpbmc6SEVBRCA9PSByZXE6VEFJTAogCQkgKiBhcyB3 ZSByZXN1Ym1pdCB0aGUgcmVxdWVzdC4gU2VlIGdlbjhfZW1pdF9icmVhZGNydW1iKCkKQEAgLTQx NCw2ICs0MTksMTAgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogCQkgKiByZXF1ZXN0LgogCQkgKi8KIAkJbGFzdC0+dGFpbCA9 IGxhc3QtPndhX3RhaWw7CisJfSBlbHNlIHsKKwkJcG9ydCA9IE5VTEw7CisJCWxhc3QgPSBOVUxM OworCX0KIAogCS8qIEhhcmR3YXJlIHN1Ym1pc3Npb24gaXMgdGhyb3VnaCAyIHBvcnRzLiBDb25j ZXB0dWFsbHkgZWFjaCBwb3J0CiAJICogaGFzIGEgKFJJTkdfU1RBUlQsIFJJTkdfSEVBRCwgUklO R19UQUlMKSB0dXBsZS4gUklOR19TVEFSVCBpcwpAQCAtNDQzLDYgKzQ1Miw5IEBAIHN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJ c3RydWN0IGk5MTVfcHJpb2xpc3QgKnAgPSByYl9lbnRyeShyYiwgdHlwZW9mKCpwKSwgbm9kZSk7 CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEsICpybjsKIAorCQlpZiAoIXBvcnQp CisJCQlwb3J0ID0gZXhlY2xpc3RfcmVxdWVzdF9wb3J0KGVsKTsKKwogCQlsaXN0X2Zvcl9lYWNo X2VudHJ5X3NhZmUocnEsIHJuLCAmcC0+cmVxdWVzdHMsIHByaW90cmVlLmxpbmspIHsKIAkJCS8q CiAJCQkgKiBDYW4gd2UgY29tYmluZSB0aGlzIHJlcXVlc3Qgd2l0aCB0aGUgY3VycmVudCBwb3J0 PwpAQCAtNDYxLDcgKzQ3Myw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCQkgKiBjb21iaW5lIHRoaXMgcmVxdWVzdCB3 aXRoIHRoZSBsYXN0LCB0aGVuIHdlCiAJCQkJICogYXJlIGRvbmUuCiAJCQkJICovCi0JCQkJaWYg KHBvcnQgPT0gbGFzdF9wb3J0KSB7CisJCQkJaWYgKCFleGVjbGlzdF9pbmFjdGl2ZV9wb3J0cyhl bCkpIHsKIAkJCQkJX19saXN0X2RlbF9tYW55KCZwLT5yZXF1ZXN0cywKIAkJCQkJCQkmcnEtPnBy aW90cmVlLmxpbmspOwogCQkJCQlnb3RvIGRvbmU7CkBAIC00ODYsOCArNDk4LDcgQEAgc3RhdGlj IHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog CQkJCWlmIChzdWJtaXQpCiAJCQkJCXBvcnRfYXNzaWduKHBvcnQsIGxhc3QpOwogCi0JCQkJcG9y dCA9IGV4ZWNsaXN0X3BvcnRfbmV4dChlbCwgcG9ydCk7Ci0KKwkJCQlwb3J0ID0gZXhlY2xpc3Rf cmVxdWVzdF9wb3J0KGVsKTsKIAkJCQlHRU1fQlVHX09OKHBvcnRfaXNzZXQocG9ydCkpOwogCQkJ fQogCkBAIC01MTgsOSArNTI5LDEyIEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogc3RhdGljIGJvb2wgZXhlY2xpc3RzX2Vs c3BfcmVhZHkoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsKQogewotCXN0 cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgcG9ydCA9IGV4ZWNsaXN0X3BvcnRfaGVhZChlbCk7 CisJY29uc3QgdW5zaWduZWQgaW50IGFjdGl2ZSA9IGV4ZWNsaXN0X2FjdGl2ZV9wb3J0cyhlbCk7 CisKKwlpZiAoIWFjdGl2ZSkKKwkJcmV0dXJuIHRydWU7CiAKLQlyZXR1cm4gcG9ydF9jb3VudChw b3J0KSArIHBvcnRfY291bnQoZXhlY2xpc3RfcG9ydF9uZXh0KGVsLCBwb3J0KSkgPCAyOworCXJl dHVybiBwb3J0X2NvdW50KGV4ZWNsaXN0X3BvcnRfdGFpbChlbCkpICsgYWN0aXZlIDwgMjsKIH0K IAogLyoKQEAgLTUzMSw3ICs1NDUsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRs ZXIodW5zaWduZWQgbG9uZyBkYXRhKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKiBjb25z dCBlbmdpbmUgPSAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqKWRhdGE7CiAJc3RydWN0IGludGVs X2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhlY2xpc3Q7Ci0Jc3RydWN0 IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVjbGlzdF9wb3J0X2hlYWQoZWwpOwogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKIAogCS8qIFdlIGNhbiBz a2lwIGFjcXVpcmluZyBpbnRlbF9ydW50aW1lX3BtX2dldCgpIGhlcmUgYXMgaXQgd2FzIHRha2Vu CkBAIC01NzEsNiArNTg0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHVu c2lnbmVkIGxvbmcgZGF0YSkKIAkJdGFpbCA9IEdFTjhfQ1NCX1dSSVRFX1BUUihoZWFkKTsKIAkJ aGVhZCA9IEdFTjhfQ1NCX1JFQURfUFRSKGhlYWQpOwogCQl3aGlsZSAoaGVhZCAhPSB0YWlsKSB7 CisJCQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydDsKIAkJCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcnE7CiAJCQl1bnNpZ25lZCBpbnQgc3RhdHVzOwogCQkJdW5zaWduZWQgaW50IGNv dW50OwpAQCAtNTk5LDYgKzYxMyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxl cih1bnNpZ25lZCBsb25nIGRhdGEpCiAJCQlpZiAoIShzdGF0dXMgJiBHRU44X0NUWF9TVEFUVVNf Q09NUExFVEVEX01BU0spKQogCQkJCWNvbnRpbnVlOwogCisJCQlwb3J0ID0gZXhlY2xpc3RfcG9y dF9oZWFkKGVsKTsKIAkJCS8qIENoZWNrIHRoZSBjb250ZXh0L2Rlc2MgaWQgZm9yIHRoaXMgZXZl bnQgbWF0Y2hlcyAqLwogCQkJR0VNX0RFQlVHX0JVR19PTihyZWFkbChidWYgKyAyICogaGVhZCAr IDEpICE9CiAJCQkJCSBwb3J0LT5jb250ZXh0X2lkKTsKQEAgLTYxMywxMyArNjI4LDEzIEBAIHN0 YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiAJCQkJ dHJhY2VfaTkxNV9nZW1fcmVxdWVzdF9vdXQocnEpOwogCQkJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0 KHJxKTsKIAotCQkJCXBvcnQgPSBleGVjbGlzdF9wb3J0X2NvbXBsZXRlKGVsLCBwb3J0KTsKKwkJ CQlleGVjbGlzdF9yZWxlYXNlX3BvcnQoZWwsIHBvcnQpOwogCQkJfSBlbHNlIHsKIAkJCQlwb3J0 X3NldChwb3J0LCBwb3J0X3BhY2socnEsIGNvdW50KSk7CiAJCQl9CiAKIAkJCS8qIEFmdGVyIHRo ZSBmaW5hbCBlbGVtZW50LCB0aGUgaHcgc2hvdWxkIGJlIGlkbGUgKi8KLQkJCUdFTV9CVUdfT04o cG9ydF9jb3VudChwb3J0KSA9PSAwICYmCisJCQlHRU1fQlVHX09OKGV4ZWNsaXN0X2FjdGl2ZV9w b3J0cyhlbCkgPT0gMCAmJgogCQkJCSAgICEoc3RhdHVzICYgR0VOOF9DVFhfU1RBVFVTX0FDVElW RV9JRExFKSk7CiAJCX0KIApAQCAtNzA5LDEwICs3MjQsOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlz dHNfc3VibWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQog CiAJaWYgKGluc2VydF9yZXF1ZXN0KGVuZ2luZSwKIAkJCSAgICZyZXF1ZXN0LT5wcmlvdHJlZSwK LQkJCSAgIHJlcXVlc3QtPnByaW90cmVlLnByaW9yaXR5KSkgewotCQlpZiAoZXhlY2xpc3RzX2Vs c3BfcmVhZHkoZWwpKQotCQkJdGFza2xldF9oaV9zY2hlZHVsZSgmZWwtPmlycV90YXNrbGV0KTsK LQl9CisJCQkgICByZXF1ZXN0LT5wcmlvdHJlZS5wcmlvcml0eSkpCisJCXRhc2tsZXRfaGlfc2No ZWR1bGUoJmVsLT5pcnFfdGFza2xldCk7CiAKIAlHRU1fQlVHX09OKCFlbC0+Zmlyc3QpOwogCUdF TV9CVUdfT04obGlzdF9lbXB0eSgmcmVxdWVzdC0+cHJpb3RyZWUubGluaykpOwpAQCAtMTMzNCw3 ICsxMzQ3LDYgQEAgc3RhdGljIHZvaWQgcmVzZXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lLAogCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZl bmdpbmUtPmV4ZWNsaXN0OwotCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZXhlY2xpc3Rf cG9ydF9oZWFkKGVsKTsKIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2U7CiAKIAkvKgpAQCAtMTM1 MSwxMiArMTM2MywxNiBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCXJldHVybjsKIAl9CiAKLQlpZiAocmVxdWVzdC0+Y3R4 ICE9IHBvcnRfcmVxdWVzdChwb3J0KS0+Y3R4KSB7Ci0JCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHBv cnRfcmVxdWVzdChwb3J0KSk7Ci0JCWV4ZWNsaXN0X3BvcnRfY29tcGxldGUoZWwsIHBvcnQpOwot CX0KKwlpZiAoZXhlY2xpc3RfYWN0aXZlX3BvcnRzKGVsKSkgeworCQlzdHJ1Y3QgZXhlY2xpc3Rf cG9ydCAqcG9ydCA9IGV4ZWNsaXN0X3BvcnRfaGVhZChlbCk7CiAKLQlHRU1fQlVHX09OKHJlcXVl c3QtPmN0eCAhPSBwb3J0X3JlcXVlc3QocG9ydCktPmN0eCk7CisJCWlmIChyZXF1ZXN0LT5jdHgg IT0gcG9ydF9yZXF1ZXN0KHBvcnQpLT5jdHgpIHsKKwkJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHBv cnRfcmVxdWVzdChwb3J0KSk7CisJCQlleGVjbGlzdF9yZWxlYXNlX3BvcnQoZWwsIHBvcnQpOwor CQl9CisKKwkJR0VNX0JVR19PTihyZXF1ZXN0LT5jdHggIT0gcG9ydF9yZXF1ZXN0KHBvcnQpLT5j dHgpOworCX0KIAogCS8qIElmIHRoZSByZXF1ZXN0IHdhcyBpbm5vY2VudCwgd2UgbGVhdmUgdGhl IHJlcXVlc3QgaW4gdGhlIEVMU1AKIAkgKiBhbmQgd2lsbCB0cnkgdG8gcmVwbGF5IGl0IG9uIHJl c3RhcnRpbmcuIFRoZSBjb250ZXh0IGltYWdlIG1heQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCmluZGV4IDEzZDhlMTExNWYzYi4uOWMzNzdmNmViOGZlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0yNDksNiArMjQ5LDExIEBAIHN0cnVj dCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgewogCXVuc2lnbmVkIGludCBwb3J0X2hlYWQ7CiAKIAkv KioKKwkgKiBAcG9ydF9jb3VudDogcmVzZXJ2ZWQgcG9ydHMKKwkgKi8KKwl1bnNpZ25lZCBpbnQg cG9ydF9jb3VudDsKKworCS8qKgogCSAqIEBxdWV1ZTogcXVldWUgb2YgcmVxdWVzdHMsIGluIHBy aW9yaXR5IGxpc3RzCiAJICovCiAJc3RydWN0IHJiX3Jvb3QgcXVldWU7CkBAIC01MTAsNDQgKzUx NSw2NSBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogI2RlZmluZSBmb3JfZWFjaF9leGVj bGlzdF9wb3J0KGVsX18sIHBvcnRfXywgbl9fKSBcCiAJZm9yICgobl9fKSA9IDA7IFwKLQkgICAg IChwb3J0X18pID0gJihlbF9fKS0+cG9ydFtfX3BvcnRfaWR4KChlbF9fKS0+cG9ydF9oZWFkLCAo bl9fKSwgKGVsX18pLT5wb3J0X21hc2spXSwgKG5fXykgPCAoZWxfXyktPnBvcnRfbWFzayArIDE7 IFwKKwkgICAgIChwb3J0X18pID0gJihlbF9fKS0+cG9ydFtfX3BvcnRfaWR4KChlbF9fKS0+cG9y dF9oZWFkLCAobl9fKSwgKGVsX18pLT5wb3J0X21hc2spXSwgKG5fXykgPCAoZWxfXyktPnBvcnRf Y291bnQ7IFwKIAkgICAgIChuX18pKyspCiAKICNkZWZpbmUgZm9yX2VhY2hfZXhlY2xpc3RfcG9y dF9yZXZlcnNlKGVsX18sIHBvcnRfXywgbl9fKSBcCi0JZm9yICgobl9fKSA9IChlbF9fKS0+cG9y dF9tYXNrICsgMTsgXAorCWZvciAoKG5fXykgPSAoZWxfXyktPnBvcnRfY291bnQ7IFwKIAkgICAg IChwb3J0X18pID0gJihlbF9fKS0+cG9ydFtfX3BvcnRfaWR4KChlbF9fKS0+cG9ydF9oZWFkIC0g MSwgKG5fXyksIChlbF9fKS0+cG9ydF9tYXNrKV0sIChuX18pLS07KQogCiBzdGF0aWMgaW5saW5l IHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKIGV4ZWNsaXN0X3BvcnRfaGVhZChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwpCiB7CisJR0VNX0RFQlVHX0JVR19PTighZWwtPnBv cnRfY291bnQpOworCiAJcmV0dXJuICZlbC0+cG9ydFtlbC0+cG9ydF9oZWFkXTsKIH0KIAogc3Rh dGljIGlubGluZSBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqCiBleGVjbGlzdF9wb3J0X3RhaWwoc3Ry dWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsKQogewotCXJldHVybiAmZWwtPnBv cnRbX19wb3J0X2lkeChlbC0+cG9ydF9oZWFkLCBlbC0+cG9ydF9tYXNrLCBlbC0+cG9ydF9tYXNr KV07CisJR0VNX0RFQlVHX0JVR19PTighZWwtPnBvcnRfY291bnQpOworCisJcmV0dXJuICZlbC0+ cG9ydFtfX3BvcnRfaWR4KGVsLT5wb3J0X2hlYWQsIGVsLT5wb3J0X2NvdW50IC0gMSwgZWwtPnBv cnRfbWFzayldOwogfQogCi1zdGF0aWMgaW5saW5lIHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKLWV4 ZWNsaXN0X3BvcnRfbmV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWws Ci0JCSAgIGNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgcG9ydCkKK3N0YXRpYyBp bmxpbmUgdW5zaWduZWQgaW50CitleGVjbGlzdF9hY3RpdmVfcG9ydHMoY29uc3Qgc3RydWN0IGlu dGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsKQogewotCWNvbnN0IHVuc2lnbmVkIGludCBp ID0gcG9ydF9pbmRleChwb3J0LCBlbCk7CisJcmV0dXJuIFJFQURfT05DRShlbC0+cG9ydF9jb3Vu dCk7Cit9CiAKLQlyZXR1cm4gJmVsLT5wb3J0W19fcG9ydF9pZHgoaSwgMSwgZWwtPnBvcnRfbWFz ayldOworc3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQKK2V4ZWNsaXN0X2luYWN0aXZlX3BvcnRz KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCkKK3sKKwlyZXR1 cm4gZWwtPnBvcnRfbWFzayArIDEgLSBSRUFEX09OQ0UoZWwtPnBvcnRfY291bnQpOwogfQogCiBz dGF0aWMgaW5saW5lIHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKLWV4ZWNsaXN0X3BvcnRfY29tcGxl dGUoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsLAotCQkgICAgICAgc3Ry dWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0KQorZXhlY2xpc3RfcmVxdWVzdF9wb3J0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCkKK3sKKwlHRU1fREVCVUdfQlVH X09OKGVsLT5wb3J0X2NvdW50ID09IGVsLT5wb3J0X21hc2sgKyAxKTsKKworCWVsLT5wb3J0X2Nv dW50Kys7CisKKwlHRU1fREVCVUdfQlVHX09OKHBvcnRfaXNzZXQoZXhlY2xpc3RfcG9ydF90YWls KGVsKSkpOworCisJcmV0dXJuIGV4ZWNsaXN0X3BvcnRfdGFpbChlbCk7Cit9CisKK3N0YXRpYyBp bmxpbmUgdm9pZAorZXhlY2xpc3RfcmVsZWFzZV9wb3J0KHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhl Y2xpc3QgKiBjb25zdCBlbCwKKwkJICAgICAgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBw b3J0KQogewogCUdFTV9ERUJVR19CVUdfT04ocG9ydF9pbmRleChwb3J0LCBlbCkgIT0gZWwtPnBv cnRfaGVhZCk7CisJR0VNX0RFQlVHX0JVR19PTighcG9ydF9pc3NldChwb3J0KSk7CisJR0VNX0RF QlVHX0JVR19PTighZWwtPnBvcnRfY291bnQpOwogCiAJbWVtc2V0KHBvcnQsIDAsIHNpemVvZihz dHJ1Y3QgZXhlY2xpc3RfcG9ydCkpOwotCWVsLT5wb3J0X2hlYWQgPSBfX3BvcnRfaWR4KGVsLT5w b3J0X2hlYWQsIDEsIGVsLT5wb3J0X21hc2spOwogCi0JcmV0dXJuIGV4ZWNsaXN0X3BvcnRfaGVh ZChlbCk7CisJZWwtPnBvcnRfaGVhZCA9IF9fcG9ydF9pZHgoZWwtPnBvcnRfaGVhZCwgMSwgZWwt PnBvcnRfbWFzayk7CisJZWwtPnBvcnRfY291bnQtLTsKIH0KIAogdm9pZCBleGVjbGlzdF9jYW5j ZWxfcG9ydF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwp OwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK