From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jackie Li <yaodong.li@intel.com>
Subject: [PATCH v9 2/7] drm/i915/guc: Rename guc_ggtt_offset to
 intel_guc_ggtt_offset
Date: Thu,  8 Feb 2018 15:03:50 -0800
Message-ID: <1518131035-24108-2-git-send-email-yaodong.li@intel.com>
References: <1518131035-24108-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga17.intel.com (mga17.intel.com [192.55.52.151])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0B3686E452
 for <intel-gfx@lists.freedesktop.org>; Thu,  8 Feb 2018 23:05:29 +0000 (UTC)
In-Reply-To: <1518131035-24108-1-git-send-email-yaodong.li@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
dF9vZmZzZXQgKENocmlzKQoKdjk6CiAtIEZpeGVkIGNvZGUgYWxpZ25tZW50IGlzc3VlIGR1ZSB0
byBsaW5lIGJyZWFrIChDaHJpcykKCkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVj
emtvQGludGVsLmNvbT4KQ2M6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRl
bC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpv
b25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQt
Ynk6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ICh2OCkKU2ln
bmVkLW9mZi1ieTogSmFja2llIExpIDx5YW9kb25nLmxpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYyAgICAgICAgICAgIHwgMTIgKysrKysrKy0tLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgIHwgMTQgKysrKysrKysr
KysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19hZHMuYyAgICAgICAgfCAyNSAr
KysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf
Y3QuYyAgICAgICAgIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19m
dy5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5j
ICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVnLmggICAg
ICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5j
IHwgMTAgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAgICAg
ICAgICB8ICA2ICsrKystLQogOSBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAzMyBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IDlmNDVlNmQuLmQ5YmMy
YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC0yNjksOCArMjY5LDEwIEBAIHZvaWQg
aW50ZWxfZ3VjX2luaXRfcGFyYW1zKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAogCS8qIElmIEd1
QyBzdWJtaXNzaW9uIGlzIGVuYWJsZWQsIHNldCB1cCBhZGRpdGlvbmFsIHBhcmFtZXRlcnMgaGVy
ZSAqLwogCWlmIChVU0VTX0dVQ19TVUJNSVNTSU9OKGRldl9wcml2KSkgewotCQl1MzIgYWRzID0g
Z3VjX2dndHRfb2Zmc2V0KGd1Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsKLQkJdTMyIHBncyA9
IGd1Y19nZ3R0X29mZnNldChkZXZfcHJpdi0+Z3VjLnN0YWdlX2Rlc2NfcG9vbCk7CisJCXUzMiBh
ZHMgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLAorCQkJCQkJZ3VjLT5hZHNfdm1hKSA+PiBQ
QUdFX1NISUZUOworCQl1MzIgcGdzID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywKKwkJCQkJ
CWRldl9wcml2LT5ndWMuc3RhZ2VfZGVzY19wb29sKTsKIAkJdTMyIGN0eF9pbl8xNiA9IEdVQ19N
QVhfU1RBR0VfREVTQ1JJUFRPUlMgLyAxNjsKIAogCQlwYXJhbXNbR1VDX0NUTF9ERUJVR10gfD0g
YWRzIDw8IEdVQ19BRFNfQUREUl9TSElGVDsKQEAgLTQxOCw3ICs0MjAsNyBAQCBpbnQgaW50ZWxf
Z3VjX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWRhdGFbMF0g
PSBJTlRFTF9HVUNfQUNUSU9OX0VOVEVSX1NfU1RBVEU7CiAJLyogYW55IHZhbHVlIGdyZWF0ZXIg
dGhhbiBHVUNfUE9XRVJfRDAgKi8KIAlkYXRhWzFdID0gR1VDX1BPV0VSX0QxOwotCWRhdGFbMl0g
PSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVsyXSA9IGludGVsX2d1
Y19nZ3R0X29mZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVsX2d1
Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CkBAIC00NDEsNyArNDQzLDcg
QEAgaW50IGludGVsX2d1Y19yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCWRh
dGFbM10gPSAwOwogCWRhdGFbNF0gPSAwOwogCWRhdGFbNV0gPSBndWMtPmV4ZWNidWZfY2xpZW50
LT5zdGFnZV9pZDsKLQlkYXRhWzZdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEp
OworCWRhdGFbNl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRh
KTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkp
OwogfQpAQCAtNDYzLDcgKzQ2NSw3IEBAIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWRhdGFbMF0gPSBJTlRFTF9HVUNfQUNUSU9OX0VY
SVRfU19TVEFURTsKIAlkYXRhWzFdID0gR1VDX1BPV0VSX0QwOwotCWRhdGFbMl0gPSBndWNfZ2d0
dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVsyXSA9IGludGVsX2d1Y19nZ3R0X29m
ZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVsX2d1Y19zZW5kKGd1
YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmlu
ZGV4IDllMGE5N2UuLjUwYmU2ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xMDEs
MTMgKzEwMSwyMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfZ3VjX25vdGlmeShzdHJ1Y3Qg
aW50ZWxfZ3VjICpndWMpCiAJZ3VjLT5ub3RpZnkoZ3VjKTsKIH0KIAotLyoKKy8qIEd1QyBhZGRy
ZXNzZXMgYWJvdmUgR1VDX0dHVFRfVE9QIGFsc28gZG9uJ3QgbWFwIHRocm91Z2ggdGhlIEdUVCAq
LworI2RlZmluZSBHVUNfR0dUVF9UT1AJMHhGRUUwMDAwMAorCisvKioKKyAqIGludGVsX2d1Y19n
Z3R0X29mZnNldCgpIC0gR2V0IGFuZCB2YWxpZGF0ZSB0aGUgR0dUVCBvZmZzZXQgb2YgQHZtYQor
ICogQGd1YzogaW50ZWwgZ3VjLgorICogQHZtYTogaTkxNSBncmFwaGljcyB2aXJ0dWFsIG1lbW9y
eSBhcmVhLgorICoKICAqIEd1QyBkb2VzIG5vdCBhbGxvdyBhbnkgZ2Z4IEdHVFQgYWRkcmVzcyB0
aGF0IGZhbGxzIGludG8gcmFuZ2UgWzAsIFdPUENNX1RPUCksCiAgKiB3aGljaCBpcyByZXNlcnZl
ZCBmb3IgQm9vdCBST00sIFNSQU0gYW5kIFdPUENNLiBDdXJyZW50bHkgdGhpcyB0b3AgYWRkcmVz
cyBpcwogICogNTEySy4gSW4gb3JkZXIgdG8gZXhjbHVkZSAwLTUxMksgYWRkcmVzcyBzcGFjZSBm
cm9tIEdHVFQsIGFsbCBnZnggb2JqZWN0cwogICogdXNlZCBieSBHdUMgaXMgcGlubmVkIHdpdGgg
UElOX09GRlNFVF9CSUFTIGFsb25nIHdpdGggc2l6ZSBvZiBXT1BDTS4KKyAqCisgKiBSZXR1cm46
IEdHVFQgb2Zmc2V0IHRoYXQgbWVldHMgdGhlIEd1QyBnZnggYWRkcmVzcyByZXF1aXJlbWVudC4K
ICAqLwotc3RhdGljIGlubGluZSB1MzIgZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpOTE1X3ZtYSAq
dm1hKQorc3RhdGljIGlubGluZSB1MzIgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpbnRl
bF9ndWMgKmd1YywKKwkJCQkJc3RydWN0IGk5MTVfdm1hICp2bWEpCiB7CiAJdTMyIG9mZnNldCA9
IGk5MTVfZ2d0dF9vZmZzZXQodm1hKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZ3VjX2Fkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Fkcy5j
CmluZGV4IGFjNjI3NTMuLjJjZDJiYjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2d1Y19hZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRz
LmMKQEAgLTExMywxNyArMTEzLDYgQEAgaW50IGludGVsX2d1Y19hZHNfY3JlYXRlKHN0cnVjdCBp
bnRlbF9ndWMgKmd1YykKIAkJYmxvYi0+cmVnX3N0YXRlLndoaXRlX2xpc3RbZW5naW5lLT5ndWNf
aWRdLmNvdW50ID0gMDsKIAl9CiAKLQkvKgotCSAqIFRoZSBHdUMgcmVxdWlyZXMgYSAiR29sZGVu
IENvbnRleHQiIHdoZW4gaXQgcmVpbml0aWFsaXNlcwotCSAqIGVuZ2luZXMgYWZ0ZXIgYSByZXNl
dC4gSGVyZSB3ZSB1c2UgdGhlIFJlbmRlciByaW5nIGRlZmF1bHQKLQkgKiBjb250ZXh0LCB3aGlj
aCBtdXN0IGFscmVhZHkgZXhpc3QgYW5kIGJlIHBpbm5lZCBpbiB0aGUgR0dUVCwKLQkgKiBzbyBp
dHMgYWRkcmVzcyB3b24ndCBjaGFuZ2UgYWZ0ZXIgd2UndmUgdG9sZCB0aGUgR3VDIHdoZXJlCi0J
ICogdG8gZmluZCBpdC4gTm90ZSB0aGF0IHdlIGhhdmUgdG8gc2tpcCBvdXIgaGVhZGVyICgxIHBh
Z2UpLAotCSAqIGJlY2F1c2Ugb3VyIEd1QyBzaGFyZWQgZGF0YSBpcyB0aGVyZS4KLQkgKi8KLQli
bG9iLT5hZHMuZ29sZGVuX2NvbnRleHRfbHJjYSA9Ci0JCWd1Y19nZ3R0X29mZnNldChkZXZfcHJp
di0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlKSArCi0JCXNraXBwZWRfb2Zmc2V0
OwogCiAJLyoKIAkgKiBUaGUgR3VDIGV4cGVjdHMgdXMgdG8gZXhjbHVkZSB0aGUgcG9ydGlvbiBv
ZiB0aGUgY29udGV4dCBpbWFnZSB0aGF0CkBAIC0xMzUsMTEgKzEyNCwyMyBAQCBpbnQgaW50ZWxf
Z3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlibG9iLT5hZHMuZW5nX3N0
YXRlX3NpemVbZW5naW5lLT5ndWNfaWRdID0KIAkJCWVuZ2luZS0+Y29udGV4dF9zaXplIC0gc2tp
cHBlZF9zaXplOwogCi0JYmFzZSA9IGd1Y19nZ3R0X29mZnNldCh2bWEpOworCWJhc2UgPSBpbnRl
bF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpOwogCWJsb2ItPmFkcy5zY2hlZHVsZXJfcG9saWNp
ZXMgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCBwb2xpY2llcyk7CiAJYmxvYi0+YWRzLnJlZ19z
dGF0ZV9idWZmZXIgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCByZWdfc3RhdGVfYnVmZmVyKTsK
IAlibG9iLT5hZHMucmVnX3N0YXRlX2FkZHIgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCByZWdf
c3RhdGUpOwogCisJLyoKKwkgKiBUaGUgR3VDIHJlcXVpcmVzIGEgIkdvbGRlbiBDb250ZXh0IiB3
aGVuIGl0IHJlaW5pdGlhbGlzZXMKKwkgKiBlbmdpbmVzIGFmdGVyIGEgcmVzZXQuIEhlcmUgd2Ug
dXNlIHRoZSBSZW5kZXIgcmluZyBkZWZhdWx0CisJICogY29udGV4dCwgd2hpY2ggbXVzdCBhbHJl
YWR5IGV4aXN0IGFuZCBiZSBwaW5uZWQgaW4gdGhlIEdHVFQsCisJICogc28gaXRzIGFkZHJlc3Mg
d29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQgdGhlIEd1QyB3aGVyZQorCSAqIHRvIGZpbmQg
aXQuIE5vdGUgdGhhdCB3ZSBoYXZlIHRvIHNraXAgb3VyIGhlYWRlciAoMSBwYWdlKSwKKwkgKiBi
ZWNhdXNlIG91ciBHdUMgc2hhcmVkIGRhdGEgaXMgdGhlcmUuCisJICovCisJdm1hID0gZGV2X3By
aXYtPmtlcm5lbF9jb250ZXh0LT5lbmdpbmVbUkNTXS5zdGF0ZTsKKwlibG9iLT5hZHMuZ29sZGVu
X2NvbnRleHRfbHJjYSA9CisJCWludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBza2lw
cGVkX29mZnNldDsKKwogCWt1bm1hcChwYWdlKTsKIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWNfY3QuYwppbmRleCAyNGFkNTU3Li4wYTBkM2Q1IDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWNfY3QuYwpAQCAtMTU2LDcgKzE1Niw4IEBAIHN0YXRpYyBpbnQgY3RjaF9pbml0
KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJZXJyID0gUFRSX0VSUihibG9iKTsKIAkJZ290byBl
cnJfdm1hOwogCX0KLQlEUk1fREVCVUdfRFJJVkVSKCJDVDogdm1hIGJhc2U9JSN4XG4iLCBndWNf
Z2d0dF9vZmZzZXQoY3RjaC0+dm1hKSk7CisJRFJNX0RFQlVHX0RSSVZFUigiQ1Q6IHZtYSBiYXNl
PSUjeFxuIiwKKwkJCSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjdGNoLT52bWEpKTsKIAog
CS8qIHN0b3JlIHBvaW50ZXJzIHRvIGRlc2MgYW5kIGNtZHMgKi8KIAlmb3IgKGkgPSAwOyBpIDwg
QVJSQVlfU0laRShjdGNoLT5jdGJzKTsgaSsrKSB7CkBAIC0yMDIsNyArMjAzLDcgQEAgc3RhdGlj
IGludCBjdGNoX29wZW4oc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCX0KIAogCS8qIHZtYSBzaG91
bGQgYmUgYWxyZWFkeSBhbGxvY2F0ZWQgYW5kIG1hcCdlZCAqLwotCWJhc2UgPSBndWNfZ2d0dF9v
ZmZzZXQoY3RjaC0+dm1hKTsKKwliYXNlID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY3Rj
aC0+dm1hKTsKIAogCS8qIChyZSlpbml0aWFsaXplIGRlc2NyaXB0b3JzCiAJICogY21kcyBidWZm
ZXJzIGFyZSBpbiB0aGUgc2Vjb25kIGhhbGYgb2YgdGhlIGJsb2IgcGFnZQpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWNfZncuYwppbmRleCAzYjA5MzI5Li4xNzhkMzM5IDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWNfZncuYwpAQCAtMTY1LDcgKzE2NSw3IEBAIHN0YXRpYyBpbnQgZ3VjX3hmZXJf
dWNvZGUoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAlJOTE1
X1dSSVRFKERNQV9DT1BZX1NJWkUsIGd1Y19mdy0+aGVhZGVyX3NpemUgKyBndWNfZnctPnVjb2Rl
X3NpemUpOwogCiAJLyogU2V0IHRoZSBzb3VyY2UgYWRkcmVzcyBmb3IgdGhlIG5ldyBibG9iICov
Ci0Jb2Zmc2V0ID0gZ3VjX2dndHRfb2Zmc2V0KHZtYSkgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7
CisJb2Zmc2V0ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSArIGd1Y19mdy0+aGVh
ZGVyX29mZnNldDsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfTE9XLCBsb3dlcl8zMl9iaXRzKG9m
ZnNldCkpOwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9ISUdILCB1cHBlcl8zMl9iaXRzKG9mZnNl
dCkgJiAweEZGRkYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWNfbG9nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKaW5kZXggN2I1
MDc0ZS4uZWNhODcyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj
X2xvZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwpAQCAtNjM4
LDcgKzYzOCw3IEBAIGludCBpbnRlbF9ndWNfbG9nX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpn
dWMpCiAJCShHVUNfTE9HX0lTUl9QQUdFUyA8PCBHVUNfTE9HX0lTUl9TSElGVCkgfAogCQkoR1VD
X0xPR19DUkFTSF9QQUdFUyA8PCBHVUNfTE9HX0NSQVNIX1NISUZUKTsKIAotCW9mZnNldCA9IGd1
Y19nZ3R0X29mZnNldCh2bWEpID4+IFBBR0VfU0hJRlQ7IC8qIGluIHBhZ2VzICovCisJb2Zmc2V0
ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSA+PiBQQUdFX1NISUZUOyAvKiBpbiBw
YWdlcyAqLwogCWd1Yy0+bG9nLmZsYWdzID0gKG9mZnNldCA8PCBHVUNfTE9HX0JVRl9BRERSX1NI
SUZUKSB8IGZsYWdzOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ndWNfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVn
LmgKaW5kZXggMWY1MmZiOC4uZGU0Zjc4YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZ3VjX3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19y
ZWcuaApAQCAtNzYsOSArNzYsNiBAQAogLyogRGVmaW5lcyBXT1BDTSBzcGFjZSBhdmFpbGFibGUg
dG8gR3VDIGZpcm13YXJlICovCiAjZGVmaW5lIEdVQ19XT1BDTV9TSVpFCQkJX01NSU8oMHhjMDUw
KQogCi0vKiBHdUMgYWRkcmVzc2VzIGFib3ZlIEdVQ19HR1RUX1RPUCBhbHNvIGRvbid0IG1hcCB0
aHJvdWdoIHRoZSBHVFQgKi8KLSNkZWZpbmUgR1VDX0dHVFRfVE9QCQkJMHhGRUUwMDAwMAotCiAj
ZGVmaW5lIEdFTjhfR1RfUE1fQ09ORklHCQlfTU1JTygweDEzODE0MCkKICNkZWZpbmUgR0VOOUxQ
X0dUX1BNX0NPTkZJRwkJX01NSU8oMHgxMzgxNDApCiAjZGVmaW5lIEdFTjlfR1RfUE1fQ09ORklH
CQlfTU1JTygweDEzODE2YykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlz
c2lvbi5jCmluZGV4IGI0M2I1OGMuLmViZmNiOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMzc1LDggKzM3NSw4IEBAIHN0YXRpYyB2b2lkIGd1
Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlscmMtPmNvbnRleHRf
ZGVzYyA9IGxvd2VyXzMyX2JpdHMoY2UtPmxyY19kZXNjKTsKIAogCQkvKiBUaGUgc3RhdGUgcGFn
ZSBpcyBhZnRlciBQUEhXU1AgKi8KLQkJbHJjLT5yaW5nX2xyY2EgPQotCQkJZ3VjX2dndHRfb2Zm
c2V0KGNlLT5zdGF0ZSkgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CisJCWxyYy0+cmluZ19s
cmNhID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY2UtPnN0YXRlKSArCisJCQkJIExSQ19T
VEFURV9QTiAqIFBBR0VfU0laRTsKIAogCQkvKiBYWFg6IEluIGRpcmVjdCBzdWJtaXNzaW9uLCB0
aGUgR3VDIHdhbnRzIHRoZSBIVyBjb250ZXh0IGlkCiAJCSAqIGhlcmUuIEluIHByb3h5IHN1Ym1p
c3Npb24sIGl0IHdhbnRzIHRoZSBzdGFnZSBpZApAQCAtMzg0LDcgKzM4NCw3IEBAIHN0YXRpYyB2
b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlscmMtPmNv
bnRleHRfaWQgPSAoY2xpZW50LT5zdGFnZV9pZCA8PCBHVUNfRUxDX0NUWElEX09GRlNFVCkgfAog
CQkJCShndWNfZW5naW5lX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7CiAKLQkJbHJjLT5y
aW5nX2JlZ2luID0gZ3VjX2dndHRfb2Zmc2V0KGNlLT5yaW5nLT52bWEpOworCQlscmMtPnJpbmdf
YmVnaW4gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+cmluZy0+dm1hKTsKIAkJbHJj
LT5yaW5nX2VuZCA9IGxyYy0+cmluZ19iZWdpbiArIGNlLT5yaW5nLT5zaXplIC0gMTsKIAkJbHJj
LT5yaW5nX25leHRfZnJlZV9sb2NhdGlvbiA9IGxyYy0+cmluZ19iZWdpbjsKIAkJbHJjLT5yaW5n
X2N1cnJlbnRfdGFpbF9wb2ludGVyX3ZhbHVlID0gMDsKQEAgLTQwMCw3ICs0MDAsNyBAQCBzdGF0
aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkgKiBU
aGUgZG9vcmJlbGwsIHByb2Nlc3MgZGVzY3JpcHRvciwgYW5kIHdvcmtxdWV1ZSBhcmUgYWxsIHBh
cnRzCiAJICogb2YgdGhlIGNsaWVudCBvYmplY3QsIHdoaWNoIHRoZSBHdUMgd2lsbCByZWZlcmVu
Y2UgdmlhIHRoZSBHR1RUCiAJICovCi0JZ2Z4X2FkZHIgPSBndWNfZ2d0dF9vZmZzZXQoY2xpZW50
LT52bWEpOworCWdmeF9hZGRyID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY2xpZW50LT52
bWEpOwogCWRlc2MtPmRiX3RyaWdnZXJfcGh5ID0gc2dfZG1hX2FkZHJlc3MoY2xpZW50LT52bWEt
PnBhZ2VzLT5zZ2wpICsKIAkJCQljbGllbnQtPmRvb3JiZWxsX29mZnNldDsKIAlkZXNjLT5kYl90
cmlnZ2VyX2NwdSA9IHB0cl90b191NjQoX19nZXRfZG9vcmJlbGwoY2xpZW50KSk7CkBAIC01OTYs
NyArNTk2LDcgQEAgc3RhdGljIHZvaWQgaW5qZWN0X3ByZWVtcHRfY29udGV4dChzdHJ1Y3Qgd29y
a19zdHJ1Y3QgKndvcmspCiAJZGF0YVszXSA9IGVuZ2luZS0+Z3VjX2lkOwogCWRhdGFbNF0gPSBn
dWMtPmV4ZWNidWZfY2xpZW50LT5wcmlvcml0eTsKIAlkYXRhWzVdID0gZ3VjLT5leGVjYnVmX2Ns
aWVudC0+c3RhZ2VfaWQ7Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0X29mZnNldChndWMtPnNoYXJlZF9k
YXRhKTsKKwlkYXRhWzZdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5zaGFyZWRf
ZGF0YSk7CiAKIAlpZiAoV0FSTl9PTihpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJ
WkUoZGF0YSkpKSkgewogCQlleGVjbGlzdHNfY2xlYXJfYWN0aXZlKCZlbmdpbmUtPmV4ZWNsaXN0
cywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggOGVkMDUxOC4uYWVkOWMxYyAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTEzNyw3ICsxMzcsOCBAQCBzdGF0aWMgaW50IGh1Y191
Y29kZV94ZmVyKHN0cnVjdCBpbnRlbF91Y19mdyAqaHVjX2Z3LCBzdHJ1Y3QgaTkxNV92bWEgKnZt
YSkKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7
CiAKIAkvKiBTZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUgdUNvZGUgKi8KLQlvZmZzZXQg
PSBndWNfZ2d0dF9vZmZzZXQodm1hKSArIGh1Y19mdy0+aGVhZGVyX29mZnNldDsKKwlvZmZzZXQg
PSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoJmRldl9wcml2LT5ndWMsIHZtYSkgKworCQkgaHVjX2Z3
LT5oZWFkZXJfb2Zmc2V0OwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxvd2VyXzMyX2Jp
dHMob2Zmc2V0KSk7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0hJR0gsIHVwcGVyXzMyX2JpdHMo
b2Zmc2V0KSAmIDB4RkZGRik7CiAKQEAgLTIxMyw3ICsyMTQsOCBAQCBpbnQgaW50ZWxfaHVjX2F1
dGgoc3RydWN0IGludGVsX2h1YyAqaHVjKQogCX0KIAogCXJldCA9IGludGVsX2d1Y19hdXRoX2h1
YyhndWMsCi0JCQkJIGd1Y19nZ3R0X29mZnNldCh2bWEpICsgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsK
KwkJCQkgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSArCisJCQkJIGh1Yy0+ZncucnNh
X29mZnNldCk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkh1QzogR3VDIGRpZCBub3QgYWNr
IEF1dGggcmVxdWVzdCAlZFxuIiwgcmV0KTsKIAkJZ290byBvdXQ7Ci0tIAoyLjcuNAoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp
bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==