From: Xiaolin Zhang Subject: [PATCH v4 7/8] drm/i915/gvt: GVTg support ppgtt pv optimization Date: Fri, 29 Mar 2019 09:32:43 -0400 Message-ID: <1553866364-111114-8-git-send-email-xiaolin.zhang@intel.com> References: <1553866364-111114-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: <1553866364-111114-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, zhiyuan.lv@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBoYW5kbGVzIHBwZ3R0IHVwZGF0ZSBmcm9tIGcydiBub3RpZmljYXRpb24uCgpJ dCByZWFkIG91dCBwcGd0dCBwdGUgZW50cmllcyBmcm9tIGd1ZXN0IHB0ZSB0YWJsZXMgcGFnZSBh bmQKY29udmVydCB0aGVtIHRvIGhvc3QgcGZucy4KCkl0IGNyZWF0ZXMgbG9jYWwgcHBndHQgdGFi bGVzIGFuZCBpbnNlcnQgdGhlIGNvbnRlbnQgcGFnZXMKaW50byB0aGUgbG9jYWwgcHBndHQgdGFi bGVzIGRpcmVjdGx5LCB3aGljaCBkb2VzIG5vdCB0cmFjawp0aGUgdXNhZ2Ugb2YgZ3Vlc3QgcGFn ZSB0YWJsZSBhbmQgcmVtb3ZlcyB0aGUgY29zdCBvZiB3cml0ZQpwcm90ZWN0aW9uIGZyb20gdGhl IG9yaWdpbmFsIHNoYWRvdyBwYWdlIG1lY2hhbnNpbS4KCnYwOiBSRkMKdjE6IHJlYmFzZQp2Mjog cmViYXNlCnYzOiByZXBvcnQgcHYgcGdndHQgY2FwIHRvIGd1ZXN0CnY0OiByZW5hbWVkIFZHUFVf UFZNTUlPIHdpdGggVkdQVV9QVkNBUCBmb3IgbmFtZSBjb25zaXN0YW5jZSwgbm8gUFYKc3VwcG9y dCBpZiBnZnggdnRkIGVuYWJsZWQuCgpTaWduZWQtb2ZmLWJ5OiBYaWFvbGluIFpoYW5nIDx4aWFv bGluLnpoYW5nQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMg ICAgICB8IDMxNyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2d2dC9ndHQuaCAgICAgIHwgICA5ICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2d2dC9ndnQuaCAgICAgIHwgICA0ICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9oYW5kbGVy cy5jIHwgIDEyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvdmdwdS5jICAgICB8ICAgMyAr CiA1IGZpbGVzIGNoYW5nZWQsIDM0NCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3Z0L2d0dC5jCmluZGV4IGY0Yzk5MmQuLmYxYzA3ZjAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv Z3R0LmMKQEAgLTE3NDQsNiArMTc0NCwyNSBAQCBzdGF0aWMgaW50IHBwZ3R0X2hhbmRsZV9ndWVz dF93cml0ZV9wYWdlX3RhYmxlX2J5dGVzKAogCXJldHVybiAwOwogfQogCitzdGF0aWMgdm9pZCBp bnZhbGlkYXRlX21tX3B2KHN0cnVjdCBpbnRlbF92Z3B1X21tICptbSkKK3sKKwlzdHJ1Y3QgaW50 ZWxfdmdwdSAqdmdwdSA9IG1tLT52Z3B1OworCXN0cnVjdCBpbnRlbF9ndnQgKmd2dCA9IHZncHUt Pmd2dDsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dCAqZ3R0ID0gJmd2dC0+Z3R0OworCXN0cnVjdCBp bnRlbF9ndnRfZ3R0X3B0ZV9vcHMgKm9wcyA9IGd0dC0+cHRlX29wczsKKwlzdHJ1Y3QgaW50ZWxf Z3Z0X2d0dF9lbnRyeSBzZTsKKworCWk5MTVfcHBndHRfcHV0KG1tLT5wcGd0dCk7CisKKwlwcGd0 dF9nZXRfc2hhZG93X3Jvb3RfZW50cnkobW0sICZzZSwgMCk7CisJaWYgKCFvcHMtPnRlc3RfcHJl c2VudCgmc2UpKQorCQlyZXR1cm47CisJc2UudmFsNjQgPSAwOworCXBwZ3R0X3NldF9zaGFkb3df cm9vdF9lbnRyeShtbSwgJnNlLCAwKTsKKworCW1tLT5wcGd0dF9tbS5zaGFkb3dlZCAgPSBmYWxz ZTsKK30KKwogc3RhdGljIHZvaWQgaW52YWxpZGF0ZV9wcGd0dF9tbShzdHJ1Y3QgaW50ZWxfdmdw dV9tbSAqbW0pCiB7CiAJc3RydWN0IGludGVsX3ZncHUgKnZncHUgPSBtbS0+dmdwdTsKQEAgLTE3 NTYsNiArMTc3NSwxMSBAQCBzdGF0aWMgdm9pZCBpbnZhbGlkYXRlX3BwZ3R0X21tKHN0cnVjdCBp bnRlbF92Z3B1X21tICptbSkKIAlpZiAoIW1tLT5wcGd0dF9tbS5zaGFkb3dlZCkKIAkJcmV0dXJu OwogCisJaWYgKFZHUFVfUFZDQVAobW0tPnZncHUsIFBWX1BQR1RUX1VQREFURSkpIHsKKwkJaW52 YWxpZGF0ZV9tbV9wdihtbSk7CisJCXJldHVybjsKKwl9CisKIAlmb3IgKGluZGV4ID0gMDsgaW5k ZXggPCBBUlJBWV9TSVpFKG1tLT5wcGd0dF9tbS5zaGFkb3dfcGRwcyk7IGluZGV4KyspIHsKIAkJ cHBndHRfZ2V0X3NoYWRvd19yb290X2VudHJ5KG1tLCAmc2UsIGluZGV4KTsKIApAQCAtMTc3Myw2 ICsxNzk3LDI2IEBAIHN0YXRpYyB2b2lkIGludmFsaWRhdGVfcHBndHRfbW0oc3RydWN0IGludGVs X3ZncHVfbW0gKm1tKQogCW1tLT5wcGd0dF9tbS5zaGFkb3dlZCA9IGZhbHNlOwogfQogCitzdGF0 aWMgaW50IHNoYWRvd19tbV9wdihzdHJ1Y3QgaW50ZWxfdmdwdV9tbSAqbW0pCit7CisJc3RydWN0 IGludGVsX3ZncHUgKnZncHUgPSBtbS0+dmdwdTsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0ICpndnQgPSB2 Z3B1LT5ndnQ7CisJc3RydWN0IGludGVsX2d2dF9ndHRfZW50cnkgc2U7CisKKwltbS0+cHBndHQg PSBpOTE1X3BwZ3R0X2NyZWF0ZShndnQtPmRldl9wcml2KTsKKwlpZiAoSVNfRVJSKG1tLT5wcGd0 dCkpIHsKKwkJZ3Z0X3ZncHVfZXJyKCJmYWlsIHRvIGNyZWF0ZSBwcGd0dCBmb3IgcGRwIDB4JWxs eFxuIiwKKwkJCQlweF9kbWEoJm1tLT5wcGd0dC0+cG1sNCkpOworCQlyZXR1cm4gUFRSX0VSUiht bS0+cHBndHQpOworCX0KKworCXNlLnR5cGUgPSBHVFRfVFlQRV9QUEdUVF9ST09UX0w0X0VOVFJZ OworCXNlLnZhbDY0ID0gcHhfZG1hKCZtbS0+cHBndHQtPnBtbDQpOworCXBwZ3R0X3NldF9zaGFk b3dfcm9vdF9lbnRyeShtbSwgJnNlLCAwKTsKKwltbS0+cHBndHRfbW0uc2hhZG93ZWQgID0gdHJ1 ZTsKKworCXJldHVybiAwOworfQogCiBzdGF0aWMgaW50IHNoYWRvd19wcGd0dF9tbShzdHJ1Y3Qg aW50ZWxfdmdwdV9tbSAqbW0pCiB7CkBAIC0xNzg3LDYgKzE4MzEsOSBAQCBzdGF0aWMgaW50IHNo YWRvd19wcGd0dF9tbShzdHJ1Y3QgaW50ZWxfdmdwdV9tbSAqbW0pCiAJaWYgKG1tLT5wcGd0dF9t bS5zaGFkb3dlZCkKIAkJcmV0dXJuIDA7CiAKKwlpZiAoVkdQVV9QVkNBUChtbS0+dmdwdSwgUFZf UFBHVFRfVVBEQVRFKSkKKwkJcmV0dXJuIHNoYWRvd19tbV9wdihtbSk7CisKIAltbS0+cHBndHRf bW0uc2hhZG93ZWQgPSB0cnVlOwogCiAJZm9yIChpbmRleCA9IDA7IGluZGV4IDwgQVJSQVlfU0la RShtbS0+cHBndHRfbW0uZ3Vlc3RfcGRwcyk7IGluZGV4KyspIHsKQEAgLTI3ODcsMyArMjgzNCwy 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 aTkxNS9ndnQvZ3R0LmgKaW5kZXggMzJjNTczYS4uNTcxYTVjNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9n dHQuaApAQCAtMTQxLDYgKzE0MSw3IEBAIHN0cnVjdCBpbnRlbF9ndnRfcGFydGlhbF9wdGUgewog CiBzdHJ1Y3QgaW50ZWxfdmdwdV9tbSB7CiAJZW51bSBpbnRlbF9ndnRfbW1fdHlwZSB0eXBlOwor CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dDsKIAlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdTsK IAogCXN0cnVjdCBrcmVmIHJlZjsKQEAgLTI3Nyw0ICsyNzgsMTIgQEAgaW50IGludGVsX3ZncHVf ZW11bGF0ZV9nZ3R0X21taW9fcmVhZChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKIGludCBpbnRl bF92Z3B1X2VtdWxhdGVfZ2d0dF9tbWlvX3dyaXRlKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LAog CXVuc2lnbmVkIGludCBvZmYsIHZvaWQgKnBfZGF0YSwgdW5zaWduZWQgaW50IGJ5dGVzKTsKIAor aW50IGludGVsX3ZncHVfZzJ2X3B2X3BwZ3R0X2FsbG9jXzRsdmwoc3RydWN0IGludGVsX3ZncHUg KnZncHUsCisJCXU2NCBwZHBzW10pOworCitpbnQgaW50ZWxfdmdwdV9nMnZfcHZfcHBndHRfY2xl YXJfNGx2bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKKwkJdTY0IHBkcHNbXSk7CisKK2ludCBp bnRlbF92Z3B1X2cydl9wdl9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdw dSwKKwkJdTY0IHBkcHNbXSk7CiAjZW5kaWYgLyogX0dWVF9HVFRfSF8gKi8KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndnQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2 dC9ndnQuaAppbmRleCBiMDFhNTRmLi5hN2NlNTkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndnQvZ3Z0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d2dC5oCkBA IC01Myw2ICs1MywxMCBAQAogCiAjZGVmaW5lIEdWVF9NQVhfVkdQVSA4CiAKKyNkZWZpbmUgVkdQ VV9QVkNBUCh2Z3B1LCBjYXApCVwKKwkoKHZncHVfdnJlZ190KHZncHUsIHZndGlmX3JlZyhwdl9j YXBzKSkgJiAoY2FwKSkgXAorCQkJJiYgdmdwdS0+c2hhcmVkX3BhZ2VfZW5hYmxlZCkKKwogc3Ry dWN0IGludGVsX2d2dF9ob3N0IHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXY7CiAJYm9vbCBpbml0aWFs aXplZDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9oYW5kbGVycy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMKaW5kZXggMjhiMzkwYy4uMmI0YzY4 NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2hhbmRsZXJzLmMKQEAgLTExODgsNiArMTE4OCw3IEBA IHN0YXRpYyBpbnQgaGFuZGxlX2cydl9ub3RpZmljYXRpb24oc3RydWN0IGludGVsX3ZncHUgKnZn cHUsIGludCBub3RpZmljYXRpb24pCiAJc3RydWN0IGludGVsX3ZncHVfbW0gKm1tOwogCXU2NCAq cGRwczsKIAl1bnNpZ25lZCBsb25nIGdwYSwgZ2ZuOworCWludCByZXQgPSAwOwogCiAJcGRwcyA9 ICh1NjQgKikmdmdwdV92cmVnNjRfdCh2Z3B1LCB2Z3RpZl9yZWcocGRwWzBdKSk7CiAKQEAgLTEy MTEsNiArMTIxMiwxNSBAQCBzdGF0aWMgaW50IGhhbmRsZV9nMnZfbm90aWZpY2F0aW9uKHN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1LCBpbnQgbm90aWZpY2F0aW9uKQogCQl2Z3B1LT5zaGFyZWRfcGFn ZV9ncGEgPSBncGE7CiAJCXZncHUtPnNoYXJlZF9wYWdlX2VuYWJsZWQgPSB0cnVlOwogCQlicmVh azsKKwljYXNlIFZHVF9HMlZfUFBHVFRfTDRfQUxMT0M6CisJCXJldCA9IGludGVsX3ZncHVfZzJ2 X3B2X3BwZ3R0X2FsbG9jXzRsdmwodmdwdSwgcGRwcyk7CisJCQlicmVhazsKKwljYXNlIFZHVF9H MlZfUFBHVFRfTDRfSU5TRVJUOgorCQlyZXQgPSBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9pbnNl cnRfNGx2bCh2Z3B1LCBwZHBzKTsKKwkJYnJlYWs7CisJY2FzZSBWR1RfRzJWX1BQR1RUX0w0X0NM RUFSOgorCQlyZXQgPSBpbnRlbF92Z3B1X2cydl9wdl9wcGd0dF9jbGVhcl80bHZsKHZncHUsIHBk cHMpOworCQlicmVhazsKIAljYXNlIFZHVF9HMlZfRVhFQ0xJU1RfQ09OVEVYVF9DUkVBVEU6CiAJ Y2FzZSBWR1RfRzJWX0VYRUNMSVNUX0NPTlRFWFRfREVTVFJPWToKIAljYXNlIDE6CS8qIFJlbW92 ZSB0aGlzIGluIGd1ZXN0IGRyaXZlci4gKi8KQEAgLTEyMTgsNyArMTIyOCw3IEBAIHN0YXRpYyBp bnQgaGFuZGxlX2cydl9ub3RpZmljYXRpb24oc3RydWN0IGludGVsX3ZncHUgKnZncHUsIGludCBu b3RpZmljYXRpb24pCiAJZGVmYXVsdDoKIAkJZ3Z0X3ZncHVfZXJyKCJJbnZhbGlkIFBWIG5vdGlm aWNhdGlvbiAlZFxuIiwgbm90aWZpY2F0aW9uKTsKIAl9Ci0JcmV0dXJuIDA7CisJcmV0dXJuIHJl dDsKIH0KIAogc3RhdGljIGludCBzZW5kX2Rpc3BsYXlfcmVhZHlfdWV2ZW50KHN0cnVjdCBpbnRl bF92Z3B1ICp2Z3B1LCBpbnQgcmVhZHkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9ndnQvdmdwdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYwppbmRleCA0ZDI0 MWE3Li5iYzczODdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvdmdwdS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC92Z3B1LmMKQEAgLTQ5LDYgKzQ5LDkgQEAg dm9pZCBwb3B1bGF0ZV9wdmluZm9fcGFnZShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSkKIAl2Z3B1 X3ZyZWdfdCh2Z3B1LCB2Z3RpZl9yZWcodmd0X2NhcHMpKSB8PSBWR1RfQ0FQU19IVUdFX0dUVDsK IAl2Z3B1X3ZyZWdfdCh2Z3B1LCB2Z3RpZl9yZWcodmd0X2NhcHMpKSB8PSBWR1RfQ0FQU19QVjsK IAorCWlmICghaW50ZWxfdnRkX2FjdGl2ZSgpKQorCQl2Z3B1X3ZyZWdfdCh2Z3B1LCB2Z3RpZl9y ZWcocHZfY2FwcykpID0gUFZfUFBHVFRfVVBEQVRFOworCiAJdmdwdV92cmVnX3QodmdwdSwgdmd0 aWZfcmVnKGF2YWlsX3JzLm1hcHBhYmxlX2dtYWRyLmJhc2UpKSA9CiAJCXZncHVfYXBlcnR1cmVf Z21hZHJfYmFzZSh2Z3B1KTsKIAl2Z3B1X3ZyZWdfdCh2Z3B1LCB2Z3RpZl9yZWcoYXZhaWxfcnMu bWFwcGFibGVfZ21hZHIuc2l6ZSkpID0KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZng=