From: Xiaolin Zhang Subject: [v1 10/10] drm/i915/gvt: GVTg support ppgtt pvmmio optimization Date: Thu, 11 Oct 2018 14:14:12 +0800 Message-ID: <1539238452-4389-10-git-send-email-xiaolin.zhang@intel.com> References: <1539238452-4389-1-git-send-email-xiaolin.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1539238452-4389-1-git-send-email-xiaolin.zhang@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-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: zhenyu.z.wang@intel.com, hang.yuan@intel.com, joonas.lahtinen@intel.com, fei.jiang@intel.com, zhiyuan.lv@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBoYW5kbGVzIHBwZ3R0IHVwZGF0ZSBmcm9tIGcydiBub3RpZmljYXRpb24uCgpJ dCByZWFkIG91dCBwcGd0dCBwdGUgZW50cmllcyBmcm9tIGd1ZXN0IHB0ZSB0YWJsZXMgcGFnZSBh bmQKY29udmVydCB0aGVtIHRvIGhvc3QgcGZucy4KCkl0IGNyZWF0ZXMgbG9jYWwgcHBndHQgdGFi bGVzIGFuZCBpbnNlcnQgdGhlIGNvbnRlbnQgcGFnZXMKaW50byB0aGUgbG9jYWwgcHBndHQgdGFi bGVzIGRpcmVjdGx5LCB3aGljaCBkb2VzIG5vdCB0cmFjawp0aGUgdXNhZ2Ugb2YgZ3Vlc3QgcGFn ZSB0YWJsZSBhbmQgcmVtb3ZlcyB0aGUgY29zdCBvZiB3cml0ZQpwcm90ZWN0aW9uIGZyb20gdGhl IG9yaWdpbmFsIHNoYWRvdyBwYWdlIG1lY2hhbnNpbS4KCnYxOiByZWJhc2UKdjA6IFJGQwoKU2ln bmVkLW9mZi1ieTogWGlhb2xpbiBaaGFuZyA8eGlhb2xpbi56aGFuZ0BpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jICAgICAgfCAzMTggKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmggICAg ICB8ICAgOSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMuYyB8ICAxMyArLQog MyBmaWxlcyBjaGFuZ2VkLCAzMzggaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9ndnQvZ3R0LmMKaW5kZXggNThlMTY2ZS4uOGQzZTIxYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9n dHQuYwpAQCAtMTc0NCw2ICsxNzQ0LDI2IEBAIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0 X3dyaXRlX3BhZ2VfdGFibGVfYnl0ZXMoCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB2b2lkIGlu dmFsaWRhdGVfbW1fcHYoc3RydWN0IGludGVsX3ZncHVfbW0gKm1tKQoreworCXN0cnVjdCBpbnRl bF92Z3B1ICp2Z3B1ID0gbW0tPnZncHU7CisJc3RydWN0IGludGVsX2d2dCAqZ3Z0ID0gdmdwdS0+ Z3Z0OworCXN0cnVjdCBpbnRlbF9ndnRfZ3R0ICpndHQgPSAmZ3Z0LT5ndHQ7CisJc3RydWN0IGlu dGVsX2d2dF9ndHRfcHRlX29wcyAqb3BzID0gZ3R0LT5wdGVfb3BzOworCXN0cnVjdCBpbnRlbF9n dnRfZ3R0X2VudHJ5IHNlOworCisJaTkxNV9wcGd0dF9jbG9zZSgmbW0tPnBwZ3R0LT52bSk7CisJ aTkxNV9wcGd0dF9wdXQobW0tPnBwZ3R0KTsKKworCXBwZ3R0X2dldF9zaGFkb3dfcm9vdF9lbnRy eShtbSwgJnNlLCAwKTsKKwlpZiAoIW9wcy0+dGVzdF9wcmVzZW50KCZzZSkpCisJCXJldHVybjsK KwlzZS52YWw2NCA9IDA7CisJcHBndHRfc2V0X3NoYWRvd19yb290X2VudHJ5KG1tLCAmc2UsIDAp OworCisJbW0tPnBwZ3R0X21tLnNoYWRvd2VkICA9IGZhbHNlOworfQorCiBzdGF0aWMgdm9pZCBp bnZhbGlkYXRlX3BwZ3R0X21tKHN0cnVjdCBpbnRlbF92Z3B1X21tICptbSkKIHsKIAlzdHJ1Y3Qg aW50ZWxfdmdwdSAqdmdwdSA9IG1tLT52Z3B1OwpAQCAtMTc1Niw2ICsxNzc2LDExIEBAIHN0YXRp YyB2b2lkIGludmFsaWRhdGVfcHBndHRfbW0oc3RydWN0IGludGVsX3ZncHVfbW0gKm1tKQogCWlm ICghbW0tPnBwZ3R0X21tLnNoYWRvd2VkKQogCQlyZXR1cm47CiAKKwlpZiAoVkdQVV9QVk1NSU8o bW0tPnZncHUpICYgUFZNTUlPX1BQR1RUX1VQREFURSkgeworCQlpbnZhbGlkYXRlX21tX3B2KG1t KTsKKwkJcmV0dXJuOworCX0KKwogCWZvciAoaW5kZXggPSAwOyBpbmRleCA8IEFSUkFZX1NJWkUo bW0tPnBwZ3R0X21tLnNoYWRvd19wZHBzKTsgaW5kZXgrKykgewogCQlwcGd0dF9nZXRfc2hhZG93 X3Jvb3RfZW50cnkobW0sICZzZSwgaW5kZXgpOwogCkBAIC0xNzczLDYgKzE3OTgsMjYgQEAgc3Rh dGljIHZvaWQgaW52YWxpZGF0ZV9wcGd0dF9tbShzdHJ1Y3QgaW50ZWxfdmdwdV9tbSAqbW0pCiAJ bW0tPnBwZ3R0X21tLnNoYWRvd2VkID0gZmFsc2U7CiB9CiAKK3N0YXRpYyBpbnQgc2hhZG93X21t X3B2KHN0cnVjdCBpbnRlbF92Z3B1X21tICptbSkKK3sKKwlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdw dSA9IG1tLT52Z3B1OworCXN0cnVjdCBpbnRlbF9ndnQgKmd2dCA9IHZncHUtPmd2dDsKKwlzdHJ1 Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSBzZTsKKworCW1tLT5wcGd0dCA9IGk5MTVfcHBndHRfY3Jl YXRlKGd2dC0+ZGV2X3ByaXYsIE5VTEwpOworCWlmIChJU19FUlIobW0tPnBwZ3R0KSkgeworCQln dnRfdmdwdV9lcnIoImZhaWwgdG8gY3JlYXRlIHBwZ3R0IGZvciBwZHAgMHglbGx4XG4iLAorCQkJ CXB4X2RtYSgmbW0tPnBwZ3R0LT5wbWw0KSk7CisJCXJldHVybiBQVFJfRVJSKG1tLT5wcGd0dCk7 CisJfQorCisJc2UudHlwZSA9IEdUVF9UWVBFX1BQR1RUX1JPT1RfTDRfRU5UUlk7CisJc2UudmFs NjQgPSBweF9kbWEoJm1tLT5wcGd0dC0+cG1sNCk7CisJcHBndHRfc2V0X3NoYWRvd19yb290X2Vu dHJ5KG1tLCAmc2UsIDApOworCW1tLT5wcGd0dF9tbS5zaGFkb3dlZCAgPSB0cnVlOworCisJcmV0 dXJuIDA7Cit9CiAKIHN0YXRpYyBpbnQgc2hhZG93X3BwZ3R0X21tKHN0cnVjdCBpbnRlbF92Z3B1 X21tICptbSkKIHsKQEAgLTE3ODcsNiArMTgzMiw5IEBAIHN0YXRpYyBpbnQgc2hhZG93X3BwZ3R0 X21tKHN0cnVjdCBpbnRlbF92Z3B1X21tICptbSkKIAlpZiAobW0tPnBwZ3R0X21tLnNoYWRvd2Vk KQogCQlyZXR1cm4gMDsKIAorCWlmIChWR1BVX1BWTU1JTyhtbS0+dmdwdSkgJiBQVk1NSU9fUFBH VFRfVVBEQVRFKQorCQlyZXR1cm4gc2hhZG93X21tX3B2KG1tKTsKKwogCW1tLT5wcGd0dF9tbS5z aGFkb3dlZCA9IHRydWU7CiAKIAlmb3IgKGluZGV4ID0gMDsgaW5kZXggPCBBUlJBWV9TSVpFKG1t LT5wcGd0dF9tbS5ndWVzdF9wZHBzKTsgaW5kZXgrKykgewpAQCAtMjc2NywzICsyODE1LDI3MyBA QCB2b2lkIGludGVsX3ZncHVfcmVzZXRfZ3R0KHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1KQogCWlu dGVsX3ZncHVfZGVzdHJveV9hbGxfcHBndHRfbW0odmdwdSk7CiAJaW50ZWxfdmdwdV9yZXNldF9n Z3R0KHZncHUsIHRydWUpOwogfQorCitpbnQgaW50ZWxfdmdwdV9nMnZfcHZfcHBndHRfYWxsb2Nf NGx2bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKKwkJdTY0IHBkcHNbXSkKK3sKKwlzdHJ1Y3Qg aW50ZWxfdmdwdV9tbSAqbW07CisJaW50IHJldCA9IDA7CisJdTMyIG9mZnNldDsKKwlzdHJ1Y3Qg cHZfcHBndHRfdXBkYXRlIHB2X3BwZ3R0OworCisJb2Zmc2V0ID0gb2Zmc2V0b2Yoc3RydWN0IGd2 dF9zaGFyZWRfcGFnZSwgcHZfcHBndHQpOworCWludGVsX2d2dF9yZWFkX3NoYXJlZF9wYWdlKHZn cHUsIG9mZnNldCwgJnB2X3BwZ3R0LCBzaXplb2YocHZfcHBndHQpKTsKKworCW1tID0gaW50ZWxf dmdwdV9maW5kX3BwZ3R0X21tKHZncHUsICZwdl9wcGd0dC5wZHApOworCWlmICghbW0pIHsKKwkJ Z3Z0X3ZncHVfZXJyKCJmYWlsZWQgdG8gZmluZCBwZHAgMHglbGx4XG4iLCBwdl9wcGd0dC5wZHAp OworCQlyZXQgPSAtRUlOVkFMOworCX0gZWxzZSB7CisJCXJldCA9IG1tLT5wcGd0dC0+dm0uYWxs b2NhdGVfdmFfcmFuZ2UoJm1tLT5wcGd0dC0+dm0sCisJCQlwdl9wcGd0dC5zdGFydCwgcHZfcHBn dHQubGVuZ3RoKTsKKwkJaWYgKHJldCkKKwkJCWd2dF92Z3B1X2VycigiZmFpbGVkIHRvIGFsbG9j ICVsbHhcbiIsIHB2X3BwZ3R0LnBkcCk7CisJfQorCisJcmV0dXJuIHJldDsKK30KKworaW50IGlu dGVsX3ZncHVfZzJ2X3B2X3BwZ3R0X2NsZWFyXzRsdmwoc3RydWN0IGludGVsX3ZncHUgKnZncHUs CisJCXU2NCBwZHBzW10pCit7CisJc3RydWN0IGludGVsX3ZncHVfbW0gKm1tOworCWludCByZXQg PSAwOworCXUzMiBvZmZzZXQ7CisJc3RydWN0IHB2X3BwZ3R0X3VwZGF0ZSBwdl9wcGd0dDsKKwor CW9mZnNldCA9IG9mZnNldG9mKHN0cnVjdCBndnRfc2hhcmVkX3BhZ2UsIHB2X3BwZ3R0KTsKKwlp bnRlbF9ndnRfcmVhZF9zaGFyZWRfcGFnZSh2Z3B1LCBvZmZzZXQsICZwdl9wcGd0dCwgc2l6ZW9m KHB2X3BwZ3R0KSk7CisJbW0gPSBpbnRlbF92Z3B1X2ZpbmRfcHBndHRfbW0odmdwdSwgJnB2X3Bw Z3R0LnBkcCk7CisJaWYgKCFtbSkgeworCQlndnRfdmdwdV9lcnIoImZhaWxlZCB0byBmaW5kIHBk cCAweCVsbHhcbiIsIHB2X3BwZ3R0LnBkcCk7CisJCXJldCA9IC1FSU5WQUw7CisJfSBlbHNlIHsK KwkJbW0tPnBwZ3R0LT52bS5jbGVhcl9yYW5nZSgmbW0tPnBwZ3R0LT52bSwKKwkJCXB2X3BwZ3R0 LnN0YXJ0LCBwdl9wcGd0dC5sZW5ndGgpOworCX0KKworCXJldHVybiByZXQ7Cit9CisKKyNkZWZp bmUgR0VOOF9QTUw0RV9TSVpFCQkoMVVMIDw8IEdFTjhfUE1MNEVfU0hJRlQpCisjZGVmaW5lIEdF TjhfUE1MNEVfU0laRV9NQVNLCSh+KEdFTjhfUE1MNEVfU0laRSAtIDEpKQorI2RlZmluZSBHRU44 X1BEUEVfU0laRQkJKDFVTCA8PCBHRU44X1BEUEVfU0hJRlQpCisjZGVmaW5lIEdFTjhfUERQRV9T SVpFX01BU0sJKH4oR0VOOF9QRFBFX1NJWkUgLSAxKSkKKyNkZWZpbmUgR0VOOF9QREVfU0laRQkJ KDFVTCA8PCBHRU44X1BERV9TSElGVCkKKyNkZWZpbmUgR0VOOF9QREVfU0laRV9NQVNLCSh+KEdF TjhfUERFX1NJWkUgLSAxKSkKKworI2RlZmluZSBwbWw0X2FkZHJfZW5kKGFkZHIsIGVuZCkJCQkJ CVwKKyh7CXVuc2lnbmVkIGxvbmcgX19ib3VuZGFyeSA9IFwKKwkJCSgoYWRkcikgKyBHRU44X1BN TDRFX1NJWkUpICYgR0VOOF9QTUw0RV9TSVpFX01BU0s7IFwKKwkoX19ib3VuZGFyeSA8IChlbmQp KSA/IF9fYm91bmRhcnkgOiAoZW5kKTsJCVwKK30pCisKKyNkZWZpbmUgcGRwX2FkZHJfZW5kKGFk ZHIsIGVuZCkJCQkJCQlcCisoewl1bnNpZ25lZCBsb25nIF9fYm91bmRhcnkgPSBcCisJCQkoKGFk ZHIpICsgR0VOOF9QRFBFX1NJWkUpICYgR0VOOF9QRFBFX1NJWkVfTUFTSzsgXAorCShfX2JvdW5k YXJ5IDwgKGVuZCkpID8gX19ib3VuZGFyeSA6IChlbmQpOwkJXAorfSkKKworI2RlZmluZSBwZF9h ZGRyX2VuZChhZGRyLCBlbmQpCQkJCQkJXAorKHsJdW5zaWduZWQgbG9uZyBfX2JvdW5kYXJ5ID0g XAorCQkJKChhZGRyKSArIEdFTjhfUERFX1NJWkUpICYgR0VOOF9QREVfU0laRV9NQVNLOwlcCisJ KF9fYm91bmRhcnkgPCAoZW5kKSkgPyBfX2JvdW5kYXJ5IDogKGVuZCk7CQlcCit9KQorCitzdHJ1 Y3QgcHBndHRfd2FsayB7CisJdW5zaWduZWQgbG9uZyAqbWZuczsKKwlpbnQgbWZuX2luZGV4Owor CXVuc2lnbmVkIGxvbmcgKnB0OworfTsKKworc3RhdGljIGludCB3YWxrX3B0X3JhbmdlKHN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1LCB1NjQgcHQsCisJCQkJdTY0IHN0YXJ0LCB1NjQgZW5kLCBzdHJ1 Y3QgcHBndHRfd2FsayAqd2FsaykKK3sKKwljb25zdCBzdHJ1Y3QgaW50ZWxfZ3Z0X2RldmljZV9p bmZvICppbmZvID0gJnZncHUtPmd2dC0+ZGV2aWNlX2luZm87CisJc3RydWN0IGludGVsX2d2dF9n dHRfZ21hX29wcyAqZ21hX29wcyA9IHZncHUtPmd2dC0+Z3R0LmdtYV9vcHM7CisJdW5zaWduZWQg bG9uZyBzdGFydF9pbmRleCwgZW5kX2luZGV4OworCWludCByZXQ7CisJaW50IGk7CisJdW5zaWdu ZWQgbG9uZyBtZm4sIGdmbjsKKworCXN0YXJ0X2luZGV4ID0gZ21hX29wcy0+Z21hX3RvX3B0ZV9p bmRleChzdGFydCk7CisJZW5kX2luZGV4ID0gKChlbmQgLSBzdGFydCkgPj4gUEFHRV9TSElGVCkg KyBzdGFydF9pbmRleDsKKworCXJldCA9IGludGVsX2d2dF9oeXBlcnZpc29yX3JlYWRfZ3BhKHZn cHUsCisJCShwdCAmIFBBR0VfTUFTSykgKyAoc3RhcnRfaW5kZXggPDwgaW5mby0+Z3R0X2VudHJ5 X3NpemVfc2hpZnQpLAorCQl3YWxrLT5wdCArIHN0YXJ0X2luZGV4LAorCQkoZW5kX2luZGV4IC0g c3RhcnRfaW5kZXgpIDw8IGluZm8tPmd0dF9lbnRyeV9zaXplX3NoaWZ0KTsKKwlpZiAocmV0KSB7 CisJCWd2dF92Z3B1X2VycigiZmFpbCB0byByZWFkIGdwYSAlbGx4XG4iLCBwdCk7CisJCXJldHVy biByZXQ7CisJfQorCisJZm9yIChpID0gc3RhcnRfaW5kZXg7IGkgPCBlbmRfaW5kZXg7IGkrKykg eworCQlnZm4gPSB3YWxrLT5wdFtpXSA+PiBQQUdFX1NISUZUOworCQltZm4gPSBpbnRlbF9ndnRf aHlwZXJ2aXNvcl9nZm5fdG9fbWZuKHZncHUsIGdmbik7CisJCWlmIChtZm4gPT0gSU5URUxfR1ZU X0lOVkFMSURfQUREUikgeworCQkJZ3Z0X3ZncHVfZXJyKCJmYWlsIHRvIHRyYW5zbGF0ZSBnZm46 IDB4JWx4XG4iLCBnZm4pOworCQkJcmV0dXJuIC1FTlhJTzsKKwkJfQorCQl3YWxrLT5tZm5zW3dh bGstPm1mbl9pbmRleCsrXSA9IG1mbiA8PCBQQUdFX1NISUZUOworCX0KKworCXJldHVybiAwOwor fQorCisKK3N0YXRpYyBpbnQgd2Fsa19wZF9yYW5nZShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwg dTY0IHBkLAorCQkJCXU2NCBzdGFydCwgdTY0IGVuZCwgc3RydWN0IHBwZ3R0X3dhbGsgKndhbGsp Cit7CisJY29uc3Qgc3RydWN0IGludGVsX2d2dF9kZXZpY2VfaW5mbyAqaW5mbyA9ICZ2Z3B1LT5n dnQtPmRldmljZV9pbmZvOworCXN0cnVjdCBpbnRlbF9ndnRfZ3R0X2dtYV9vcHMgKmdtYV9vcHMg PSB2Z3B1LT5ndnQtPmd0dC5nbWFfb3BzOworCXVuc2lnbmVkIGxvbmcgaW5kZXg7CisJdTY0IHB0 LCBuZXh0OworCWludCByZXQgID0gMDsKKworCWRvIHsKKwkJaW5kZXggPSBnbWFfb3BzLT5nbWFf dG9fcGRlX2luZGV4KHN0YXJ0KTsKKworCQlyZXQgPSBpbnRlbF9ndnRfaHlwZXJ2aXNvcl9yZWFk X2dwYSh2Z3B1LAorCQkJKHBkICYgUEFHRV9NQVNLKSArIChpbmRleCA8PAorCQkJaW5mby0+Z3R0 X2VudHJ5X3NpemVfc2hpZnQpLCAmcHQsIDgpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsK KwkJbmV4dCA9IHBkX2FkZHJfZW5kKHN0YXJ0LCBlbmQpOworCQl3YWxrX3B0X3JhbmdlKHZncHUs IHB0LCBzdGFydCwgbmV4dCwgd2Fsayk7CisKKwkJc3RhcnQgPSBuZXh0OworCX0gd2hpbGUgKHN0 YXJ0ICE9IGVuZCk7CisKKwlyZXR1cm4gcmV0OworfQorCisKK3N0YXRpYyBpbnQgd2Fsa19wZHBf cmFuZ2Uoc3RydWN0IGludGVsX3ZncHUgKnZncHUsIHU2NCBwZHAsCisJCQkJICB1NjQgc3RhcnQs IHU2NCBlbmQsIHN0cnVjdCBwcGd0dF93YWxrICp3YWxrKQoreworCWNvbnN0IHN0cnVjdCBpbnRl bF9ndnRfZGV2aWNlX2luZm8gKmluZm8gPSAmdmdwdS0+Z3Z0LT5kZXZpY2VfaW5mbzsKKwlzdHJ1 Y3QgaW50ZWxfZ3Z0X2d0dF9nbWFfb3BzICpnbWFfb3BzID0gdmdwdS0+Z3Z0LT5ndHQuZ21hX29w czsKKwl1bnNpZ25lZCBsb25nIGluZGV4OworCXU2NCBwZCwgbmV4dDsKKwlpbnQgcmV0ICA9IDA7 CisKKwlkbyB7CisJCWluZGV4ID0gZ21hX29wcy0+Z21hX3RvX2w0X3BkcF9pbmRleChzdGFydCk7 CisKKwkJcmV0ID0gaW50ZWxfZ3Z0X2h5cGVydmlzb3JfcmVhZF9ncGEodmdwdSwKKwkJCShwZHAg JiBQQUdFX01BU0spICsgKGluZGV4IDw8CisJCQlpbmZvLT5ndHRfZW50cnlfc2l6ZV9zaGlmdCks ICZwZCwgOCk7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OworCQluZXh0ID0gcGRwX2FkZHJf ZW5kKHN0YXJ0LCBlbmQpOworCQl3YWxrX3BkX3JhbmdlKHZncHUsIHBkLCBzdGFydCwgbmV4dCwg d2Fsayk7CisJCXN0YXJ0ID0gbmV4dDsKKwl9IHdoaWxlIChzdGFydCAhPSBlbmQpOworCisJcmV0 dXJuIHJldDsKK30KKworCitzdGF0aWMgaW50IHdhbGtfcG1sNF9yYW5nZShzdHJ1Y3QgaW50ZWxf dmdwdSAqdmdwdSwgdTY0IHBtbDQsCisJCQkJdTY0IHN0YXJ0LCB1NjQgZW5kLCBzdHJ1Y3QgcHBn dHRfd2FsayAqd2FsaykKK3sKKwljb25zdCBzdHJ1Y3QgaW50ZWxfZ3Z0X2RldmljZV9pbmZvICpp bmZvID0gJnZncHUtPmd2dC0+ZGV2aWNlX2luZm87CisJc3RydWN0IGludGVsX2d2dF9ndHRfZ21h X29wcyAqZ21hX29wcyA9IHZncHUtPmd2dC0+Z3R0LmdtYV9vcHM7CisJdW5zaWduZWQgbG9uZyBp bmRleDsKKwl1NjQgcGRwLCBuZXh0OworCWludCByZXQgID0gMDsKKworCWRvIHsKKwkJaW5kZXgg PSBnbWFfb3BzLT5nbWFfdG9fcG1sNF9pbmRleChzdGFydCk7CisJCXJldCA9IGludGVsX2d2dF9o eXBlcnZpc29yX3JlYWRfZ3BhKHZncHUsCisJCQkocG1sNCAmIFBBR0VfTUFTSykgKyAoaW5kZXgg PDwKKwkJCWluZm8tPmd0dF9lbnRyeV9zaXplX3NoaWZ0KSwgJnBkcCwgOCk7CisJCWlmIChyZXQp CisJCQlyZXR1cm4gcmV0OworCQluZXh0ID0gcG1sNF9hZGRyX2VuZChzdGFydCwgZW5kKTsKKwkJ d2Fsa19wZHBfcmFuZ2UodmdwdSwgcGRwLCBzdGFydCwgbmV4dCwgd2Fsayk7CisJCXN0YXJ0ID0g bmV4dDsKKwl9IHdoaWxlIChzdGFydCAhPSBlbmQpOworCisJcmV0dXJuIHJldDsKK30KKworaW50 IGludGVsX3ZncHVfZzJ2X3B2X3BwZ3R0X2luc2VydF80bHZsKHN0cnVjdCBpbnRlbF92Z3B1ICp2 Z3B1LAorCQl1NjQgcGRwc1tdKQoreworCXN0cnVjdCBpbnRlbF92Z3B1X21tICptbTsKKwl1NjQg cG1sNCwgc3RhcnQsIGxlbmd0aDsKKwl1MzIgY2FjaGVfbGV2ZWw7CisJaW50IHJldCA9IDA7CisJ c3RydWN0IHNnX3RhYmxlIHN0OworCXN0cnVjdCBzY2F0dGVybGlzdCAqc2cgPSBOVUxMOworCWlu dCBudW1fcGFnZXM7CisJc3RydWN0IGk5MTVfdm1hIHZtYTsKKwlzdHJ1Y3QgcHBndHRfd2FsayB3 YWxrOworCWludCBpOworCXUzMiBvZmZzZXQ7CisJc3RydWN0IHB2X3BwZ3R0X3VwZGF0ZSBwdl9w cGd0dDsKKworCW9mZnNldCA9IG9mZnNldG9mKHN0cnVjdCBndnRfc2hhcmVkX3BhZ2UsIHB2X3Bw Z3R0KTsKKwlpbnRlbF9ndnRfcmVhZF9zaGFyZWRfcGFnZSh2Z3B1LCBvZmZzZXQsICZwdl9wcGd0 dCwgc2l6ZW9mKHB2X3BwZ3R0KSk7CisJcG1sNCA9IHB2X3BwZ3R0LnBkcDsKKwlzdGFydCA9IHB2 X3BwZ3R0LnN0YXJ0OworCWxlbmd0aCA9IHB2X3BwZ3R0Lmxlbmd0aDsKKwljYWNoZV9sZXZlbCA9 IHB2X3BwZ3R0LmNhY2hlX2xldmVsOworCW51bV9wYWdlcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZU OworCisJbW0gPSBpbnRlbF92Z3B1X2ZpbmRfcHBndHRfbW0odmdwdSwgJnBtbDQpOworCWlmICgh bW0pIHsKKwkJZ3Z0X3ZncHVfZXJyKCJmYWlsIHRvIGZpbmQgbW0gZm9yIHBtbDQgMHglbGx4XG4i LCBwbWw0KTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJd2Fsay5tZm5faW5kZXggPSAwOwor CXdhbGsubWZucyA9IE5VTEw7CisJd2Fsay5wdCA9IE5VTEw7CisKKwl3YWxrLm1mbnMgPSBrbWFs bG9jX2FycmF5KG51bV9wYWdlcywKKwkJCXNpemVvZih1bnNpZ25lZCBsb25nKSwgR0ZQX0tFUk5F TCk7CisJaWYgKCF3YWxrLm1mbnMpIHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBmYWlsOwor CX0KKworCXdhbGsucHQgPSAodW5zaWduZWQgbG9uZyAqKV9fZ2V0X2ZyZWVfcGFnZXMoR0ZQX0tF Uk5FTCwgMCk7CisJaWYgKCF3YWxrLnB0KSB7CisJCXJldCA9IC1FTk9NRU07CisJCWdvdG8gZmFp bDsKKwl9CisKKwlpZiAoc2dfYWxsb2NfdGFibGUoJnN0LCBudW1fcGFnZXMsIEdGUF9LRVJORUwp KSB7CisJCXJldCA9IC1FTk9NRU07CisJCWdvdG8gZmFpbDsKKwl9CisKKwlyZXQgPSB3YWxrX3Bt bDRfcmFuZ2UodmdwdSwgcG1sNCwgc3RhcnQsIHN0YXJ0ICsgbGVuZ3RoLCAmd2Fsayk7CisJaWYg KHJldCkKKwkJZ290byBmYWlsX2ZyZWVfc2c7CisKKwlXQVJOX09OKG51bV9wYWdlcyAhPSB3YWxr Lm1mbl9pbmRleCk7CisKKwlmb3JfZWFjaF9zZyhzdC5zZ2wsIHNnLCBudW1fcGFnZXMsIGkpIHsK KwkJc2ctPm9mZnNldCA9IDA7CisJCXNnLT5sZW5ndGggPSBQQUdFX1NJWkU7CisJCXNnX2RtYV9h ZGRyZXNzKHNnKSA9IHdhbGsubWZuc1tpXTsKKwkJc2dfZG1hX2xlbihzZykgPSBQQUdFX1NJWkU7 CisJfQorCisJbWVtc2V0KCZ2bWEsIDAsIHNpemVvZih2bWEpKTsKKwl2bWEubm9kZS5zdGFydCA9 IHN0YXJ0OworCXZtYS5wYWdlcyA9ICZzdDsKKwltbS0+cHBndHQtPnZtLmluc2VydF9lbnRyaWVz KCZtbS0+cHBndHQtPnZtLCAmdm1hLCBjYWNoZV9sZXZlbCwgMCk7CisKK2ZhaWxfZnJlZV9zZzoK KwlzZ19mcmVlX3RhYmxlKCZzdCk7CitmYWlsOgorCWtmcmVlKHdhbGsubWZucyk7CisJZnJlZV9w YWdlKCh1bnNpZ25lZCBsb25nKXdhbGsucHQpOworCisJcmV0dXJuIHJldDsKK30KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2d2dC9ndHQuaAppbmRleCBhMTFiZmVlLi40ZWRhZWQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5o CkBAIC0xNDEsNiArMTQxLDcgQEAgc3RydWN0IGludGVsX2d2dF9wYXJ0aWFsX3B0ZSB7CiAKIHN0 cnVjdCBpbnRlbF92Z3B1X21tIHsKIAllbnVtIGludGVsX2d2dF9tbV90eXBlIHR5cGU7CisJc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0OwogCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1OwogCiAJ c3RydWN0IGtyZWYgcmVmOwpAQCAtMjc3LDQgKzI3OCwxMiBAQCBpbnQgaW50ZWxfdmdwdV9lbXVs YXRlX2dndHRfbW1pb19yZWFkKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LAogaW50IGludGVsX3Zn cHVfZW11bGF0ZV9nZ3R0X21taW9fd3JpdGUoc3RydWN0IGludGVsX3ZncHUgKnZncHUsCiAJdW5z aWduZWQgaW50IG9mZiwgdm9pZCAqcF9kYXRhLCB1bnNpZ25lZCBpbnQgYnl0ZXMpOwogCitpbnQg aW50ZWxfdmdwdV9nMnZfcHZfcHBndHRfYWxsb2NfNGx2bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdw dSwKKwkJdTY0IHBkcHNbXSk7CisKK2ludCBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9jbGVhcl80 bHZsKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LAorCQl1NjQgcGRwc1tdKTsKKworaW50IGludGVs X3ZncHVfZzJ2X3B2X3BwZ3R0X2luc2VydF80bHZsKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LAor CQl1NjQgcGRwc1tdKTsKICNlbmRpZiAvKiBfR1ZUX0dUVF9IXyAqLwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9n dnQvaGFuZGxlcnMuYwppbmRleCA3YTUzMDExLi4xYWUyMWNiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9ndnQvaGFuZGxlcnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9n dnQvaGFuZGxlcnMuYwpAQCAtMTE4Niw3ICsxMTg2LDcgQEAgc3RhdGljIGludCBoYW5kbGVfZzJ2 X25vdGlmaWNhdGlvbihzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwgaW50IG5vdGlmaWNhdGlvbikK IAlpbnRlbF9ndnRfZ3R0X3R5cGVfdCByb290X2VudHJ5X3R5cGUgPSBHVFRfVFlQRV9QUEdUVF9S T09UX0w0X0VOVFJZOwogCXN0cnVjdCBpbnRlbF92Z3B1X21tICptbTsKIAl1NjQgKnBkcHM7Ci0K KwlpbnQgcmV0ID0gMDsKIAlwZHBzID0gKHU2NCAqKSZ2Z3B1X3ZyZWc2NF90KHZncHUsIHZndGlm X3JlZyhwZHBbMF0pKTsKIAogCXN3aXRjaCAobm90aWZpY2F0aW9uKSB7CkBAIC0xMTk5LDYgKzEx OTksMTUgQEAgc3RhdGljIGludCBoYW5kbGVfZzJ2X25vdGlmaWNhdGlvbihzdHJ1Y3QgaW50ZWxf dmdwdSAqdmdwdSwgaW50IG5vdGlmaWNhdGlvbikKIAljYXNlIFZHVF9HMlZfUFBHVFRfTDNfUEFH RV9UQUJMRV9ERVNUUk9ZOgogCWNhc2UgVkdUX0cyVl9QUEdUVF9MNF9QQUdFX1RBQkxFX0RFU1RS T1k6CiAJCXJldHVybiBpbnRlbF92Z3B1X3B1dF9wcGd0dF9tbSh2Z3B1LCBwZHBzKTsKKwljYXNl IFZHVF9HMlZfUFBHVFRfTDRfQUxMT0M6CisJCXJldCA9IGludGVsX3ZncHVfZzJ2X3B2X3BwZ3R0 X2FsbG9jXzRsdmwodmdwdSwgcGRwcyk7CisJCQlicmVhazsKKwljYXNlIFZHVF9HMlZfUFBHVFRf TDRfSU5TRVJUOgorCQlyZXQgPSBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9pbnNlcnRfNGx2bCh2 Z3B1LCBwZHBzKTsKKwkJYnJlYWs7CisJY2FzZSBWR1RfRzJWX1BQR1RUX0w0X0NMRUFSOgorCQly ZXQgPSBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9jbGVhcl80bHZsKHZncHUsIHBkcHMpOworCQli cmVhazsKIAljYXNlIFZHVF9HMlZfRVhFQ0xJU1RfQ09OVEVYVF9DUkVBVEU6CiAJY2FzZSBWR1Rf RzJWX0VYRUNMSVNUX0NPTlRFWFRfREVTVFJPWToKIAljYXNlIDE6CS8qIFJlbW92ZSB0aGlzIGlu IGd1ZXN0IGRyaXZlci4gKi8KQEAgLTEyMDYsNyArMTIxNSw3IEBAIHN0YXRpYyBpbnQgaGFuZGxl X2cydl9ub3RpZmljYXRpb24oc3RydWN0IGludGVsX3ZncHUgKnZncHUsIGludCBub3RpZmljYXRp b24pCiAJZGVmYXVsdDoKIAkJZ3Z0X3ZncHVfZXJyKCJJbnZhbGlkIFBWIG5vdGlmaWNhdGlvbiAl ZFxuIiwgbm90aWZpY2F0aW9uKTsKIAl9Ci0JcmV0dXJuIDA7CisJcmV0dXJuIHJldDsKIH0KIAog c3RhdGljIGludCBzZW5kX2Rpc3BsYXlfcmVhZHlfdWV2ZW50KHN0cnVjdCBpbnRlbF92Z3B1ICp2 Z3B1LCBpbnQgcmVhZHkpCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==