From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 3/3] drm/i915/guc: general tidying up
	(submission)
Date: Mon, 12 Sep 2016 21:19:37 +0100
Message-ID: <1473711577-11454-4-git-send-email-david.s.gordon@intel.com>
References: <1473711577-11454-1-git-send-email-david.s.gordon@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 mga06.intel.com (mga06.intel.com [134.134.136.31])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 9BE9D6E58D
 for <intel-gfx@lists.freedesktop.org>; Mon, 12 Sep 2016 20:19:52 +0000 (UTC)
In-Reply-To: <1473711577-11454-1-git-send-email-david.s.gordon@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

UmVuYW1pbmcgdG8gbW9yZSBjb25zaXN0ZW50IHNjaGVtZSwgYW5kIHVwZGF0aW5nIGNvbW1lbnRz
LCBtb3N0bHkKYWJvdXQgaTkxNV9ndWNfd3FfcmVzZXJ2ZSgpLCBha2EgaTkxNV9ndWNfd3FfY2hl
Y2tfc3BhY2UoKS4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBp
bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j
IHwgNjMgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMgICAgICAgICAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9u
cygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi
bWlzc2lvbi5jCmluZGV4IDI3OWE0ZDAuLjQzMzU4ZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTU5LDcgKzU5LDcgQEAKICAqIFdRX1RZUEVfSU5P
UkRFUiBpcyBuZWVkZWQgdG8gc3VwcG9ydCBsZWdhY3kgc3VibWlzc2lvbiB2aWEgR3VDLCB3aGlj
aAogICogcmVwcmVzZW50cyBpbi1vcmRlciBxdWV1ZS4gVGhlIGtlcm5lbCBkcml2ZXIgcGFja3Mg
cmluZyB0YWlsIHBvaW50ZXIgYW5kIGFuCiAgKiBFTFNQIGNvbnRleHQgZGVzY3JpcHRvciBkd29y
ZCBpbnRvIFdvcmsgSXRlbS4KLSAqIFNlZSBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKCkKKyAqIFNl
ZSBndWNfd3FfaXRlbV9hcHBlbmQoKQogICoKICAqLwogCkBAIC0yODgsNyArMjg4LDcgQEAgc3Rh
dGljIHVpbnQzMl90IHNlbGVjdF9kb29yYmVsbF9jYWNoZWxpbmUoc3RydWN0IGludGVsX2d1YyAq
Z3VjKQogLyoKICAqIEluaXRpYWxpc2UgdGhlIHByb2Nlc3MgZGVzY3JpcHRvciBzaGFyZWQgd2l0
aCB0aGUgR3VDIGZpcm13YXJlLgogICovCi1zdGF0aWMgdm9pZCBndWNfaW5pdF9wcm9jX2Rlc2Mo
c3RydWN0IGludGVsX2d1YyAqZ3VjLAorc3RhdGljIHZvaWQgZ3VjX3Byb2NfZGVzY19pbml0KHN0
cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCSAgICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpj
bGllbnQpCiB7CiAJc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2M7CkBAIC0zMjAsNyArMzIw
LDcgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfcHJvY19kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1
YywKICAqIHdyaXRlIHF1ZXVlLCBldGMpLgogICovCiAKLXN0YXRpYyB2b2lkIGd1Y19pbml0X2N0
eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKK3N0YXRpYyB2b2lkIGd1Y19jdHhfZGVzY19p
bml0KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCSAgICAgIHN0cnVjdCBpOTE1X2d1Y19jbGll
bnQgKmNsaWVudCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNf
dG9faTkxNShndWMpOwpAQCAtMzk5LDcgKzM5OSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0
eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xp
ZW50LT5jdHhfaW5kZXgpOwogfQogCi1zdGF0aWMgdm9pZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1
Y3QgaW50ZWxfZ3VjICpndWMsCitzdGF0aWMgdm9pZCBndWNfY3R4X2Rlc2NfZmluaShzdHJ1Y3Qg
aW50ZWxfZ3VjICpndWMsCiAJCQkgICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQp
CiB7CiAJc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgZGVzYzsKQEAgLTQxMyw3ICs0MTMsNyBAQCBz
dGF0aWMgdm9pZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiB9CiAK
IC8qKgotICogaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UoKSAtIGNoZWNrIHRoYXQgdGhlIEd1QyBj
YW4gYWNjZXB0IGEgcmVxdWVzdAorICogaTkxNV9ndWNfd3FfcmVzZXJ2ZSgpIC0gcmVzZXJ2ZSBz
cGFjZSBpbiB0aGUgR3VDJ3Mgd29ya3F1ZXVlCiAgKiBAcmVxdWVzdDoJcmVxdWVzdCBhc3NvY2lh
dGVkIHdpdGggdGhlIGNvbW1hbmRzCiAgKgogICogUmV0dXJuOgkwIGlmIHNwYWNlIGlzIGF2YWls
YWJsZQpAQCAtNDIxLDE0ICs0MjEsMTQgQEAgc3RhdGljIHZvaWQgZ3VjX2ZpbmlfY3R4X2Rlc2Mo
c3RydWN0IGludGVsX2d1YyAqZ3VjLAogICoKICAqIFRoaXMgZnVuY3Rpb24gbXVzdCBiZSBjYWxs
ZWQgKGFuZCBtdXN0IHJldHVybiAwKSBiZWZvcmUgYSByZXF1ZXN0CiAgKiBpcyBzdWJtaXR0ZWQg
dG8gdGhlIEd1QyB2aWEgaTkxNV9ndWNfc3VibWl0KCkgYmVsb3cuIE9uY2UgYSByZXN1bHQKLSAq
IG9mIDAgaGFzIGJlZW4gcmV0dXJuZWQsIGl0IHJlbWFpbnMgdmFsaWQgdW50aWwgKGJ1dCBvbmx5
IHVudGlsKQotICogdGhlIG5leHQgY2FsbCB0byBzdWJtaXQoKS4KKyAqIG9mIDAgaGFzIGJlZW4g
cmV0dXJuZWQsIGl0IG11c3QgYmUgYmFsYW5jZWQgYnkgYSBjb3JyZXNwb25kaW5nCisgKiBjYWxs
IHRvIHN1Ym1pdCgpLgogICoKLSAqIFRoaXMgcHJlY2hlY2sgYWxsb3dzIHRoZSBjYWxsZXIgdG8g
ZGV0ZXJtaW5lIGluIGFkdmFuY2UgdGhhdCBzcGFjZQorICogUmVzZXJ2YXRpb24gYWxsb3dzIHRo
ZSBjYWxsZXIgdG8gZGV0ZXJtaW5lIGluIGFkdmFuY2UgdGhhdCBzcGFjZQogICogd2lsbCBiZSBh
dmFpbGFibGUgZm9yIHRoZSBuZXh0IHN1Ym1pc3Npb24gYmVmb3JlIGNvbW1pdHRpbmcgcmVzb3Vy
Y2VzCiAgKiB0byBpdCwgYW5kIGhlbHBzIGF2b2lkIGxhdGUgZmFpbHVyZXMgd2l0aCBjb21wbGlj
YXRlZCByZWNvdmVyeSBwYXRocy4KICAqLwotaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKK2ludCBpOTE1X2d1Y193cV9yZXNl
cnZlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKIAljb25zdCBzaXpl
X3Qgd3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKIAlzdHJ1Y3QgaTkxNV9n
dWNfY2xpZW50ICpnYyA9IHJlcXVlc3QtPmk5MTUtPmd1Yy5leGVjYnVmX2NsaWVudDsKQEAgLTQ1
MSw4ICs0NTEsOSBAQCBpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGd1
Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCi0JCQkJICAg
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKKy8qIENvbnN0cnVjdCBhIFdvcmsgSXRl
bSBhbmQgYXBwZW5kIGl0IHRvIHRoZSBHdUMncyBXb3JrIFF1ZXVlICovCitzdGF0aWMgdm9pZCBn
dWNfd3FfaXRlbV9hcHBlbmQoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCisJCQkgICAgICAg
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKIAkvKiB3cWlfbGVuIGlzIGluIERX
b3JkcywgYW5kIGRvZXMgbm90IGluY2x1ZGUgdGhlIG9uZS13b3JkIGhlYWRlciAqLwogCWNvbnN0
IHNpemVfdCB3cWlfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwpAQCAtNDY1LDcg
KzQ2Niw3IEBAIHN0YXRpYyB2b2lkIGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVf
Z3VjX2NsaWVudCAqZ2MsCiAKIAlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPnByb2NfZGVz
Y19vZmZzZXQ7CiAKLQkvKiBGcmVlIHNwYWNlIGlzIGd1YXJhbnRlZWQsIHNlZSBpOTE1X2d1Y193
cV9jaGVja19zcGFjZSgpIGFib3ZlICovCisJLyogRnJlZSBzcGFjZSBpcyBndWFyYW50ZWVkLCBz
ZWUgaTkxNV9ndWNfd3FfcmVzZXJ2ZSgpIGFib3ZlICovCiAJZnJlZXNwYWNlID0gQ0lSQ19TUEFD
RShnYy0+d3FfdGFpbCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUpOwogCUdFTV9CVUdfT04oZnJl
ZXNwYWNlIDwgd3FpX3NpemUpOwogCkBAIC01NzUsMTQgKzU3NiwxMyBAQCBzdGF0aWMgaW50IGd1
Y19yaW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogICogUmV0dXJuOgkw
IG9uIHN1Y2Nlc3MsIG90aGVyd2lzZSBhbiBlcnJuby4KICAqIAkJKE5vdGU6IG5vbnplcm8gcmVh
bGx5IHNob3VsZG4ndCBoYXBwZW4hKQogICoKLSAqIFRoZSBjYWxsZXIgbXVzdCBoYXZlIGFscmVh
ZHkgY2FsbGVkIGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKCkgYWJvdmUKLSAqIHdpdGggYSByZXN1
bHQgb2YgMCAoc3VjY2Vzcykgc2luY2UgdGhlIGxhc3QgcmVxdWVzdCBzdWJtaXNzaW9uLiBUaGlz
Ci0gKiBndWFyYW50ZWVzIHRoYXQgdGhlcmUgaXMgc3BhY2UgaW4gdGhlIHdvcmsgcXVldWUgZm9y
IHRoZSBuZXcgcmVxdWVzdCwKLSAqIHNvIGVucXVldWluZyB0aGUgaXRlbSBjYW5ub3QgZmFpbC4K
KyAqIFRoZSBjYWxsZXIgbXVzdCBoYXZlIGFscmVhZHkgY2FsbGVkIGk5MTVfZ3VjX3dxX3Jlc2Vy
dmUoKSBhYm92ZSB3aXRoCisgKiBhIHJlc3VsdCBvZiAwIChzdWNjZXNzKSwgZ3VhcmFudGVlaW5n
IHRoYXQgdGhlcmUgaXMgc3BhY2UgaW4gdGhlIHdvcmsKKyAqIHF1ZXVlIGZvciB0aGUgbmV3IHJl
cXVlc3QsIHNvIGVucXVldWluZyB0aGUgaXRlbSBjYW5ub3QgZmFpbC4KICAqCiAgKiBCYWQgVGhp
bmdzIFdpbGwgSGFwcGVuIGlmIHRoZSBjYWxsZXIgdmlvbGF0ZXMgdGhpcyBwcm90b2NvbCBlLmcu
IGNhbGxzCi0gKiBzdWJtaXQoKSB3aGVuIGNoZWNrKCkgc2F5cyB0aGVyZSdzIG5vIHNwYWNlLCBv
ciBjYWxscyBzdWJtaXQoKSBtdWx0aXBsZQotICogdGltZXMgd2l0aCBubyBpbnRlcnZlbmluZyBj
aGVjaygpLgorICogc3VibWl0KCkgd2hlbiBfcmVzZXJ2ZSgpIHNheXMgdGhlcmUncyBubyBzcGFj
ZSwgb3IgY2FsbHMgX3N1Ym1pdCgpCisgKiBhIGRpZmZlcmVudCBudW1iZXIgb2YgdGltZXMgZnJv
bSAoc3VjY2Vzc2Z1bCkgY2FsbHMgdG8gX3Jlc2VydmUoKS4KICAqCiAgKiBUaGUgb25seSBlcnJv
ciBoZXJlIGFyaXNlcyBpZiB0aGUgZG9vcmJlbGwgaGFyZHdhcmUgaXNuJ3QgZnVuY3Rpb25pbmcK
ICAqIGFzIGV4cGVjdGVkLCB3aGljaCByZWFsbHkgc2hvdWxuJ3QgaGFwcGVuLgpAQCAtNTk1LDcg
KzU5NSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X3JlcXVlc3QgKnJxKQogCWludCBiX3JldDsKIAogCXNwaW5fbG9jaygmY2xpZW50LT53cV9sb2Nr
KTsKLQlndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKGNsaWVudCwgcnEpOworCWd1Y193cV9pdGVtX2Fw
cGVuZChjbGllbnQsIHJxKTsKIAliX3JldCA9IGd1Y19yaW5nX2Rvb3JiZWxsKGNsaWVudCk7CiAK
IAljbGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZV9pZF0gKz0gMTsKQEAgLTY4Niw3ICs2ODYsNyBA
QCBzdGF0aWMgc3RydWN0IGk5MTVfdm1hICpndWNfYWxsb2NhdGVfdm1hKHN0cnVjdCBpbnRlbF9n
dWMgKmd1YywgdTMyIHNpemUpCiAJaTkxNV92bWFfdW5waW5fYW5kX3JlbGVhc2UoJmNsaWVudC0+
dm1hKTsKIAogCWlmIChjbGllbnQtPmN0eF9pbmRleCAhPSBHVUNfSU5WQUxJRF9DVFhfSUQpIHsK
LQkJZ3VjX2ZpbmlfY3R4X2Rlc2MoZ3VjLCBjbGllbnQpOworCQlndWNfY3R4X2Rlc2NfZmluaShn
dWMsIGNsaWVudCk7CiAJCWlkYV9zaW1wbGVfcmVtb3ZlKCZndWMtPmN0eF9pZHMsIGNsaWVudC0+
Y3R4X2luZGV4KTsKIAl9CiAKQEAgLTgxOCw4ICs4MTgsOCBAQCBzdGF0aWMgdm9pZCBndWNfaW5p
dF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJZWxzZQogCQljbGllbnQtPnBy
b2NfZGVzY19vZmZzZXQgPSAoR1VDX0RCX1NJWkUgLyAyKTsKIAotCWd1Y19pbml0X3Byb2NfZGVz
YyhndWMsIGNsaWVudCk7Ci0JZ3VjX2luaXRfY3R4X2Rlc2MoZ3VjLCBjbGllbnQpOworCWd1Y19w
cm9jX2Rlc2NfaW5pdChndWMsIGNsaWVudCk7CisJZ3VjX2N0eF9kZXNjX2luaXQoZ3VjLCBjbGll
bnQpOwogCWlmIChndWNfaW5pdF9kb29yYmVsbChndWMsIGNsaWVudCwgZGJfaWQpKQogCQlnb3Rv
IGVycjsKIApAQCAtODM1LDcgKzgzNSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2Rvb3JiZWxs
X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlyZXR1cm4gTlVMTDsKIH0KIAotc3RhdGljIHZv
aWQgZ3VjX2NyZWF0ZV9sb2coc3RydWN0IGludGVsX2d1YyAqZ3VjKQorc3RhdGljIHZvaWQgZ3Vj
X2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBpOTE1X3ZtYSAq
dm1hOwogCXVuc2lnbmVkIGxvbmcgb2Zmc2V0OwpAQCAtODc1LDcgKzg3NSw3IEBAIHN0YXRpYyB2
b2lkIGd1Y19jcmVhdGVfbG9nKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlndWMtPmxvZ19mbGFn
cyA9IChvZmZzZXQgPDwgR1VDX0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFnczsKIH0KIAotc3Rh
dGljIHZvaWQgaW5pdF9ndWNfcG9saWNpZXMoc3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXMp
CitzdGF0aWMgdm9pZCBndWNfcG9saWNpZXNfaW5pdChzdHJ1Y3QgZ3VjX3BvbGljaWVzICpwb2xp
Y2llcykKIHsKIAlzdHJ1Y3QgZ3VjX3BvbGljeSAqcG9saWN5OwogCXUzMiBwLCBpOwpAQCAtODk3
LDcgKzg5Nyw3IEBAIHN0YXRpYyB2b2lkIGluaXRfZ3VjX3BvbGljaWVzKHN0cnVjdCBndWNfcG9s
aWNpZXMgKnBvbGljaWVzKQogCXBvbGljaWVzLT5pc192YWxpZCA9IDE7CiB9CiAKLXN0YXRpYyB2
b2lkIGd1Y19jcmVhdGVfYWRzKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3N0YXRpYyB2b2lkIGd1
Y19hZGRvbl9jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CiAJc3RydWN0IGk5MTVfdm1h
ICp2bWE7CkBAIC05NDAsNyArOTQwLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9hZHMoc3Ry
dWN0IGludGVsX2d1YyAqZ3VjKQogCiAJLyogR3VDIHNjaGVkdWxpbmcgcG9saWNpZXMgKi8KIAlw
b2xpY2llcyA9ICh2b2lkICopYWRzICsgc2l6ZW9mKHN0cnVjdCBndWNfYWRzKTsKLQlpbml0X2d1
Y19wb2xpY2llcyhwb2xpY2llcyk7CisJZ3VjX3BvbGljaWVzX2luaXQocG9saWNpZXMpOwogCiAJ
YWRzLT5zY2hlZHVsZXJfcG9saWNpZXMgPQogCQlpOTE1X2dndHRfb2Zmc2V0KHZtYSkgKyBzaXpl
b2Yoc3RydWN0IGd1Y19hZHMpOwpAQCAtOTcxLDkgKzk3MSwxMSBAQCBzdGF0aWMgdm9pZCBndWNf
Y3JlYXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAgKi8KIGludCBpOTE1X2d1Y19zdWJt
aXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWNvbnN0
IHNpemVfdCBjdHhzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfY29udGV4dF9kZXNjKTsKKwljb25z
dCBzaXplX3QgcG9vbHNpemUgPSBHVUNfTUFYX0dQVV9DT05URVhUUyAqIGN0eHNpemU7CisJY29u
c3Qgc2l6ZV90IGdlbXNpemUgPSByb3VuZF91cChwb29sc2l6ZSwgUEFHRV9TSVpFKTsKIAlzdHJ1
Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZt
YTsKLQl1MzIgc2l6ZTsKIAogCS8qIFdpcGUgYml0bWFwICYgZGVsZXRlIGNsaWVudCBpbiBjYXNl
IG9mIHJlaW5pdGlhbGlzYXRpb24gKi8KIAliaXRtYXBfY2xlYXIoZ3VjLT5kb29yYmVsbF9iaXRt
YXAsIDAsIEdVQ19NQVhfRE9PUkJFTExTKTsKQEAgLTk4NSwxNSArOTg3LDE0IEBAIGludCBpOTE1
X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog
CWlmIChndWMtPmN0eF9wb29sX3ZtYSkKIAkJcmV0dXJuIDA7IC8qIGFscmVhZHkgYWxsb2NhdGVk
ICovCiAKLQlzaXplID0gUEFHRV9BTElHTihHVUNfTUFYX0dQVV9DT05URVhUUypzaXplb2Yoc3Ry
dWN0IGd1Y19jb250ZXh0X2Rlc2MpKTsKLQl2bWEgPSBndWNfYWxsb2NhdGVfdm1hKGd1Yywgc2l6
ZSk7CisJdm1hID0gZ3VjX2FsbG9jYXRlX3ZtYShndWMsIGdlbXNpemUpOwogCWlmIChJU19FUlIo
dm1hKSkKIAkJcmV0dXJuIFBUUl9FUlIodm1hKTsKIAogCWd1Yy0+Y3R4X3Bvb2xfdm1hID0gdm1h
OwogCWlkYV9pbml0KCZndWMtPmN0eF9pZHMpOwotCWd1Y19jcmVhdGVfbG9nKGd1Yyk7Ci0JZ3Vj
X2NyZWF0ZV9hZHMoZ3VjKTsKKwlndWNfbG9nX2NyZWF0ZShndWMpOworCWd1Y19hZGRvbl9jcmVh
dGUoZ3VjKTsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA0
Njc4NDU5Li5iMWJhODY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtMTU5LDcgKzE1
OSw3IEBAIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
KTsKIC8qIGk5MTVfZ3VjX3N1Ym1pc3Npb24uYyAqLwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25f
aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGk5MTVfZ3VjX3N1
Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci1pbnQg
aTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7
CitpbnQgaTkxNV9ndWNfd3FfcmVzZXJ2ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJx
KTsKIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4
IDE2ZDdjZGQuLjI1MTE0MzM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNjI3LDcg
KzYyNyw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJCSAqIGdvaW5nIGFueSBmdXJ0aGVy
LCBhcyB0aGUgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwKIAkJICogbGF0ZXIgb24gbXVzdG4ndCBm
YWlsIC4uLgogCQkgKi8KLQkJcmV0ID0gaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UocmVxdWVzdCk7
CisJCXJldCA9IGk5MTVfZ3VjX3dxX3Jlc2VydmUocmVxdWVzdCk7CiAJCWlmIChyZXQpCiAJCQly
ZXR1cm4gcmV0OwogCX0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK