From: Jackie Li Subject: [PATCH v8 2/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Mon, 5 Feb 2018 16:02:38 -0800 Message-ID: <1517875362-12755-2-git-send-email-yaodong.li@intel.com> References: <1517875362-12755-1-git-send-email-yaodong.li@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 19E726E388 for ; Tue, 6 Feb 2018 00:04:20 +0000 (UTC) In-Reply-To: <1517875362-12755-1-git-send-email-yaodong.li@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 R3VDIHJlbGF0ZWQgZXhwb3J0ZWQgZnVuY3Rpb25zIHNob3VsZCBzdGFydCB3aXRoICJpbnRlbF9n dWNfIiBwcmVmaXggYW5kCnBhc3MgaW50ZWxfZ3VjIGFzIHRoZSBmaXJzdCBwYXJhbWV0ZXIgc2lu Y2UgaXRzIGd1YyByZWxhdGVkLiBDdXJyZW50Cmd1Y19nZ3R0X29mZnNldCgpIGZhaWxlZCB0byBm b2xsb3cgdGhpcyBjb2RlIGNvbnZlbnRpb24gYW5kIHRoaXMgaXMgYQpwcm9ibGVtIGZvciBmdXR1 cmUgcGF0Y2hlcyB0aGF0IG5lZWRzIHRvIGFjY2VzcyBpbnRlbF9ndWMgZGF0YSB0byB2ZXJpZnkK dGhlIEdHVFQgb2Zmc2V0IGFnYWluc3QgdGhlIEd1QyBXT1BDTSB0b3AuCgpUaGlzIHBhdGNoIHJl bmFtZXMgdGhlIGd1Y19nZ3R0X29mZnNldCB0byBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQgYW5kIHVw ZGF0ZXMKdGhlIHJlbGF0ZWQgY29kZSB0byBwYXNzIGludGVsX2d1YyBwb2ludGVyIHRvIHRoaXMg ZnVuY3Rpb24gY2FsbCwgc28gdGhhdAp3ZSBjYW4gaGF2ZSBhIHVuaWZpZWQgY29kaW5nIHN0eWxl IGZvciBHdUMgY29kZSBhbmQgYWxzbyBlbmFibGUgdGhlIGZ1dHVyZQpwYXRjaGVzIHRvIGdldCBH dUMgcmVsYXRlZCBkYXRhIGZyb20gaW50ZWxfZ3VjIHRvIGRvIHRoZSBvZmZzZXQKdmVyaWZpY2F0 aW9uLiBNZWFud2hpbGUsIHRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgR1VDX0dHVFRfVE9QIGZy b20KaW50ZWxfZ3VjX3JlZ3MuaCB0byBpbnRlbF9ndWMuaCBzaW5jZSBpdCBpcyBub3QgR3VDIHJl Z2lzdGVyIHJlbGF0ZWQKZGVmaW5pdGlvbi4KCnY4OgogLSBGaXhlZCBjb2Rpbmcgc3R5bGUgaXNz dWVzIGFuZCBtb3ZlZCBHVUNfR0dUVF9UT1AgdG8gaW50ZWxfZ3VjLmggKFNhZ2FyKQogLSBVcGRh dGVkIGNvbW1pdCBtZXNzYWdlIHRvIGV4cGxhaW4gdG8gcmVhc29uIGFuZCBtb3RpdmF0aW9uIHRv IGFkZAogICBpbnRlbF9ndWMgYXMgdGhlIGZpcnN0IHBhcmFtZXRlciBvZiBpbnRlbF9ndWNfZ2d0 dF9vZmZzZXQgKENocmlzKQoKQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29A aW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNv bT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSm9vbmFz IExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBKYWNraWUgTGkgPHlhb2RvbmcubGlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Yy5jICAgICAgICAgICAgfCAxMiArKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICAgfCAxNCArKysrKysrKysrKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Fkcy5jICAgICAgICB8IDI1ICsrKysrKysrKysr KystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19jdC5jICAgICAg ICAgfCAgNSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgICAgICAg ICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMgICAgICAgIHwg IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19yZWcuaCAgICAgICAgfCAgMyAt LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgfCAxMCArKysr Ky0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyAgICAgICAgICAgIHwgIDYg KysrKy0tCiA5IGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKaW5kZXggOWY0NWU2ZC4uZDliYzJhOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjLmMKQEAgLTI2OSw4ICsyNjksMTAgQEAgdm9pZCBpbnRlbF9ndWNf aW5pdF9wYXJhbXMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCiAJLyogSWYgR3VDIHN1Ym1pc3Np b24gaXMgZW5hYmxlZCwgc2V0IHVwIGFkZGl0aW9uYWwgcGFyYW1ldGVycyBoZXJlICovCiAJaWYg KFVTRVNfR1VDX1NVQk1JU1NJT04oZGV2X3ByaXYpKSB7Ci0JCXUzMiBhZHMgPSBndWNfZ2d0dF9v ZmZzZXQoZ3VjLT5hZHNfdm1hKSA+PiBQQUdFX1NISUZUOwotCQl1MzIgcGdzID0gZ3VjX2dndHRf b2Zmc2V0KGRldl9wcml2LT5ndWMuc3RhZ2VfZGVzY19wb29sKTsKKwkJdTMyIGFkcyA9IGludGVs X2d1Y19nZ3R0X29mZnNldChndWMsCisJCQkJCQlndWMtPmFkc192bWEpID4+IFBBR0VfU0hJRlQ7 CisJCXUzMiBwZ3MgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLAorCQkJCQkJZGV2X3ByaXYt Pmd1Yy5zdGFnZV9kZXNjX3Bvb2wpOwogCQl1MzIgY3R4X2luXzE2ID0gR1VDX01BWF9TVEFHRV9E RVNDUklQVE9SUyAvIDE2OwogCiAJCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSB8PSBhZHMgPDwgR1VD X0FEU19BRERSX1NISUZUOwpAQCAtNDE4LDcgKzQyMCw3IEBAIGludCBpbnRlbF9ndWNfc3VzcGVu ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGF0YVswXSA9IElOVEVMX0dV Q19BQ1RJT05fRU5URVJfU19TVEFURTsKIAkvKiBhbnkgdmFsdWUgZ3JlYXRlciB0aGFuIEdVQ19Q T1dFUl9EMCAqLwogCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDE7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0 X29mZnNldChndWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zm c2V0KGd1YywgZ3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3Vj LCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTQ0MSw3ICs0NDMsNyBAQCBpbnQgaW50 ZWxfZ3VjX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJZGF0YVszXSA9IDA7 CiAJZGF0YVs0XSA9IDA7CiAJZGF0YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnN0YWdlX2lk OwotCWRhdGFbNl0gPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVs2 XSA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0 dXJuIGludGVsX2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CkBAIC00 NjMsNyArNDY1LDcgQEAgaW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiAJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRVhJVF9TX1NUQVRF OwogCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDA7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChn dWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Z3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBB UlJBWV9TSVpFKGRhdGEpKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggOWUwYTk3 ZS4uNTBiZTZkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTEwMSwxMyArMTAxLDIz IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9ndWNfbm90aWZ5KHN0cnVjdCBpbnRlbF9ndWMg Kmd1YykKIAlndWMtPm5vdGlmeShndWMpOwogfQogCi0vKgorLyogR3VDIGFkZHJlc3NlcyBhYm92 ZSBHVUNfR0dUVF9UT1AgYWxzbyBkb24ndCBtYXAgdGhyb3VnaCB0aGUgR1RUICovCisjZGVmaW5l IEdVQ19HR1RUX1RPUAkweEZFRTAwMDAwCisKKy8qKgorICogaW50ZWxfZ3VjX2dndHRfb2Zmc2V0 KCkgLSBHZXQgYW5kIHZhbGlkYXRlIHRoZSBHR1RUIG9mZnNldCBvZiBAdm1hCisgKiBAZ3VjOiBp bnRlbCBndWMuCisgKiBAdm1hOiBpOTE1IGdyYXBoaWNzIHZpcnR1YWwgbWVtb3J5IGFyZWEuCisg KgogICogR3VDIGRvZXMgbm90IGFsbG93IGFueSBnZnggR0dUVCBhZGRyZXNzIHRoYXQgZmFsbHMg aW50byByYW5nZSBbMCwgV09QQ01fVE9QKSwKICAqIHdoaWNoIGlzIHJlc2VydmVkIGZvciBCb290 IFJPTSwgU1JBTSBhbmQgV09QQ00uIEN1cnJlbnRseSB0aGlzIHRvcCBhZGRyZXNzIGlzCiAgKiA1 MTJLLiBJbiBvcmRlciB0byBleGNsdWRlIDAtNTEySyBhZGRyZXNzIHNwYWNlIGZyb20gR0dUVCwg YWxsIGdmeCBvYmplY3RzCiAgKiB1c2VkIGJ5IEd1QyBpcyBwaW5uZWQgd2l0aCBQSU5fT0ZGU0VU X0JJQVMgYWxvbmcgd2l0aCBzaXplIG9mIFdPUENNLgorICoKKyAqIFJldHVybjogR0dUVCBvZmZz ZXQgdGhhdCBtZWV0cyB0aGUgR3VDIGdmeCBhZGRyZXNzIHJlcXVpcmVtZW50LgogICovCi1zdGF0 aWMgaW5saW5lIHUzMiBndWNfZ2d0dF9vZmZzZXQoc3RydWN0IGk5MTVfdm1hICp2bWEpCitzdGF0 aWMgaW5saW5lIHUzMiBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoc3RydWN0IGludGVsX2d1YyAqZ3Vj LAorCQkJCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIHsKIAl1MzIgb2Zmc2V0ID0gaTkxNV9nZ3R0 X29mZnNldCh2bWEpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfYWRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRzLmMKaW5kZXggYWM2 Mjc1My4uNzIxNTU5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2Fkcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19hZHMuYwpAQCAtMTEz LDE3ICsxMTMsNiBAQCBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAq Z3VjKQogCQlibG9iLT5yZWdfc3RhdGUud2hpdGVfbGlzdFtlbmdpbmUtPmd1Y19pZF0uY291bnQg PSAwOwogCX0KIAotCS8qCi0JICogVGhlIEd1QyByZXF1aXJlcyBhICJHb2xkZW4gQ29udGV4dCIg d2hlbiBpdCByZWluaXRpYWxpc2VzCi0JICogZW5naW5lcyBhZnRlciBhIHJlc2V0LiBIZXJlIHdl IHVzZSB0aGUgUmVuZGVyIHJpbmcgZGVmYXVsdAotCSAqIGNvbnRleHQsIHdoaWNoIG11c3QgYWxy ZWFkeSBleGlzdCBhbmQgYmUgcGlubmVkIGluIHRoZSBHR1RULAotCSAqIHNvIGl0cyBhZGRyZXNz IHdvbid0IGNoYW5nZSBhZnRlciB3ZSd2ZSB0b2xkIHRoZSBHdUMgd2hlcmUKLQkgKiB0byBmaW5k IGl0LiBOb3RlIHRoYXQgd2UgaGF2ZSB0byBza2lwIG91ciBoZWFkZXIgKDEgcGFnZSksCi0JICog YmVjYXVzZSBvdXIgR3VDIHNoYXJlZCBkYXRhIGlzIHRoZXJlLgotCSAqLwotCWJsb2ItPmFkcy5n b2xkZW5fY29udGV4dF9scmNhID0KLQkJZ3VjX2dndHRfb2Zmc2V0KGRldl9wcml2LT5rZXJuZWxf Y29udGV4dC0+ZW5naW5lW1JDU10uc3RhdGUpICsKLQkJc2tpcHBlZF9vZmZzZXQ7CiAKIAkvKgog CSAqIFRoZSBHdUMgZXhwZWN0cyB1cyB0byBleGNsdWRlIHRoZSBwb3J0aW9uIG9mIHRoZSBjb250 ZXh0IGltYWdlIHRoYXQKQEAgLTEzNSwxMSArMTI0LDIzIEBAIGludCBpbnRlbF9ndWNfYWRzX2Ny ZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCWJsb2ItPmFkcy5lbmdfc3RhdGVfc2l6ZVtl bmdpbmUtPmd1Y19pZF0gPQogCQkJZW5naW5lLT5jb250ZXh0X3NpemUgLSBza2lwcGVkX3NpemU7 CiAKLQliYXNlID0gZ3VjX2dndHRfb2Zmc2V0KHZtYSk7CisJYmFzZSA9IGludGVsX2d1Y19nZ3R0 X29mZnNldChndWMsIHZtYSk7CiAJYmxvYi0+YWRzLnNjaGVkdWxlcl9wb2xpY2llcyA9IGJhc2Ug KyBwdHJfb2Zmc2V0KGJsb2IsIHBvbGljaWVzKTsKIAlibG9iLT5hZHMucmVnX3N0YXRlX2J1ZmZl ciA9IGJhc2UgKyBwdHJfb2Zmc2V0KGJsb2IsIHJlZ19zdGF0ZV9idWZmZXIpOwogCWJsb2ItPmFk cy5yZWdfc3RhdGVfYWRkciA9IGJhc2UgKyBwdHJfb2Zmc2V0KGJsb2IsIHJlZ19zdGF0ZSk7CiAK KwkvKgorCSAqIFRoZSBHdUMgcmVxdWlyZXMgYSAiR29sZGVuIENvbnRleHQiIHdoZW4gaXQgcmVp bml0aWFsaXNlcworCSAqIGVuZ2luZXMgYWZ0ZXIgYSByZXNldC4gSGVyZSB3ZSB1c2UgdGhlIFJl bmRlciByaW5nIGRlZmF1bHQKKwkgKiBjb250ZXh0LCB3aGljaCBtdXN0IGFscmVhZHkgZXhpc3Qg YW5kIGJlIHBpbm5lZCBpbiB0aGUgR0dUVCwKKwkgKiBzbyBpdHMgYWRkcmVzcyB3b24ndCBjaGFu Z2UgYWZ0ZXIgd2UndmUgdG9sZCB0aGUgR3VDIHdoZXJlCisJICogdG8gZmluZCBpdC4gTm90ZSB0 aGF0IHdlIGhhdmUgdG8gc2tpcCBvdXIgaGVhZGVyICgxIHBhZ2UpLAorCSAqIGJlY2F1c2Ugb3Vy IEd1QyBzaGFyZWQgZGF0YSBpcyB0aGVyZS4KKwkgKi8KKwl2bWEgPSBkZXZfcHJpdi0+a2VybmVs X2NvbnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlOworCWJsb2ItPmFkcy5nb2xkZW5fY29udGV4dF9s cmNhID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSArCisJCXNraXBwZWRfb2Zmc2V0 OworCiAJa3VubWFwKHBhZ2UpOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19jdC5jCmluZGV4IDI0YWQ1NTcuLjBhMGQzZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19jdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19jdC5jCkBAIC0xNTYsNyArMTU2LDggQEAgc3RhdGljIGludCBjdGNoX2luaXQoc3RydWN0IGlu dGVsX2d1YyAqZ3VjLAogCQllcnIgPSBQVFJfRVJSKGJsb2IpOwogCQlnb3RvIGVycl92bWE7CiAJ fQotCURSTV9ERUJVR19EUklWRVIoIkNUOiB2bWEgYmFzZT0lI3hcbiIsIGd1Y19nZ3R0X29mZnNl dChjdGNoLT52bWEpKTsKKwlEUk1fREVCVUdfRFJJVkVSKCJDVDogdm1hIGJhc2U9JSN4XG4iLAor CQkJIGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGN0Y2gtPnZtYSkpOwogCiAJLyogc3RvcmUg cG9pbnRlcnMgdG8gZGVzYyBhbmQgY21kcyAqLwogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpF KGN0Y2gtPmN0YnMpOyBpKyspIHsKQEAgLTIwMiw3ICsyMDMsNyBAQCBzdGF0aWMgaW50IGN0Y2hf b3BlbihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJfQogCiAJLyogdm1hIHNob3VsZCBiZSBhbHJl YWR5IGFsbG9jYXRlZCBhbmQgbWFwJ2VkICovCi0JYmFzZSA9IGd1Y19nZ3R0X29mZnNldChjdGNo LT52bWEpOworCWJhc2UgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjdGNoLT52bWEpOwog CiAJLyogKHJlKWluaXRpYWxpemUgZGVzY3JpcHRvcnMKIAkgKiBjbWRzIGJ1ZmZlcnMgYXJlIGlu IHRoZSBzZWNvbmQgaGFsZiBvZiB0aGUgYmxvYiBwYWdlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19mdy5jCmluZGV4IDNiMDkzMjkuLjE3OGQzMzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19mdy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19mdy5jCkBAIC0xNjUsNyArMTY1LDcgQEAgc3RhdGljIGludCBndWNfeGZlcl91Y29kZShzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCUk5MTVfV1JJVEUoRE1B X0NPUFlfU0laRSwgZ3VjX2Z3LT5oZWFkZXJfc2l6ZSArIGd1Y19mdy0+dWNvZGVfc2l6ZSk7CiAK IAkvKiBTZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUgbmV3IGJsb2IgKi8KLQlvZmZzZXQg PSBndWNfZ2d0dF9vZmZzZXQodm1hKSArIGd1Y19mdy0+aGVhZGVyX29mZnNldDsKKwlvZmZzZXQg PSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpICsgZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0 OwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxvd2VyXzMyX2JpdHMob2Zmc2V0KSk7CiAJ STkxNV9XUklURShETUFfQUREUl8wX0hJR0gsIHVwcGVyXzMyX2JpdHMob2Zmc2V0KSAmIDB4RkZG Rik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwppbmRleCA3YjUwNzRlLi5lY2E4 NzI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCkBAIC02MzgsNyArNjM4LDcg QEAgaW50IGludGVsX2d1Y19sb2dfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJKEdV Q19MT0dfSVNSX1BBR0VTIDw8IEdVQ19MT0dfSVNSX1NISUZUKSB8CiAJCShHVUNfTE9HX0NSQVNI X1BBR0VTIDw8IEdVQ19MT0dfQ1JBU0hfU0hJRlQpOwogCi0Jb2Zmc2V0ID0gZ3VjX2dndHRfb2Zm c2V0KHZtYSkgPj4gUEFHRV9TSElGVDsgLyogaW4gcGFnZXMgKi8KKwlvZmZzZXQgPSBpbnRlbF9n dWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpID4+IFBBR0VfU0hJRlQ7IC8qIGluIHBhZ2VzICovCiAJ Z3VjLT5sb2cuZmxhZ3MgPSAob2Zmc2V0IDw8IEdVQ19MT0dfQlVGX0FERFJfU0hJRlQpIHwgZmxh Z3M7CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19yZWcuaAppbmRleCAx ZjUyZmI4Li5kZTRmNzhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3JlZy5oCkBAIC03 Niw5ICs3Niw2IEBACiAvKiBEZWZpbmVzIFdPUENNIHNwYWNlIGF2YWlsYWJsZSB0byBHdUMgZmly bXdhcmUgKi8KICNkZWZpbmUgR1VDX1dPUENNX1NJWkUJCQlfTU1JTygweGMwNTApCiAKLS8qIEd1 QyBhZGRyZXNzZXMgYWJvdmUgR1VDX0dHVFRfVE9QIGFsc28gZG9uJ3QgbWFwIHRocm91Z2ggdGhl IEdUVCAqLwotI2RlZmluZSBHVUNfR0dUVF9UT1AJCQkweEZFRTAwMDAwCi0KICNkZWZpbmUgR0VO OF9HVF9QTV9DT05GSUcJCV9NTUlPKDB4MTM4MTQwKQogI2RlZmluZSBHRU45TFBfR1RfUE1fQ09O RklHCQlfTU1JTygweDEzODE0MCkKICNkZWZpbmUgR0VOOV9HVF9QTV9DT05GSUcJCV9NTUlPKDB4 MTM4MTZjKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1p c3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKaW5k ZXggMWYzYTg3OC4uYzU2ZTRmNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf c3VibWlzc2lvbi5jCkBAIC0zNzUsOCArMzc1LDggQEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rl c2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWxyYy0+Y29udGV4dF9kZXNjID0gbG93 ZXJfMzJfYml0cyhjZS0+bHJjX2Rlc2MpOwogCiAJCS8qIFRoZSBzdGF0ZSBwYWdlIGlzIGFmdGVy IFBQSFdTUCAqLwotCQlscmMtPnJpbmdfbHJjYSA9Ci0JCQlndWNfZ2d0dF9vZmZzZXQoY2UtPnN0 YXRlKSArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKKwkJbHJjLT5yaW5nX2xyY2EgPSBpbnRl bF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+c3RhdGUpICsKKwkJCQkgTFJDX1NUQVRFX1BOICog UEFHRV9TSVpFOwogCiAJCS8qIFhYWDogSW4gZGlyZWN0IHN1Ym1pc3Npb24sIHRoZSBHdUMgd2Fu dHMgdGhlIEhXIGNvbnRleHQgaWQKIAkJICogaGVyZS4gSW4gcHJveHkgc3VibWlzc2lvbiwgaXQg d2FudHMgdGhlIHN0YWdlIGlkCkBAIC0zODQsNyArMzg0LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3N0 YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWxyYy0+Y29udGV4dF9pZCA9 IChjbGllbnQtPnN0YWdlX2lkIDw8IEdVQ19FTENfQ1RYSURfT0ZGU0VUKSB8CiAJCQkJKGd1Y19l bmdpbmVfaWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKIAotCQlscmMtPnJpbmdfYmVnaW4g PSBndWNfZ2d0dF9vZmZzZXQoY2UtPnJpbmctPnZtYSk7CisJCWxyYy0+cmluZ19iZWdpbiA9IGlu dGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGNlLT5yaW5nLT52bWEpOwogCQlscmMtPnJpbmdfZW5k ID0gbHJjLT5yaW5nX2JlZ2luICsgY2UtPnJpbmctPnNpemUgLSAxOwogCQlscmMtPnJpbmdfbmV4 dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5nX2JlZ2luOwogCQlscmMtPnJpbmdfY3VycmVudF90 YWlsX3BvaW50ZXJfdmFsdWUgPSAwOwpAQCAtNDAwLDcgKzQwMCw3IEBAIHN0YXRpYyB2b2lkIGd1 Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCSAqIFRoZSBkb29yYmVs bCwgcHJvY2VzcyBkZXNjcmlwdG9yLCBhbmQgd29ya3F1ZXVlIGFyZSBhbGwgcGFydHMKIAkgKiBv ZiB0aGUgY2xpZW50IG9iamVjdCwgd2hpY2ggdGhlIEd1QyB3aWxsIHJlZmVyZW5jZSB2aWEgdGhl IEdHVFQKIAkgKi8KLQlnZnhfYWRkciA9IGd1Y19nZ3R0X29mZnNldChjbGllbnQtPnZtYSk7CisJ Z2Z4X2FkZHIgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjbGllbnQtPnZtYSk7CiAJZGVz Yy0+ZGJfdHJpZ2dlcl9waHkgPSBzZ19kbWFfYWRkcmVzcyhjbGllbnQtPnZtYS0+cGFnZXMtPnNn bCkgKwogCQkJCWNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0OwogCWRlc2MtPmRiX3RyaWdnZXJfY3B1 ID0gcHRyX3RvX3U2NChfX2dldF9kb29yYmVsbChjbGllbnQpKTsKQEAgLTU5Niw3ICs1OTYsNyBA QCBzdGF0aWMgdm9pZCBpbmplY3RfcHJlZW1wdF9jb250ZXh0KHN0cnVjdCB3b3JrX3N0cnVjdCAq d29yaykKIAlkYXRhWzNdID0gZW5naW5lLT5ndWNfaWQ7CiAJZGF0YVs0XSA9IGd1Yy0+ZXhlY2J1 Zl9jbGllbnQtPnByaW9yaXR5OwogCWRhdGFbNV0gPSBndWMtPmV4ZWNidWZfY2xpZW50LT5zdGFn ZV9pZDsKLQlkYXRhWzZdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRh dGFbNl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAog CWlmIChXQVJOX09OKGludGVsX2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSkp KSB7CiAJCWV4ZWNsaXN0c19jbGVhcl9hY3RpdmUoJmVuZ2luZS0+ZXhlY2xpc3RzLApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9odWMuYwppbmRleCA4ZWQwNTE4Li5hZWQ5YzFjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9odWMuYwpAQCAtMTM3LDcgKzEzNyw4IEBAIHN0YXRpYyBpbnQgaHVjX3Vjb2RlX3hmZXIo c3RydWN0IGludGVsX3VjX2Z3ICpodWNfZncsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWludGVs X3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAogCS8qIFNl dCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSB1Q29kZSAqLwotCW9mZnNldCA9IGd1Y19nZ3R0 X29mZnNldCh2bWEpICsgaHVjX2Z3LT5oZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1 Y19nZ3R0X29mZnNldCgmZGV2X3ByaXYtPmd1Yywgdm1hKSArCisJCSBodWNfZnctPmhlYWRlcl9v ZmZzZXQ7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQp KTsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYg MHhGRkZGKTsKIApAQCAtMjEzLDcgKzIxNCw4IEBAIGludCBpbnRlbF9odWNfYXV0aChzdHJ1Y3Qg aW50ZWxfaHVjICpodWMpCiAJfQogCiAJcmV0ID0gaW50ZWxfZ3VjX2F1dGhfaHVjKGd1YywKLQkJ CQkgZ3VjX2dndHRfb2Zmc2V0KHZtYSkgKyBodWMtPmZ3LnJzYV9vZmZzZXQpOworCQkJCSBpbnRl bF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpICsKKwkJCQkgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsK IAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiSHVDOiBHdUMgZGlkIG5vdCBhY2sgQXV0aCByZXF1 ZXN0ICVkXG4iLCByZXQpOwogCQlnb3RvIG91dDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK