From: Oscar Mateo Subject: [PATCH v3 05/13] drm/i915/guc: Break out the GuC log extras into their own "runtime" struct Date: Wed, 22 Mar 2017 10:39:48 -0700 Message-ID: <1490204396-3395-6-git-send-email-oscar.mateo@intel.com> References: <1490204396-3395-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 04F316E9DC for ; Thu, 23 Mar 2017 00:39:53 +0000 (UTC) In-Reply-To: <1490204396-3395-1-git-send-email-oscar.mateo@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 V2hlbiBpbml0aWFsaXppbmcgdGhlIEd1QyBsb2cgc3RydWN0LCB0aGVyZSBpcyBhbiBvYmplY3Qg d2UgbmVlZCB0bwphbGxvY2F0ZSBhbHdheXMsIHNpbmNlIHRoZSBHdUMgbmVlZHMgaXRzIGFkZHJl c3MgYXQgZncgbG9hZCB0aW1lLgpUaGUgcmVzdCBpcyBvbmx5IG5lZWRlZCBkdXJpbmcgcnVudGlt ZSwgaW4gdGhlIHNlbnNlIHRoYXQgd2Ugb25seQpjcmVhdGUgaWYgd2UgYWN0dWFsbHkgZW5hYmxl IEd1QyBsb2dnaW5nLiBNYWtlIHRoYXQgZGlzdGluY3Rpb24KZXhwbGljaXQgYnkgc3ViZGl2aWRp bmcgZnVydGhlciB0aGUgaW50ZWxfZ3VjX2xvZyBzdHJ1Y3QuCgp2MjogQ2FsbCB0aGUgbmV3IHN0 cnVjdCAicnVudGltZSIsIGluc3RlYWQgb2YgImV4dHJhcyIgKEpvb25hcykKCnYzOiBDaGVjayBp bmRlbnQgKEpvb25hcykKCkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFv bG9zcHVyaW9AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGFsIFdhamRlY3prbyA8bWljaGFs LndhamRlY3prb0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25h cy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxv c2Nhci5tYXRlb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YyAgICAgIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyB8IDcy ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuaCAgICAgIHwgMTIgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2Vy dGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGNi MjBjOTQuLjNkMmU2MjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMTc0MSw4ICsxNzQx LDggQEAgc3RhdGljIHZvaWQgZ2VuOV9ndWNfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCB1MzIgZ3RfaWlyKQogCQkJSTkxNV9XUklURShTT0ZUX1NDUkFUQ0go MTUpLCBtc2cgJiB+Zmx1c2gpOwogCiAJCQkvKiBIYW5kbGUgZmx1c2ggaW50ZXJydXB0IGluIGJv dHRvbSBoYWxmICovCi0JCQlxdWV1ZV93b3JrKGRldl9wcml2LT5ndWMubG9nLmZsdXNoX3dxLAot CQkJCSAgICZkZXZfcHJpdi0+Z3VjLmxvZy5mbHVzaF93b3JrKTsKKwkJCXF1ZXVlX3dvcmsoZGV2 X3ByaXYtPmd1Yy5sb2cucnVudGltZS5mbHVzaF93cSwKKwkJCQkgICAmZGV2X3ByaXYtPmd1Yy5s b2cucnVudGltZS5mbHVzaF93b3JrKTsKIAogCQkJZGV2X3ByaXYtPmd1Yy5sb2cuZmx1c2hfaW50 ZXJydXB0X2NvdW50Kys7CiAJCX0gZWxzZSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9n LmMKaW5kZXggYjM5Y2RkNi4uNmZiNjNhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2xvZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2cuYwpAQCAtMTY2LDcgKzE2Niw3IEBAIHN0YXRpYyBpbnQgZ3VjX2xvZ19yZWxheV9maWxlX2Ny ZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCXJldHVybiAtRU5PREVWOwogCX0KIAotCXJl dCA9IHJlbGF5X2xhdGVfc2V0dXBfZmlsZXMoZ3VjLT5sb2cucmVsYXlfY2hhbiwgImd1Y19sb2ci LCBsb2dfZGlyKTsKKwlyZXQgPSByZWxheV9sYXRlX3NldHVwX2ZpbGVzKGd1Yy0+bG9nLnJ1bnRp bWUucmVsYXlfY2hhbiwgImd1Y19sb2ciLCBsb2dfZGlyKTsKIAlpZiAocmV0IDwgMCAmJiByZXQg IT0gLUVFWElTVCkgewogCQlEUk1fRVJST1IoIkNvdWxkbid0IGFzc29jaWF0ZSByZWxheSBjaGFu IHdpdGggZmlsZSAlZFxuIiwgcmV0KTsKIAkJcmV0dXJuIHJldDsKQEAgLTE4MywxNSArMTgzLDE1 IEBAIHN0YXRpYyB2b2lkIGd1Y19tb3ZlX3RvX25leHRfYnVmKHN0cnVjdCBpbnRlbF9ndWMgKmd1 YykKIAlzbXBfd21iKCk7CiAKIAkvKiBBbGwgZGF0YSBoYXMgYmVlbiB3cml0dGVuLCBzbyBub3cg bW92ZSB0aGUgb2Zmc2V0IG9mIHN1YiBidWZmZXIuICovCi0JcmVsYXlfcmVzZXJ2ZShndWMtPmxv Zy5yZWxheV9jaGFuLCBndWMtPmxvZy52bWEtPm9iai0+YmFzZS5zaXplKTsKKwlyZWxheV9yZXNl cnZlKGd1Yy0+bG9nLnJ1bnRpbWUucmVsYXlfY2hhbiwgZ3VjLT5sb2cudm1hLT5vYmotPmJhc2Uu c2l6ZSk7CiAKIAkvKiBTd2l0Y2ggdG8gdGhlIG5leHQgc3ViIGJ1ZmZlciAqLwotCXJlbGF5X2Zs dXNoKGd1Yy0+bG9nLnJlbGF5X2NoYW4pOworCXJlbGF5X2ZsdXNoKGd1Yy0+bG9nLnJ1bnRpbWUu cmVsYXlfY2hhbik7CiB9CiAKIHN0YXRpYyB2b2lkICpndWNfZ2V0X3dyaXRlX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMpCiB7Ci0JaWYgKCFndWMtPmxvZy5yZWxheV9jaGFuKQorCWlmICgh Z3VjLT5sb2cucnVudGltZS5yZWxheV9jaGFuKQogCQlyZXR1cm4gTlVMTDsKIAogCS8qIEp1c3Qg Z2V0IHRoZSBiYXNlIGFkZHJlc3Mgb2YgYSBuZXcgc3ViIGJ1ZmZlciBhbmQgY29weSBkYXRhIGlu dG8gaXQKQEAgLTIwMiw3ICsyMDIsNyBAQCBzdGF0aWMgdm9pZCAqZ3VjX2dldF93cml0ZV9idWZm ZXIoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCSAqIGRvbmUgd2l0aG91dCB1c2luZyByZWxheV9y ZXNlcnZlKCkgYWxvbmcgd2l0aCByZWxheV93cml0ZSgpLiBTbyBpdHMKIAkgKiBiZXR0ZXIgdG8g dXNlIHJlbGF5X3Jlc2VydmUoKSBhbG9uZS4KIAkgKi8KLQlyZXR1cm4gcmVsYXlfcmVzZXJ2ZShn dWMtPmxvZy5yZWxheV9jaGFuLCAwKTsKKwlyZXR1cm4gcmVsYXlfcmVzZXJ2ZShndWMtPmxvZy5y dW50aW1lLnJlbGF5X2NoYW4sIDApOwogfQogCiBzdGF0aWMgYm9vbCBndWNfY2hlY2tfbG9nX2J1 Zl9vdmVyZmxvdyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCkBAIC0yNTMsMTEgKzI1MywxMSBAQCBz dGF0aWMgdm9pZCBndWNfcmVhZF91cGRhdGVfbG9nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCiAJdm9pZCAqc3JjX2RhdGEsICpkc3RfZGF0YTsKIAlib29sIG5ld19vdmVyZmxvdzsKIAot CWlmIChXQVJOX09OKCFndWMtPmxvZy5idWZfYWRkcikpCisJaWYgKFdBUk5fT04oIWd1Yy0+bG9n LnJ1bnRpbWUuYnVmX2FkZHIpKQogCQlyZXR1cm47CiAKIAkvKiBHZXQgdGhlIHBvaW50ZXIgdG8g c2hhcmVkIEd1QyBsb2cgYnVmZmVyICovCi0JbG9nX2J1Zl9zdGF0ZSA9IHNyY19kYXRhID0gZ3Vj LT5sb2cuYnVmX2FkZHI7CisJbG9nX2J1Zl9zdGF0ZSA9IHNyY19kYXRhID0gZ3VjLT5sb2cucnVu dGltZS5idWZfYWRkcjsKIAogCS8qIEdldCB0aGUgcG9pbnRlciB0byBsb2NhbCBidWZmZXIgdG8g c3RvcmUgdGhlIGxvZ3MgKi8KIAlsb2dfYnVmX3NuYXBzaG90X3N0YXRlID0gZHN0X2RhdGEgPSBn dWNfZ2V0X3dyaXRlX2J1ZmZlcihndWMpOwpAQCAtMzQzLDE3ICszNDMsMTcgQEAgc3RhdGljIHZv aWQgZ3VjX3JlYWRfdXBkYXRlX2xvZ19idWZmZXIoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogc3Rh dGljIHZvaWQgY2FwdHVyZV9sb2dzX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewog CXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9Ci0JCWNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3QgaW50 ZWxfZ3VjLCBsb2cuZmx1c2hfd29yayk7CisJCWNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3QgaW50 ZWxfZ3VjLCBsb2cucnVudGltZS5mbHVzaF93b3JrKTsKIAogCWd1Y19sb2dfY2FwdHVyZV9sb2dz KGd1Yyk7CiB9CiAKLXN0YXRpYyBib29sIGd1Y19sb2dfaGFzX2V4dHJhcyhzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCitzdGF0aWMgYm9vbCBndWNfbG9nX2hhc19ydW50aW1lKHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKIHsKLQlyZXR1cm4gZ3VjLT5sb2cuYnVmX2FkZHIgIT0gTlVMTDsKKwlyZXR1cm4g Z3VjLT5sb2cucnVudGltZS5idWZfYWRkciAhPSBOVUxMOwogfQogCi1zdGF0aWMgaW50IGd1Y19s b2dfY3JlYXRlX2V4dHJhcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCitzdGF0aWMgaW50IGd1Y19s b2dfcnVudGltZV9jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CiAJdm9pZCAqdmFkZHI7 CkBAIC0zNjMsNyArMzYzLDcgQEAgc3RhdGljIGludCBndWNfbG9nX2NyZWF0ZV9leHRyYXMoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPmRy bS5zdHJ1Y3RfbXV0ZXgpOwogCi0JR0VNX0JVR19PTihndWNfbG9nX2hhc19leHRyYXMoZ3VjKSk7 CisJR0VNX0JVR19PTihndWNfbG9nX2hhc19ydW50aW1lKGd1YykpOwogCiAJLyogQ3JlYXRlIGEg V0MgKFVuY2FjaGVkIGZvciByZWFkKSB2bWFsbG9jIG1hcHBpbmcgb2YgbG9nCiAJICogYnVmZmVy IHBhZ2VzLCBzbyB0aGF0IHdlIGNhbiBkaXJlY3RseSBnZXQgdGhlIGRhdGEKQEAgLTM3NSw3ICsz NzUsNyBAQCBzdGF0aWMgaW50IGd1Y19sb2dfY3JlYXRlX2V4dHJhcyhzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMpCiAJCXJldHVybiBQVFJfRVJSKHZhZGRyKTsKIAl9CiAKLQlndWMtPmxvZy5idWZfYWRk ciA9IHZhZGRyOworCWd1Yy0+bG9nLnJ1bnRpbWUuYnVmX2FkZHIgPSB2YWRkcjsKIAogCSAvKiBL ZWVwIHRoZSBzaXplIG9mIHN1YiBidWZmZXJzIHNhbWUgYXMgc2hhcmVkIGxvZyBidWZmZXIgKi8K IAlzdWJidWZfc2l6ZSA9IGd1Yy0+bG9nLnZtYS0+b2JqLT5iYXNlLnNpemU7CkBAIC00MDEsOSAr NDAxLDkgQEAgc3RhdGljIGludCBndWNfbG9nX2NyZWF0ZV9leHRyYXMoc3RydWN0IGludGVsX2d1 YyAqZ3VjKQogCX0KIAogCUdFTV9CVUdfT04oZ3VjX2xvZ19yZWxheV9jaGFuLT5zdWJidWZfc2l6 ZSA8IHN1YmJ1Zl9zaXplKTsKLQlndWMtPmxvZy5yZWxheV9jaGFuID0gZ3VjX2xvZ19yZWxheV9j aGFuOworCWd1Yy0+bG9nLnJ1bnRpbWUucmVsYXlfY2hhbiA9IGd1Y19sb2dfcmVsYXlfY2hhbjsK IAotCUlOSVRfV09SSygmZ3VjLT5sb2cuZmx1c2hfd29yaywgY2FwdHVyZV9sb2dzX3dvcmspOwor CUlOSVRfV09SSygmZ3VjLT5sb2cucnVudGltZS5mbHVzaF93b3JrLCBjYXB0dXJlX2xvZ3Nfd29y ayk7CiAKIAkvKgogCSAqIEd1QyBsb2cgYnVmZmVyIGZsdXNoIHdvcmsgaXRlbSBoYXMgdG8gZG8g cmVnaXN0ZXIgYWNjZXNzIHRvCkBAIC00MTYsOSArNDE2LDkgQEAgc3RhdGljIGludCBndWNfbG9n X2NyZWF0ZV9leHRyYXMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCSAqIG9yIHNjaGVkdWxlZCBs YXRlciBvbiByZXN1bWUuIFRoaXMgd2F5IHRoZSBoYW5kbGluZyBvZiB3b3JrCiAJICogaXRlbSBj YW4gYmUga2VwdCBzYW1lIGJldHdlZW4gc3lzdGVtIHN1c3BlbmQgJiBycG0gc3VzcGVuZC4KIAkg Ki8KLQlndWMtPmxvZy5mbHVzaF93cSA9IGFsbG9jX29yZGVyZWRfd29ya3F1ZXVlKCJpOTE1LWd1 Y19sb2ciLAotCQkJCQkJICAgIFdRX0hJR0hQUkkgfCBXUV9GUkVFWkFCTEUpOwotCWlmICghZ3Vj LT5sb2cuZmx1c2hfd3EpIHsKKwlndWMtPmxvZy5ydW50aW1lLmZsdXNoX3dxID0gYWxsb2Nfb3Jk ZXJlZF93b3JrcXVldWUoImk5MTUtZ3VjX2xvZyIsCisJCQkJCQlXUV9ISUdIUFJJIHwgV1FfRlJF RVpBQkxFKTsKKwlpZiAoIWd1Yy0+bG9nLnJ1bnRpbWUuZmx1c2hfd3EpIHsKIAkJRFJNX0VSUk9S KCJDb3VsZG4ndCBhbGxvY2F0ZSB0aGUgd3EgZm9yIEd1QyBsb2dnaW5nXG4iKTsKIAkJcmV0ID0g LUVOT01FTTsKIAkJZ290byBlcnJfcmVsYXljaGFuOwpAQCAtNDI3LDI2ICs0MjcsMjYgQEAgc3Rh dGljIGludCBndWNfbG9nX2NyZWF0ZV9leHRyYXMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCXJl dHVybiAwOwogCiBlcnJfcmVsYXljaGFuOgotCXJlbGF5X2Nsb3NlKGd1Yy0+bG9nLnJlbGF5X2No YW4pOworCXJlbGF5X2Nsb3NlKGd1Yy0+bG9nLnJ1bnRpbWUucmVsYXlfY2hhbik7CiBlcnJfdmFk ZHI6CiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChndWMtPmxvZy52bWEtPm9iaik7Ci0JZ3Vj LT5sb2cuYnVmX2FkZHIgPSBOVUxMOworCWd1Yy0+bG9nLnJ1bnRpbWUuYnVmX2FkZHIgPSBOVUxM OwogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGd1Y19sb2dfZGVzdHJveV9leHRyYXMo c3RydWN0IGludGVsX2d1YyAqZ3VjKQorc3RhdGljIHZvaWQgZ3VjX2xvZ19ydW50aW1lX2Rlc3Ry b3koc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCS8qCi0JICogSXQncyBwb3NzaWJsZSB0aGF0 IGV4dHJhcyB3ZXJlIG5ldmVyIGFsbG9jYXRlZCBiZWNhdXNlIGd1Y19sb2dfbGV2ZWwKLQkgKiB3 YXMgPCAwIGF0IHRoZSB0aW1lCisJICogSXQncyBwb3NzaWJsZSB0aGF0IHRoZSBydW50aW1lIHN0 dWZmIHdhcyBuZXZlciBhbGxvY2F0ZWQgYmVjYXVzZQorCSAqIGd1Y19sb2dfbGV2ZWwgd2FzIDwg MCBhdCB0aGUgdGltZQogCSAqKi8KLQlpZiAoIWd1Y19sb2dfaGFzX2V4dHJhcyhndWMpKQorCWlm ICghZ3VjX2xvZ19oYXNfcnVudGltZShndWMpKQogCQlyZXR1cm47CiAKLQlkZXN0cm95X3dvcmtx dWV1ZShndWMtPmxvZy5mbHVzaF93cSk7Ci0JcmVsYXlfY2xvc2UoZ3VjLT5sb2cucmVsYXlfY2hh bik7CisJZGVzdHJveV93b3JrcXVldWUoZ3VjLT5sb2cucnVudGltZS5mbHVzaF93cSk7CisJcmVs YXlfY2xvc2UoZ3VjLT5sb2cucnVudGltZS5yZWxheV9jaGFuKTsKIAlpOTE1X2dlbV9vYmplY3Rf dW5waW5fbWFwKGd1Yy0+bG9nLnZtYS0+b2JqKTsKLQlndWMtPmxvZy5idWZfYWRkciA9IE5VTEw7 CisJZ3VjLT5sb2cucnVudGltZS5idWZfYWRkciA9IE5VTEw7CiB9CiAKIHN0YXRpYyBpbnQgZ3Vj X2xvZ19sYXRlX3NldHVwKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKQEAgLTQ1NiwyNCArNDU2LDI0 IEBAIHN0YXRpYyBpbnQgZ3VjX2xvZ19sYXRlX3NldHVwKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykK IAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAot CWlmICghZ3VjX2xvZ19oYXNfZXh0cmFzKGd1YykpIHsKKwlpZiAoIWd1Y19sb2dfaGFzX3J1bnRp bWUoZ3VjKSkgewogCQkvKiBJZiBsb2dfbGV2ZWwgd2FzIHNldCBhcyAtMSBhdCBib290IHRpbWUs IHRoZW4gc2V0dXAgbmVlZGVkIHRvCiAJCSAqIGhhbmRsZSBsb2cgYnVmZmVyIGZsdXNoIGludGVy cnVwdHMgd291bGQgbm90IGhhdmUgYmVlbiBkb25lIHlldCwKIAkJICogc28gZG8gdGhhdCBub3cu CiAJCSAqLwotCQlyZXQgPSBndWNfbG9nX2NyZWF0ZV9leHRyYXMoZ3VjKTsKKwkJcmV0ID0gZ3Vj X2xvZ19ydW50aW1lX2NyZWF0ZShndWMpOwogCQlpZiAocmV0KQogCQkJZ290byBlcnI7CiAJfQog CiAJcmV0ID0gZ3VjX2xvZ19yZWxheV9maWxlX2NyZWF0ZShndWMpOwogCWlmIChyZXQpCi0JCWdv dG8gZXJyX2V4dHJhczsKKwkJZ290byBlcnJfcnVudGltZTsKIAogCXJldHVybiAwOwogCi1lcnJf ZXh0cmFzOgotCWd1Y19sb2dfZGVzdHJveV9leHRyYXMoZ3VjKTsKK2Vycl9ydW50aW1lOgorCWd1 Y19sb2dfcnVudGltZV9kZXN0cm95KGd1Yyk7CiBlcnI6CiAJLyogbG9nZ2luZyB3aWxsIHJlbWFp biBvZmYgKi8KIAlpOTE1Lmd1Y19sb2dfbGV2ZWwgPSAtMTsKQEAgLTUwNyw3ICs1MDcsNyBAQCBz dGF0aWMgdm9pZCBndWNfZmx1c2hfbG9ncyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJLyogQmVm b3JlIGluaXRpYXRpbmcgdGhlIGZvcmNlZnVsIGZsdXNoLCB3YWl0IGZvciBhbnkgcGVuZGluZy9v bmdvaW5nCiAJICogZmx1c2ggdG8gY29tcGxldGUgb3RoZXJ3aXNlIGZvcmNlZnVsIGZsdXNoIG1h eSBub3QgYWN0dWFsbHkgaGFwcGVuLgogCSAqLwotCWZsdXNoX3dvcmsoJmd1Yy0+bG9nLmZsdXNo X3dvcmspOworCWZsdXNoX3dvcmsoJmd1Yy0+bG9nLnJ1bnRpbWUuZmx1c2hfd29yayk7CiAKIAkv KiBBc2sgR3VDIHRvIHVwZGF0ZSB0aGUgbG9nIGJ1ZmZlciBzdGF0ZSAqLwogCWd1Y19sb2dfZmx1 c2goZ3VjKTsKQEAgLTU1Miw3ICs1NTIsNyBAQCBpbnQgaW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogCWd1Yy0+bG9nLnZtYSA9IHZtYTsKIAogCWlmIChpOTE1Lmd1 Y19sb2dfbGV2ZWwgPj0gMCkgewotCQlyZXQgPSBndWNfbG9nX2NyZWF0ZV9leHRyYXMoZ3VjKTsK KwkJcmV0ID0gZ3VjX2xvZ19ydW50aW1lX2NyZWF0ZShndWMpOwogCQlpZiAocmV0IDwgMCkKIAkJ CWdvdG8gZXJyX3ZtYTsKIAl9CkBAIC01NzgsNyArNTc4LDcgQEAgaW50IGludGVsX2d1Y19sb2df Y3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAogdm9pZCBpbnRlbF9ndWNfbG9nX2Rlc3Ry b3koc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewotCWd1Y19sb2dfZGVzdHJveV9leHRyYXMoZ3Vj KTsKKwlndWNfbG9nX3J1bnRpbWVfZGVzdHJveShndWMpOwogCWk5MTVfdm1hX3VucGluX2FuZF9y ZWxlYXNlKCZndWMtPmxvZy52bWEpOwogfQogCkBAIC02NTMsNiArNjUzLDYgQEAgdm9pZCBpOTE1 X2d1Y19sb2dfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ bXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCS8qIEd1QyBsb2dnaW5n IGlzIGN1cnJlbnRseSB0aGUgb25seSB1c2VyIG9mIEd1YzJIb3N0IGludGVycnVwdHMgKi8KIAln ZW45X2Rpc2FibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwotCWd1Y19sb2dfZGVzdHJveV9l eHRyYXMoJmRldl9wcml2LT5ndWMpOworCWd1Y19sb2dfcnVudGltZV9kZXN0cm95KCZkZXZfcHJp di0+Z3VjKTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IGViMzBlN2EuLmM2Zjg4MGMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuaApAQCAtMTMyLDExICsxMzIsMTMgQEAgc3RydWN0IGludGVsX3VjX2Z3IHsK IHN0cnVjdCBpbnRlbF9ndWNfbG9nIHsKIAl1aW50MzJfdCBmbGFnczsKIAlzdHJ1Y3QgaTkxNV92 bWEgKnZtYTsKLQl2b2lkICpidWZfYWRkcjsKLQlzdHJ1Y3Qgd29ya3F1ZXVlX3N0cnVjdCAqZmx1 c2hfd3E7Ci0Jc3RydWN0IHdvcmtfc3RydWN0IGZsdXNoX3dvcms7Ci0Jc3RydWN0IHJjaGFuICpy ZWxheV9jaGFuOwotCisJLyogVGhlIHJ1bnRpbWUgc3R1ZmYgZ2V0cyBjcmVhdGVkIG9ubHkgd2hl biBHdUMgbG9nZ2luZyBnZXRzIGVuYWJsZWQgKi8KKwlzdHJ1Y3QgeworCQl2b2lkICpidWZfYWRk cjsKKwkJc3RydWN0IHdvcmtxdWV1ZV9zdHJ1Y3QgKmZsdXNoX3dxOworCQlzdHJ1Y3Qgd29ya19z dHJ1Y3QgZmx1c2hfd29yazsKKwkJc3RydWN0IHJjaGFuICpyZWxheV9jaGFuOworCX0gcnVudGlt ZTsKIAkvKiBsb2dnaW5nIHJlbGF0ZWQgc3RhdHMgKi8KIAl1MzIgY2FwdHVyZV9taXNzX2NvdW50 OwogCXUzMiBmbHVzaF9pbnRlcnJ1cHRfY291bnQ7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==