From: Xiaolin Zhang Subject: [PATCH v3 8/8] drm/i915/gvt: GVTg support ppgtt pvmmio optimization Date: Tue, 13 Nov 2018 16:35:20 +0800 Message-ID: <1542098120-29684-9-git-send-email-xiaolin.zhang@intel.com> References: <1542098120-29684-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: <1542098120-29684-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: Zhiyuan Lv , Hang Yuan , Fei Jiang List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBoYW5kbGVzIHBwZ3R0IHVwZGF0ZSBmcm9tIGcydiBub3RpZmljYXRpb24uCgpJ dCByZWFkIG91dCBwcGd0dCBwdGUgZW50cmllcyBmcm9tIGd1ZXN0IHB0ZSB0YWJsZXMgcGFnZSBh bmQKY29udmVydCB0aGVtIHRvIGhvc3QgcGZucy4KCkl0IGNyZWF0ZXMgbG9jYWwgcHBndHQgdGFi bGVzIGFuZCBpbnNlcnQgdGhlIGNvbnRlbnQgcGFnZXMKaW50byB0aGUgbG9jYWwgcHBndHQgdGFi bGVzIGRpcmVjdGx5LCB3aGljaCBkb2VzIG5vdCB0cmFjawp0aGUgdXNhZ2Ugb2YgZ3Vlc3QgcGFn ZSB0YWJsZSBhbmQgcmVtb3ZlcyB0aGUgY29zdCBvZiB3cml0ZQpwcm90ZWN0aW9uIGZyb20gdGhl IG9yaWdpbmFsIHNoYWRvdyBwYWdlIG1lY2hhbnNpbS4KCnYwOiBSRkMKdjE6IHJlYmFzZQp2Mjog cmViYXNlCnYzOiByZXBvcnQgcHYgcGdndHQgY2FwIHRvIGd1ZXN0CgpDYzogWmhlbnl1IFdhbmcg PHpoZW55dXdAbGludXguaW50ZWwuY29tPgpDYzogWmhpIFdhbmcgPHpoaS5hLndhbmdAaW50ZWwu Y29tPgpDYzogTWluIEhlIDxtaW4uaGVAaW50ZWwuY29tPgpDYzogRmVpIEppYW5nIDxmZWkuamlh bmdAaW50ZWwuY29tPgpDYzogWmhpcGVuZyBHb25nIDx6aGlwZW5nLmdvbmdAaW50ZWwuY29tPgpD YzogSGFuZyBZdWFuIDxoYW5nLnl1YW5AaW50ZWwuY29tPgpDYzogWmhpeXVhbiBMdiA8emhpeXVh bi5sdkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFhpYW9saW4gWmhhbmcgPHhpYW9saW4uemhh bmdAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYyAgICAgIHwg MzE4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3Z0L2d0dC5oICAgICAgfCAgIDkgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hh bmRsZXJzLmMgfCAgIDkgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYyAgICAgfCAg IDMgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMzM4IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvZ3R0LmMKaW5kZXggMjQwMjM5NS4uNGEwYTIyMSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2d2dC9ndHQuYwpAQCAtMTc0NCw2ICsxNzQ0LDI2IEBAIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxl X2d1ZXN0X3dyaXRlX3BhZ2VfdGFibGVfYnl0ZXMoCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB2 b2lkIGludmFsaWRhdGVfbW1fcHYoc3RydWN0IGludGVsX3ZncHVfbW0gKm1tKQoreworCXN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1ID0gbW0tPnZncHU7CisJc3RydWN0IGludGVsX2d2dCAqZ3Z0ID0g dmdwdS0+Z3Z0OworCXN0cnVjdCBpbnRlbF9ndnRfZ3R0ICpndHQgPSAmZ3Z0LT5ndHQ7CisJc3Ry dWN0IGludGVsX2d2dF9ndHRfcHRlX29wcyAqb3BzID0gZ3R0LT5wdGVfb3BzOworCXN0cnVjdCBp bnRlbF9ndnRfZ3R0X2VudHJ5IHNlOworCisJaTkxNV9wcGd0dF9jbG9zZSgmbW0tPnBwZ3R0LT52 bSk7CisJaTkxNV9wcGd0dF9wdXQobW0tPnBwZ3R0KTsKKworCXBwZ3R0X2dldF9zaGFkb3dfcm9v dF9lbnRyeShtbSwgJnNlLCAwKTsKKwlpZiAoIW9wcy0+dGVzdF9wcmVzZW50KCZzZSkpCisJCXJl dHVybjsKKwlzZS52YWw2NCA9IDA7CisJcHBndHRfc2V0X3NoYWRvd19yb290X2VudHJ5KG1tLCAm c2UsIDApOworCisJbW0tPnBwZ3R0X21tLnNoYWRvd2VkICA9IGZhbHNlOworfQorCiBzdGF0aWMg dm9pZCBpbnZhbGlkYXRlX3BwZ3R0X21tKHN0cnVjdCBpbnRlbF92Z3B1X21tICptbSkKIHsKIAlz dHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSA9IG1tLT52Z3B1OwpAQCAtMTc1Niw2ICsxNzc2LDExIEBA IHN0YXRpYyB2b2lkIGludmFsaWRhdGVfcHBndHRfbW0oc3RydWN0IGludGVsX3ZncHVfbW0gKm1t KQogCWlmICghbW0tPnBwZ3R0X21tLnNoYWRvd2VkKQogCQlyZXR1cm47CiAKKwlpZiAoVkdQVV9Q Vk1NSU8obW0tPnZncHUsIFBWTU1JT19QUEdUVF9VUERBVEUpKSB7CisJCWludmFsaWRhdGVfbW1f cHYobW0pOworCQlyZXR1cm47CisJfQorCiAJZm9yIChpbmRleCA9IDA7IGluZGV4IDwgQVJSQVlf U0laRShtbS0+cHBndHRfbW0uc2hhZG93X3BkcHMpOyBpbmRleCsrKSB7CiAJCXBwZ3R0X2dldF9z aGFkb3dfcm9vdF9lbnRyeShtbSwgJnNlLCBpbmRleCk7CiAKQEAgLTE3NzMsNiArMTc5OCwyNiBA QCBzdGF0aWMgdm9pZCBpbnZhbGlkYXRlX3BwZ3R0X21tKHN0cnVjdCBpbnRlbF92Z3B1X21tICpt bSkKIAltbS0+cHBndHRfbW0uc2hhZG93ZWQgPSBmYWxzZTsKIH0KIAorc3RhdGljIGludCBzaGFk b3dfbW1fcHYoc3RydWN0IGludGVsX3ZncHVfbW0gKm1tKQoreworCXN0cnVjdCBpbnRlbF92Z3B1 ICp2Z3B1ID0gbW0tPnZncHU7CisJc3RydWN0IGludGVsX2d2dCAqZ3Z0ID0gdmdwdS0+Z3Z0Owor CXN0cnVjdCBpbnRlbF9ndnRfZ3R0X2VudHJ5IHNlOworCisJbW0tPnBwZ3R0ID0gaTkxNV9wcGd0 dF9jcmVhdGUoZ3Z0LT5kZXZfcHJpdiwgTlVMTCk7CisJaWYgKElTX0VSUihtbS0+cHBndHQpKSB7 CisJCWd2dF92Z3B1X2VycigiZmFpbCB0byBjcmVhdGUgcHBndHQgZm9yIHBkcCAweCVsbHhcbiIs CisJCQkJcHhfZG1hKCZtbS0+cHBndHQtPnBtbDQpKTsKKwkJcmV0dXJuIFBUUl9FUlIobW0tPnBw Z3R0KTsKKwl9CisKKwlzZS50eXBlID0gR1RUX1RZUEVfUFBHVFRfUk9PVF9MNF9FTlRSWTsKKwlz ZS52YWw2NCA9IHB4X2RtYSgmbW0tPnBwZ3R0LT5wbWw0KTsKKwlwcGd0dF9zZXRfc2hhZG93X3Jv b3RfZW50cnkobW0sICZzZSwgMCk7CisJbW0tPnBwZ3R0X21tLnNoYWRvd2VkICA9IHRydWU7CisK KwlyZXR1cm4gMDsKK30KIAogc3RhdGljIGludCBzaGFkb3dfcHBndHRfbW0oc3RydWN0IGludGVs X3ZncHVfbW0gKm1tKQogewpAQCAtMTc4Nyw2ICsxODMyLDkgQEAgc3RhdGljIGludCBzaGFkb3df cHBndHRfbW0oc3RydWN0IGludGVsX3ZncHVfbW0gKm1tKQogCWlmIChtbS0+cHBndHRfbW0uc2hh ZG93ZWQpCiAJCXJldHVybiAwOwogCisJaWYgKFZHUFVfUFZNTUlPKG1tLT52Z3B1LCBQVk1NSU9f UFBHVFRfVVBEQVRFKSkKKwkJcmV0dXJuIHNoYWRvd19tbV9wdihtbSk7CisKIAltbS0+cHBndHRf bW0uc2hhZG93ZWQgPSB0cnVlOwogCiAJZm9yIChpbmRleCA9IDA7IGluZGV4IDwgQVJSQVlfU0la RShtbS0+cHBndHRfbW0uZ3Vlc3RfcGRwcyk7IGluZGV4KyspIHsKQEAgLTI3NjYsMyArMjgxNCwy NzMgQEAgdm9pZCBpbnRlbF92Z3B1X3Jlc2V0X2d0dChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSkK IAlpbnRlbF92Z3B1X2Rlc3Ryb3lfYWxsX3BwZ3R0X21tKHZncHUpOwogCWludGVsX3ZncHVfcmVz ZXRfZ2d0dCh2Z3B1LCB0cnVlKTsKIH0KKworaW50IGludGVsX3ZncHVfZzJ2X3B2X3BwZ3R0X2Fs bG9jXzRsdmwoc3RydWN0IGludGVsX3ZncHUgKnZncHUsCisJCXU2NCBwZHBzW10pCit7CisJc3Ry dWN0IGludGVsX3ZncHVfbW0gKm1tOworCWludCByZXQgPSAwOworCXUzMiBvZmZzZXQ7CisJc3Ry dWN0IHB2X3BwZ3R0X3VwZGF0ZSBwdl9wcGd0dDsKKworCW9mZnNldCA9IG9mZnNldG9mKHN0cnVj dCBndnRfc2hhcmVkX3BhZ2UsIHB2X3BwZ3R0KTsKKwlpbnRlbF9ndnRfcmVhZF9zaGFyZWRfcGFn ZSh2Z3B1LCBvZmZzZXQsICZwdl9wcGd0dCwgc2l6ZW9mKHB2X3BwZ3R0KSk7CisKKwltbSA9IGlu dGVsX3ZncHVfZmluZF9wcGd0dF9tbSh2Z3B1LCAmcHZfcHBndHQucGRwKTsKKwlpZiAoIW1tKSB7 CisJCWd2dF92Z3B1X2VycigiZmFpbGVkIHRvIGZpbmQgcGRwIDB4JWxseFxuIiwgcHZfcHBndHQu cGRwKTsKKwkJcmV0ID0gLUVJTlZBTDsKKwl9IGVsc2UgeworCQlyZXQgPSBtbS0+cHBndHQtPnZt LmFsbG9jYXRlX3ZhX3JhbmdlKCZtbS0+cHBndHQtPnZtLAorCQkJcHZfcHBndHQuc3RhcnQsIHB2 X3BwZ3R0Lmxlbmd0aCk7CisJCWlmIChyZXQpCisJCQlndnRfdmdwdV9lcnIoImZhaWxlZCB0byBh bGxvYyAlbGx4XG4iLCBwdl9wcGd0dC5wZHApOworCX0KKworCXJldHVybiByZXQ7Cit9CisKK2lu dCBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9jbGVhcl80bHZsKHN0cnVjdCBpbnRlbF92Z3B1ICp2 Z3B1LAorCQl1NjQgcGRwc1tdKQoreworCXN0cnVjdCBpbnRlbF92Z3B1X21tICptbTsKKwlpbnQg cmV0ID0gMDsKKwl1MzIgb2Zmc2V0OworCXN0cnVjdCBwdl9wcGd0dF91cGRhdGUgcHZfcHBndHQ7 CisKKwlvZmZzZXQgPSBvZmZzZXRvZihzdHJ1Y3QgZ3Z0X3NoYXJlZF9wYWdlLCBwdl9wcGd0dCk7 CisJaW50ZWxfZ3Z0X3JlYWRfc2hhcmVkX3BhZ2UodmdwdSwgb2Zmc2V0LCAmcHZfcHBndHQsIHNp emVvZihwdl9wcGd0dCkpOworCW1tID0gaW50ZWxfdmdwdV9maW5kX3BwZ3R0X21tKHZncHUsICZw dl9wcGd0dC5wZHApOworCWlmICghbW0pIHsKKwkJZ3Z0X3ZncHVfZXJyKCJmYWlsZWQgdG8gZmlu ZCBwZHAgMHglbGx4XG4iLCBwdl9wcGd0dC5wZHApOworCQlyZXQgPSAtRUlOVkFMOworCX0gZWxz ZSB7CisJCW1tLT5wcGd0dC0+dm0uY2xlYXJfcmFuZ2UoJm1tLT5wcGd0dC0+dm0sCisJCQlwdl9w cGd0dC5zdGFydCwgcHZfcHBndHQubGVuZ3RoKTsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorCisj ZGVmaW5lIEdFTjhfUE1MNEVfU0laRQkJKDFVTCA8PCBHRU44X1BNTDRFX1NISUZUKQorI2RlZmlu ZSBHRU44X1BNTDRFX1NJWkVfTUFTSwkofihHRU44X1BNTDRFX1NJWkUgLSAxKSkKKyNkZWZpbmUg R0VOOF9QRFBFX1NJWkUJCSgxVUwgPDwgR0VOOF9QRFBFX1NISUZUKQorI2RlZmluZSBHRU44X1BE UEVfU0laRV9NQVNLCSh+KEdFTjhfUERQRV9TSVpFIC0gMSkpCisjZGVmaW5lIEdFTjhfUERFX1NJ WkUJCSgxVUwgPDwgR0VOOF9QREVfU0hJRlQpCisjZGVmaW5lIEdFTjhfUERFX1NJWkVfTUFTSwko fihHRU44X1BERV9TSVpFIC0gMSkpCisKKyNkZWZpbmUgcG1sNF9hZGRyX2VuZChhZGRyLCBlbmQp CQkJCQlcCisoewl1bnNpZ25lZCBsb25nIF9fYm91bmRhcnkgPSBcCisJCQkoKGFkZHIpICsgR0VO OF9QTUw0RV9TSVpFKSAmIEdFTjhfUE1MNEVfU0laRV9NQVNLOyBcCisJKF9fYm91bmRhcnkgPCAo ZW5kKSkgPyBfX2JvdW5kYXJ5IDogKGVuZCk7CQlcCit9KQorCisjZGVmaW5lIHBkcF9hZGRyX2Vu ZChhZGRyLCBlbmQpCQkJCQkJXAorKHsJdW5zaWduZWQgbG9uZyBfX2JvdW5kYXJ5ID0gXAorCQkJ KChhZGRyKSArIEdFTjhfUERQRV9TSVpFKSAmIEdFTjhfUERQRV9TSVpFX01BU0s7IFwKKwkoX19i b3VuZGFyeSA8IChlbmQpKSA/IF9fYm91bmRhcnkgOiAoZW5kKTsJCVwKK30pCisKKyNkZWZpbmUg cGRfYWRkcl9lbmQoYWRkciwgZW5kKQkJCQkJCVwKKyh7CXVuc2lnbmVkIGxvbmcgX19ib3VuZGFy eSA9IFwKKwkJCSgoYWRkcikgKyBHRU44X1BERV9TSVpFKSAmIEdFTjhfUERFX1NJWkVfTUFTSzsJ XAorCShfX2JvdW5kYXJ5IDwgKGVuZCkpID8gX19ib3VuZGFyeSA6IChlbmQpOwkJXAorfSkKKwor c3RydWN0IHBwZ3R0X3dhbGsgeworCXVuc2lnbmVkIGxvbmcgKm1mbnM7CisJaW50IG1mbl9pbmRl eDsKKwl1bnNpZ25lZCBsb25nICpwdDsKK307CisKK3N0YXRpYyBpbnQgd2Fsa19wdF9yYW5nZShz dHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwgdTY0IHB0LAorCQkJCXU2NCBzdGFydCwgdTY0IGVuZCwg c3RydWN0IHBwZ3R0X3dhbGsgKndhbGspCit7CisJY29uc3Qgc3RydWN0IGludGVsX2d2dF9kZXZp Y2VfaW5mbyAqaW5mbyA9ICZ2Z3B1LT5ndnQtPmRldmljZV9pbmZvOworCXN0cnVjdCBpbnRlbF9n dnRfZ3R0X2dtYV9vcHMgKmdtYV9vcHMgPSB2Z3B1LT5ndnQtPmd0dC5nbWFfb3BzOworCXVuc2ln bmVkIGxvbmcgc3RhcnRfaW5kZXgsIGVuZF9pbmRleDsKKwlpbnQgcmV0OworCWludCBpOworCXVu c2lnbmVkIGxvbmcgbWZuLCBnZm47CisKKwlzdGFydF9pbmRleCA9IGdtYV9vcHMtPmdtYV90b19w dGVfaW5kZXgoc3RhcnQpOworCWVuZF9pbmRleCA9ICgoZW5kIC0gc3RhcnQpID4+IFBBR0VfU0hJ RlQpICsgc3RhcnRfaW5kZXg7CisKKwlyZXQgPSBpbnRlbF9ndnRfaHlwZXJ2aXNvcl9yZWFkX2dw YSh2Z3B1LAorCQkocHQgJiBQQUdFX01BU0spICsgKHN0YXJ0X2luZGV4IDw8IGluZm8tPmd0dF9l bnRyeV9zaXplX3NoaWZ0KSwKKwkJd2Fsay0+cHQgKyBzdGFydF9pbmRleCwKKwkJKGVuZF9pbmRl eCAtIHN0YXJ0X2luZGV4KSA8PCBpbmZvLT5ndHRfZW50cnlfc2l6ZV9zaGlmdCk7CisJaWYgKHJl dCkgeworCQlndnRfdmdwdV9lcnIoImZhaWwgdG8gcmVhZCBncGEgJWxseFxuIiwgcHQpOworCQly ZXR1cm4gcmV0OworCX0KKworCWZvciAoaSA9IHN0YXJ0X2luZGV4OyBpIDwgZW5kX2luZGV4OyBp KyspIHsKKwkJZ2ZuID0gd2Fsay0+cHRbaV0gPj4gUEFHRV9TSElGVDsKKwkJbWZuID0gaW50ZWxf Z3Z0X2h5cGVydmlzb3JfZ2ZuX3RvX21mbih2Z3B1LCBnZm4pOworCQlpZiAobWZuID09IElOVEVM X0dWVF9JTlZBTElEX0FERFIpIHsKKwkJCWd2dF92Z3B1X2VycigiZmFpbCB0byB0cmFuc2xhdGUg Z2ZuOiAweCVseFxuIiwgZ2ZuKTsKKwkJCXJldHVybiAtRU5YSU87CisJCX0KKwkJd2Fsay0+bWZu c1t3YWxrLT5tZm5faW5kZXgrK10gPSBtZm4gPDwgUEFHRV9TSElGVDsKKwl9CisKKwlyZXR1cm4g MDsKK30KKworCitzdGF0aWMgaW50IHdhbGtfcGRfcmFuZ2Uoc3RydWN0IGludGVsX3ZncHUgKnZn cHUsIHU2NCBwZCwKKwkJCQl1NjQgc3RhcnQsIHU2NCBlbmQsIHN0cnVjdCBwcGd0dF93YWxrICp3 YWxrKQoreworCWNvbnN0IHN0cnVjdCBpbnRlbF9ndnRfZGV2aWNlX2luZm8gKmluZm8gPSAmdmdw dS0+Z3Z0LT5kZXZpY2VfaW5mbzsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9nbWFfb3BzICpnbWFf b3BzID0gdmdwdS0+Z3Z0LT5ndHQuZ21hX29wczsKKwl1bnNpZ25lZCBsb25nIGluZGV4OworCXU2 NCBwdCwgbmV4dDsKKwlpbnQgcmV0ICA9IDA7CisKKwlkbyB7CisJCWluZGV4ID0gZ21hX29wcy0+ Z21hX3RvX3BkZV9pbmRleChzdGFydCk7CisKKwkJcmV0ID0gaW50ZWxfZ3Z0X2h5cGVydmlzb3Jf cmVhZF9ncGEodmdwdSwKKwkJCShwZCAmIFBBR0VfTUFTSykgKyAoaW5kZXggPDwKKwkJCWluZm8t Pmd0dF9lbnRyeV9zaXplX3NoaWZ0KSwgJnB0LCA4KTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiBy ZXQ7CisJCW5leHQgPSBwZF9hZGRyX2VuZChzdGFydCwgZW5kKTsKKwkJd2Fsa19wdF9yYW5nZSh2 Z3B1LCBwdCwgc3RhcnQsIG5leHQsIHdhbGspOworCisJCXN0YXJ0ID0gbmV4dDsKKwl9IHdoaWxl IChzdGFydCAhPSBlbmQpOworCisJcmV0dXJuIHJldDsKK30KKworCitzdGF0aWMgaW50IHdhbGtf cGRwX3JhbmdlKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCB1NjQgcGRwLAorCQkJCSAgdTY0IHN0 YXJ0LCB1NjQgZW5kLCBzdHJ1Y3QgcHBndHRfd2FsayAqd2FsaykKK3sKKwljb25zdCBzdHJ1Y3Qg aW50ZWxfZ3Z0X2RldmljZV9pbmZvICppbmZvID0gJnZncHUtPmd2dC0+ZGV2aWNlX2luZm87CisJ c3RydWN0IGludGVsX2d2dF9ndHRfZ21hX29wcyAqZ21hX29wcyA9IHZncHUtPmd2dC0+Z3R0Lmdt YV9vcHM7CisJdW5zaWduZWQgbG9uZyBpbmRleDsKKwl1NjQgcGQsIG5leHQ7CisJaW50IHJldCAg PSAwOworCisJZG8geworCQlpbmRleCA9IGdtYV9vcHMtPmdtYV90b19sNF9wZHBfaW5kZXgoc3Rh cnQpOworCisJCXJldCA9IGludGVsX2d2dF9oeXBlcnZpc29yX3JlYWRfZ3BhKHZncHUsCisJCQko cGRwICYgUEFHRV9NQVNLKSArIChpbmRleCA8PAorCQkJaW5mby0+Z3R0X2VudHJ5X3NpemVfc2hp ZnQpLCAmcGQsIDgpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwkJbmV4dCA9IHBkcF9h ZGRyX2VuZChzdGFydCwgZW5kKTsKKwkJd2Fsa19wZF9yYW5nZSh2Z3B1LCBwZCwgc3RhcnQsIG5l eHQsIHdhbGspOworCQlzdGFydCA9IG5leHQ7CisJfSB3aGlsZSAoc3RhcnQgIT0gZW5kKTsKKwor CXJldHVybiByZXQ7Cit9CisKKworc3RhdGljIGludCB3YWxrX3BtbDRfcmFuZ2Uoc3RydWN0IGlu dGVsX3ZncHUgKnZncHUsIHU2NCBwbWw0LAorCQkJCXU2NCBzdGFydCwgdTY0IGVuZCwgc3RydWN0 IHBwZ3R0X3dhbGsgKndhbGspCit7CisJY29uc3Qgc3RydWN0IGludGVsX2d2dF9kZXZpY2VfaW5m byAqaW5mbyA9ICZ2Z3B1LT5ndnQtPmRldmljZV9pbmZvOworCXN0cnVjdCBpbnRlbF9ndnRfZ3R0 X2dtYV9vcHMgKmdtYV9vcHMgPSB2Z3B1LT5ndnQtPmd0dC5nbWFfb3BzOworCXVuc2lnbmVkIGxv bmcgaW5kZXg7CisJdTY0IHBkcCwgbmV4dDsKKwlpbnQgcmV0ICA9IDA7CisKKwlkbyB7CisJCWlu ZGV4ID0gZ21hX29wcy0+Z21hX3RvX3BtbDRfaW5kZXgoc3RhcnQpOworCQlyZXQgPSBpbnRlbF9n dnRfaHlwZXJ2aXNvcl9yZWFkX2dwYSh2Z3B1LAorCQkJKHBtbDQgJiBQQUdFX01BU0spICsgKGlu ZGV4IDw8CisJCQlpbmZvLT5ndHRfZW50cnlfc2l6ZV9zaGlmdCksICZwZHAsIDgpOworCQlpZiAo cmV0KQorCQkJcmV0dXJuIHJldDsKKwkJbmV4dCA9IHBtbDRfYWRkcl9lbmQoc3RhcnQsIGVuZCk7 CisJCXdhbGtfcGRwX3JhbmdlKHZncHUsIHBkcCwgc3RhcnQsIG5leHQsIHdhbGspOworCQlzdGFy dCA9IG5leHQ7CisJfSB3aGlsZSAoc3RhcnQgIT0gZW5kKTsKKworCXJldHVybiByZXQ7Cit9CisK K2ludCBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaW50ZWxfdmdw dSAqdmdwdSwKKwkJdTY0IHBkcHNbXSkKK3sKKwlzdHJ1Y3QgaW50ZWxfdmdwdV9tbSAqbW07CisJ dTY0IHBtbDQsIHN0YXJ0LCBsZW5ndGg7CisJdTMyIGNhY2hlX2xldmVsOworCWludCByZXQgPSAw OworCXN0cnVjdCBzZ190YWJsZSBzdDsKKwlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnID0gTlVMTDsK KwlpbnQgbnVtX3BhZ2VzOworCXN0cnVjdCBpOTE1X3ZtYSB2bWE7CisJc3RydWN0IHBwZ3R0X3dh bGsgd2FsazsKKwlpbnQgaTsKKwl1MzIgb2Zmc2V0OworCXN0cnVjdCBwdl9wcGd0dF91cGRhdGUg cHZfcHBndHQ7CisKKwlvZmZzZXQgPSBvZmZzZXRvZihzdHJ1Y3QgZ3Z0X3NoYXJlZF9wYWdlLCBw dl9wcGd0dCk7CisJaW50ZWxfZ3Z0X3JlYWRfc2hhcmVkX3BhZ2UodmdwdSwgb2Zmc2V0LCAmcHZf cHBndHQsIHNpemVvZihwdl9wcGd0dCkpOworCXBtbDQgPSBwdl9wcGd0dC5wZHA7CisJc3RhcnQg PSBwdl9wcGd0dC5zdGFydDsKKwlsZW5ndGggPSBwdl9wcGd0dC5sZW5ndGg7CisJY2FjaGVfbGV2 ZWwgPSBwdl9wcGd0dC5jYWNoZV9sZXZlbDsKKwludW1fcGFnZXMgPSBsZW5ndGggPj4gUEFHRV9T SElGVDsKKworCW1tID0gaW50ZWxfdmdwdV9maW5kX3BwZ3R0X21tKHZncHUsICZwbWw0KTsKKwlp ZiAoIW1tKSB7CisJCWd2dF92Z3B1X2VycigiZmFpbCB0byBmaW5kIG1tIGZvciBwbWw0IDB4JWxs eFxuIiwgcG1sNCk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCXdhbGsubWZuX2luZGV4ID0g MDsKKwl3YWxrLm1mbnMgPSBOVUxMOworCXdhbGsucHQgPSBOVUxMOworCisJd2Fsay5tZm5zID0g a21hbGxvY19hcnJheShudW1fcGFnZXMsCisJCQlzaXplb2YodW5zaWduZWQgbG9uZyksIEdGUF9L RVJORUwpOworCWlmICghd2Fsay5tZm5zKSB7CisJCXJldCA9IC1FTk9NRU07CisJCWdvdG8gZmFp bDsKKwl9CisKKwl3YWxrLnB0ID0gKHVuc2lnbmVkIGxvbmcgKilfX2dldF9mcmVlX3BhZ2VzKEdG UF9LRVJORUwsIDApOworCWlmICghd2Fsay5wdCkgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3Rv IGZhaWw7CisJfQorCisJaWYgKHNnX2FsbG9jX3RhYmxlKCZzdCwgbnVtX3BhZ2VzLCBHRlBfS0VS TkVMKSkgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIGZhaWw7CisJfQorCisJcmV0ID0gd2Fs a19wbWw0X3JhbmdlKHZncHUsIHBtbDQsIHN0YXJ0LCBzdGFydCArIGxlbmd0aCwgJndhbGspOwor CWlmIChyZXQpCisJCWdvdG8gZmFpbF9mcmVlX3NnOworCisJV0FSTl9PTihudW1fcGFnZXMgIT0g d2Fsay5tZm5faW5kZXgpOworCisJZm9yX2VhY2hfc2coc3Quc2dsLCBzZywgbnVtX3BhZ2VzLCBp KSB7CisJCXNnLT5vZmZzZXQgPSAwOworCQlzZy0+bGVuZ3RoID0gUEFHRV9TSVpFOworCQlzZ19k bWFfYWRkcmVzcyhzZykgPSB3YWxrLm1mbnNbaV07CisJCXNnX2RtYV9sZW4oc2cpID0gUEFHRV9T SVpFOworCX0KKworCW1lbXNldCgmdm1hLCAwLCBzaXplb2Yodm1hKSk7CisJdm1hLm5vZGUuc3Rh cnQgPSBzdGFydDsKKwl2bWEucGFnZXMgPSAmc3Q7CisJbW0tPnBwZ3R0LT52bS5pbnNlcnRfZW50 cmllcygmbW0tPnBwZ3R0LT52bSwgJnZtYSwgY2FjaGVfbGV2ZWwsIDApOworCitmYWlsX2ZyZWVf c2c6CisJc2dfZnJlZV90YWJsZSgmc3QpOworZmFpbDoKKwlrZnJlZSh3YWxrLm1mbnMpOworCWZy ZWVfcGFnZSgodW5zaWduZWQgbG9uZyl3YWxrLnB0KTsKKworCXJldHVybiByZXQ7Cit9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9ndnQvZ3R0LmgKaW5kZXggN2E5YjM2MS4uYjI1NTEwZiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9n dHQuaApAQCAtMTM1LDYgKzEzNSw3IEBAIGVudW0gaW50ZWxfZ3Z0X21tX3R5cGUgewogCiBzdHJ1 Y3QgaW50ZWxfdmdwdV9tbSB7CiAJZW51bSBpbnRlbF9ndnRfbW1fdHlwZSB0eXBlOworCXN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dDsKIAlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdTsKIAogCXN0 cnVjdCBrcmVmIHJlZjsKQEAgLTI3Miw0ICsyNzMsMTIgQEAgaW50IGludGVsX3ZncHVfZW11bGF0 ZV9nZ3R0X21taW9fcmVhZChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKIGludCBpbnRlbF92Z3B1 X2VtdWxhdGVfZ2d0dF9tbWlvX3dyaXRlKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LAogCXVuc2ln bmVkIGludCBvZmYsIHZvaWQgKnBfZGF0YSwgdW5zaWduZWQgaW50IGJ5dGVzKTsKIAoraW50IGlu dGVsX3ZncHVfZzJ2X3B2X3BwZ3R0X2FsbG9jXzRsdmwoc3RydWN0IGludGVsX3ZncHUgKnZncHUs CisJCXU2NCBwZHBzW10pOworCitpbnQgaW50ZWxfdmdwdV9nMnZfcHZfcHBndHRfY2xlYXJfNGx2 bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKKwkJdTY0IHBkcHNbXSk7CisKK2ludCBpbnRlbF92 Z3B1X2cydl9wdl9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKKwkJ dTY0IHBkcHNbXSk7CiAjZW5kaWYgLyogX0dWVF9HVFRfSF8gKi8KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2d2dC9oYW5kbGVycy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0 L2hhbmRsZXJzLmMKaW5kZXggMTY1OWJkMS4uYmRkZTY3YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0 L2hhbmRsZXJzLmMKQEAgLTEyNDEsNiArMTI0MSwxNSBAQCBzdGF0aWMgaW50IGhhbmRsZV9nMnZf bm90aWZpY2F0aW9uKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCBpbnQgbm90aWZpY2F0aW9uKQog CWNhc2UgVkdUX0cyVl9FTFNQX1NVQk1JVDoKIAkJcmV0ID0gaW50ZWxfdmdwdV9nMnZfcHZfZWxz cF9zdWJtaXQodmdwdSk7CiAJCWJyZWFrOworCWNhc2UgVkdUX0cyVl9QUEdUVF9MNF9BTExPQzoK KwkJcmV0ID0gaW50ZWxfdmdwdV9nMnZfcHZfcHBndHRfYWxsb2NfNGx2bCh2Z3B1LCBwZHBzKTsK KwkJCWJyZWFrOworCWNhc2UgVkdUX0cyVl9QUEdUVF9MNF9JTlNFUlQ6CisJCXJldCA9IGludGVs X3ZncHVfZzJ2X3B2X3BwZ3R0X2luc2VydF80bHZsKHZncHUsIHBkcHMpOworCQlicmVhazsKKwlj YXNlIFZHVF9HMlZfUFBHVFRfTDRfQ0xFQVI6CisJCXJldCA9IGludGVsX3ZncHVfZzJ2X3B2X3Bw Z3R0X2NsZWFyXzRsdmwodmdwdSwgcGRwcyk7CisJCWJyZWFrOwogCWNhc2UgVkdUX0cyVl9FWEVD TElTVF9DT05URVhUX0NSRUFURToKIAljYXNlIFZHVF9HMlZfRVhFQ0xJU1RfQ09OVEVYVF9ERVNU Uk9ZOgogCWNhc2UgMToJLyogUmVtb3ZlIHRoaXMgaW4gZ3Vlc3QgZHJpdmVyLiAqLwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d2dC92Z3B1LmMKaW5kZXggZjk4YjU5MS4uMmI4NGRiYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv dmdwdS5jCkBAIC00OSw3ICs0OSw4IEBAIHZvaWQgcG9wdWxhdGVfcHZpbmZvX3BhZ2Uoc3RydWN0 IGludGVsX3ZncHUgKnZncHUpCiAJdmdwdV92cmVnX3QodmdwdSwgdmd0aWZfcmVnKHZndF9jYXBz KSkgfD0gVkdUX0NBUFNfSFVHRV9HVFQ7CiAJdmdwdV92cmVnX3QodmdwdSwgdmd0aWZfcmVnKHZn dF9jYXBzKSkgfD0gVkdUX0NBUFNfUFZNTUlPOwogCi0JdmdwdV92cmVnX3QodmdwdSwgdmd0aWZf cmVnKHB2bW1pb19jYXBzKSkgPSBQVk1NSU9fRUxTUF9TVUJNSVQ7CisJdmdwdV92cmVnX3Qodmdw dSwgdmd0aWZfcmVnKHB2bW1pb19jYXBzKSkgPSBQVk1NSU9fRUxTUF9TVUJNSVQgfAorCQkJUFZN TUlPX1BQR1RUX1VQREFURTsKIAogCXZncHVfdnJlZ190KHZncHUsIHZndGlmX3JlZyhhdmFpbF9y cy5tYXBwYWJsZV9nbWFkci5iYXNlKSkgPQogCQl2Z3B1X2FwZXJ0dXJlX2dtYWRyX2Jhc2Uodmdw dSk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==