From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 10/15] xen: remove other open-coded use of libxengnttab Date: Mon, 21 May 2018 12:34:59 -0700 Message-ID: <1526931304-7289-10-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fKqaO-0000Tx-NE for xen-devel@lists.xenproject.org; Mon, 21 May 2018 19:35:12 +0000 In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: peter.maydell@linaro.org, stefanha@gmail.com Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, Paul Durrant , stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KCk5vdyB0aGF0IGhl bHBlcnMgYXJlIGF2YWlsYWJsZSBpbiB4ZW5fYmFja2VuZCwgdXNlIHRoZW0gdGhyb3VnaG91dCBh bGwKWGVuIFBWIGJhY2tlbmRzLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwYXVsLmR1 cnJhbnRAY2l0cml4LmNvbT4KQWNrZWQtYnk6IEFudGhvbnkgUGVyYXJkIDxhbnRob255LnBlcmFy ZEBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxs aW5pQGtlcm5lbC5vcmc+Ci0tLQogaHcvOXBmcy94ZW4tOXAtYmFja2VuZC5jIHwgMzIgKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGh3L2NoYXIveGVuX2NvbnNvbGUuYyAgICB8ICA5 ICsrKystLS0tLQogaHcvbmV0L3hlbl9uaWMuYyAgICAgICAgIHwgMzMgKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiBody91c2IveGVuLXVzYi5jICAgICAgICAgfCAzNyArKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDUwIGluc2Vy dGlvbnMoKyksIDYxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3LzlwZnMveGVuLTlwLWJh Y2tlbmQuYyBiL2h3LzlwZnMveGVuLTlwLWJhY2tlbmQuYwppbmRleCA5NWU1MGM0Li42MDI2Nzgw IDEwMDY0NAotLS0gYS9ody85cGZzL3hlbi05cC1iYWNrZW5kLmMKKysrIGIvaHcvOXBmcy94ZW4t OXAtYmFja2VuZC5jCkBAIC0zMzEsMTQgKzMzMSwxNCBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2Zy ZWUoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQogCiAgICAgZm9yIChpID0gMDsgaSA8IHhlbl85 cGRldi0+bnVtX3JpbmdzOyBpKyspIHsKICAgICAgICAgaWYgKHhlbl85cGRldi0+cmluZ3NbaV0u ZGF0YSAhPSBOVUxMKSB7Ci0gICAgICAgICAgICB4ZW5nbnR0YWJfdW5tYXAoeGVuXzlwZGV2LT54 ZW5kZXYuZ250dGFiZGV2LAotICAgICAgICAgICAgICAgICAgICB4ZW5fOXBkZXYtPnJpbmdzW2ld LmRhdGEsCi0gICAgICAgICAgICAgICAgICAgICgxIDw8IHhlbl85cGRldi0+cmluZ3NbaV0ucmlu Z19vcmRlcikpOworICAgICAgICAgICAgeGVuX2JlX3VubWFwX2dyYW50X3JlZnMoJnhlbl85cGRl di0+eGVuZGV2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuXzlwZGV2 LT5yaW5nc1tpXS5kYXRhLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKDEg PDwgeGVuXzlwZGV2LT5yaW5nc1tpXS5yaW5nX29yZGVyKSk7CiAgICAgICAgIH0KICAgICAgICAg aWYgKHhlbl85cGRldi0+cmluZ3NbaV0uaW50ZiAhPSBOVUxMKSB7Ci0gICAgICAgICAgICB4ZW5n bnR0YWJfdW5tYXAoeGVuXzlwZGV2LT54ZW5kZXYuZ250dGFiZGV2LAotICAgICAgICAgICAgICAg ICAgICB4ZW5fOXBkZXYtPnJpbmdzW2ldLmludGYsCi0gICAgICAgICAgICAgICAgICAgIDEpOwor ICAgICAgICAgICAgeGVuX2JlX3VubWFwX2dyYW50X3JlZnMoJnhlbl85cGRldi0+eGVuZGV2LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuXzlwZGV2LT5yaW5nc1tpXS5p bnRmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKHhlbl85cGRldi0+cmluZ3NbaV0uYmggIT0gTlVMTCkgewogICAgICAgICAg ICAgcWVtdV9iaF9kZWxldGUoeGVuXzlwZGV2LT5yaW5nc1tpXS5iaCk7CkBAIC0zOTAsMTEgKzM5 MCwxMCBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2Nvbm5lY3Qoc3RydWN0IFhlbkRldmljZSAqeGVu ZGV2KQogICAgICAgICB9CiAgICAgICAgIGdfZnJlZShzdHIpOwogCi0gICAgICAgIHhlbl85cGRl di0+cmluZ3NbaV0uaW50ZiA9ICB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZigKLSAgICAgICAgICAg ICAgICB4ZW5fOXBkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgeGVuXzlw ZGV2LT54ZW5kZXYuZG9tLAotICAgICAgICAgICAgICAgIHhlbl85cGRldi0+cmluZ3NbaV0ucmVm LAotICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOworICAgICAgICB4ZW5f OXBkZXYtPnJpbmdzW2ldLmludGYgPQorICAgICAgICAgICAgeGVuX2JlX21hcF9ncmFudF9yZWYo Jnhlbl85cGRldi0+eGVuZGV2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVu XzlwZGV2LT5yaW5nc1tpXS5yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ Uk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKICAgICAgICAgaWYgKCF4ZW5fOXBkZXYtPnJpbmdzW2ld LmludGYpIHsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CkBAIC00MDMsMTIgKzQw MiwxMSBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2Nvbm5lY3Qoc3RydWN0IFhlbkRldmljZSAqeGVu ZGV2KQogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KICAgICAgICAgeGVuXzlwZGV2 LT5yaW5nc1tpXS5yaW5nX29yZGVyID0gcmluZ19vcmRlcjsKLSAgICAgICAgeGVuXzlwZGV2LT5y aW5nc1tpXS5kYXRhID0geGVuZ250dGFiX21hcF9kb21haW5fZ3JhbnRfcmVmcygKLSAgICAgICAg ICAgICAgICB4ZW5fOXBkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgKDEg PDwgcmluZ19vcmRlciksCi0gICAgICAgICAgICAgICAgeGVuXzlwZGV2LT54ZW5kZXYuZG9tLAot ICAgICAgICAgICAgICAgIHhlbl85cGRldi0+cmluZ3NbaV0uaW50Zi0+cmVmLAotICAgICAgICAg ICAgICAgIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOworICAgICAgICB4ZW5fOXBkZXYtPnJpbmdz W2ldLmRhdGEgPQorICAgICAgICAgICAgeGVuX2JlX21hcF9ncmFudF9yZWZzKCZ4ZW5fOXBkZXYt PnhlbmRldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5fOXBkZXYtPnJp bmdzW2ldLmludGYtPnJlZiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoMSA8 PCByaW5nX29yZGVyKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JF QUQgfCBQUk9UX1dSSVRFKTsKICAgICAgICAgaWYgKCF4ZW5fOXBkZXYtPnJpbmdzW2ldLmRhdGEp IHsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CmRpZmYgLS1naXQgYS9ody9jaGFy L3hlbl9jb25zb2xlLmMgYi9ody9jaGFyL3hlbl9jb25zb2xlLmMKaW5kZXggYmRmYWE0MC4uOGI0 YjRiZiAxMDA2NDQKLS0tIGEvaHcvY2hhci94ZW5fY29uc29sZS5jCisrKyBiL2h3L2NoYXIveGVu X2NvbnNvbGUuYwpAQCAtMjMzLDEyICsyMzMsMTEgQEAgc3RhdGljIGludCBjb25faW5pdGlhbGlz ZShzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgaWYgKCF4ZW5kZXYtPmRldikgewogICAg ICAgICB4ZW5fcGZuX3QgbWZuID0gY29uLT5yaW5nX3JlZjsKICAgICAgICAgY29uLT5zcmluZyA9 IHhlbmZvcmVpZ25tZW1vcnlfbWFwKHhlbl9mbWVtLCBjb24tPnhlbmRldi5kb20sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJPVF9XUklURSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBS T1RfV1JJVEUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxLCAm bWZuLCBOVUxMKTsKICAgICB9IGVsc2UgewotICAgICAgICBjb24tPnNyaW5nID0geGVuZ250dGFi X21hcF9ncmFudF9yZWYoeGVuZGV2LT5nbnR0YWJkZXYsIGNvbi0+eGVuZGV2LmRvbSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbi0+cmluZ19yZWYsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJP VF9XUklURSk7CisgICAgICAgIGNvbi0+c3JpbmcgPSB4ZW5fYmVfbWFwX2dyYW50X3JlZih4ZW5k ZXYsIGNvbi0+cmluZ19yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKICAgICB9CiAgICAgaWYgKCFjb24tPnNyaW5n KQogCXJldHVybiAtMTsKQEAgLTI2Nyw3ICsyNjYsNyBAQCBzdGF0aWMgdm9pZCBjb25fZGlzY29u bmVjdChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgICAgIGlmICgheGVuZGV2LT5kZXYp IHsKICAgICAgICAgICAgIHhlbmZvcmVpZ25tZW1vcnlfdW5tYXAoeGVuX2ZtZW0sIGNvbi0+c3Jp bmcsIDEpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgeGVuZ250dGFiX3VubWFwKHhl bmRldi0+Z250dGFiZGV2LCBjb24tPnNyaW5nLCAxKTsKKyAgICAgICAgICAgIHhlbl9iZV91bm1h cF9ncmFudF9yZWYoeGVuZGV2LCBjb24tPnNyaW5nKTsKICAgICAgICAgfQogICAgICAgICBjb24t PnNyaW5nID0gTlVMTDsKICAgICB9CmRpZmYgLS1naXQgYS9ody9uZXQveGVuX25pYy5jIGIvaHcv bmV0L3hlbl9uaWMuYwppbmRleCAyMGM0M2E2Li40NmE4ZGJmIDEwMDY0NAotLS0gYS9ody9uZXQv eGVuX25pYy5jCisrKyBiL2h3L25ldC94ZW5fbmljLmMKQEAgLTE2MCw5ICsxNjAsOCBAQCBzdGF0 aWMgdm9pZCBuZXRfdHhfcGFja2V0cyhzdHJ1Y3QgWGVuTmV0RGV2ICpuZXRkZXYpCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICh0eHJlcS5mbGFncyAmIE5FVFRYRl9tb3JlX2RhdGEpICAgICAg PyAiIG1vcmVfZGF0YSIgICAgICA6ICIiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAodHhy ZXEuZmxhZ3MgJiBORVRUWEZfZXh0cmFfaW5mbykgICAgID8gIiBleHRyYV9pbmZvIiAgICAgOiAi Iik7CiAKLSAgICAgICAgICAgIHBhZ2UgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZihuZXRkZXYt PnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbmV0ZGV2LT54ZW5kZXYuZG9tLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHR4cmVxLmdyZWYsIFBST1RfUkVBRCk7CisgICAgICAgICAgICBwYWdlID0g eGVuX2JlX21hcF9ncmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCB0eHJlcS5ncmVmLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCk7CiAgICAgICAgICAg ICBpZiAocGFnZSA9PSBOVUxMKSB7CiAgICAgICAgICAgICAgICAgeGVuX3B2X3ByaW50ZigmbmV0 ZGV2LT54ZW5kZXYsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZXJyb3I6IHR4 IGdyZWYgZGVyZWZlcmVuY2UgZmFpbGVkICglZClcbiIsCkBAIC0xODMsNyArMTgyLDcgQEAgc3Rh dGljIHZvaWQgbmV0X3R4X3BhY2tldHMoc3RydWN0IFhlbk5ldERldiAqbmV0ZGV2KQogICAgICAg ICAgICAgICAgIHFlbXVfc2VuZF9wYWNrZXQocWVtdV9nZXRfcXVldWUobmV0ZGV2LT5uaWMpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFnZSArIHR4cmVxLm9mZnNldCwgdHhy ZXEuc2l6ZSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB4ZW5nbnR0YWJfdW5tYXAobmV0 ZGV2LT54ZW5kZXYuZ250dGFiZGV2LCBwYWdlLCAxKTsKKyAgICAgICAgICAgIHhlbl9iZV91bm1h cF9ncmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCBwYWdlKTsKICAgICAgICAgICAgIG5ldF90eF9y ZXNwb25zZShuZXRkZXYsICZ0eHJlcSwgTkVUSUZfUlNQX09LQVkpOwogICAgICAgICB9CiAgICAg ICAgIGlmICghbmV0ZGV2LT50eF93b3JrKSB7CkBAIC0yNTQsOSArMjUzLDcgQEAgc3RhdGljIHNz aXplX3QgbmV0X3J4X3BhY2tldChOZXRDbGllbnRTdGF0ZSAqbmMsIGNvbnN0IHVpbnQ4X3QgKmJ1 Ziwgc2l6ZV90IHNpemUKICAgICBtZW1jcHkoJnJ4cmVxLCBSSU5HX0dFVF9SRVFVRVNUKCZuZXRk ZXYtPnJ4X3JpbmcsIHJjKSwgc2l6ZW9mKHJ4cmVxKSk7CiAgICAgbmV0ZGV2LT5yeF9yaW5nLnJl cV9jb25zID0gKytyYzsKIAotICAgIHBhZ2UgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZihuZXRk ZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5ldGRldi0+eGVuZGV2LmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cnhyZXEuZ3JlZiwgUFJPVF9XUklURSk7CisgICAgcGFnZSA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVm KCZuZXRkZXYtPnhlbmRldiwgcnhyZXEuZ3JlZiwgUFJPVF9XUklURSk7CiAgICAgaWYgKHBhZ2Ug PT0gTlVMTCkgewogICAgICAgICB4ZW5fcHZfcHJpbnRmKCZuZXRkZXYtPnhlbmRldiwgMCwKICAg ICAgICAgICAgICAgICAgICAgICAiZXJyb3I6IHJ4IGdyZWYgZGVyZWZlcmVuY2UgZmFpbGVkICgl ZClcbiIsCkBAIC0yNjUsNyArMjYyLDcgQEAgc3RhdGljIHNzaXplX3QgbmV0X3J4X3BhY2tldChO ZXRDbGllbnRTdGF0ZSAqbmMsIGNvbnN0IHVpbnQ4X3QgKmJ1Ziwgc2l6ZV90IHNpemUKICAgICAg ICAgcmV0dXJuIC0xOwogICAgIH0KICAgICBtZW1jcHkocGFnZSArIE5FVF9JUF9BTElHTiwgYnVm LCBzaXplKTsKLSAgICB4ZW5nbnR0YWJfdW5tYXAobmV0ZGV2LT54ZW5kZXYuZ250dGFiZGV2LCBw YWdlLCAxKTsKKyAgICB4ZW5fYmVfdW5tYXBfZ3JhbnRfcmVmKCZuZXRkZXYtPnhlbmRldiwgcGFn ZSk7CiAgICAgbmV0X3J4X3Jlc3BvbnNlKG5ldGRldiwgJnJ4cmVxLCBORVRJRl9SU1BfT0tBWSwg TkVUX0lQX0FMSUdOLCBzaXplLCAwKTsKIAogICAgIHJldHVybiBzaXplOwpAQCAtMzM4LDE5ICsz MzUsMTcgQEAgc3RhdGljIGludCBuZXRfY29ubmVjdChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYp CiAgICAgICAgIHJldHVybiAtMTsKICAgICB9CiAKLSAgICBuZXRkZXYtPnR4cyA9IHhlbmdudHRh Yl9tYXBfZ3JhbnRfcmVmKG5ldGRldi0+eGVuZGV2LmdudHRhYmRldiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+eGVuZGV2LmRvbSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+dHhfcmluZ19yZWYsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUQgfCBQUk9U X1dSSVRFKTsKKyAgICBuZXRkZXYtPnR4cyA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKCZuZXRkZXYt PnhlbmRldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+ dHhfcmluZ19yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9U X1JFQUQgfCBQUk9UX1dSSVRFKTsKICAgICBpZiAoIW5ldGRldi0+dHhzKSB7CiAgICAgICAgIHJl dHVybiAtMTsKICAgICB9Ci0gICAgbmV0ZGV2LT5yeHMgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3Jl ZihuZXRkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBuZXRkZXYtPnhlbmRldi5kb20sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBuZXRkZXYtPnJ4X3JpbmdfcmVmLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7CisgICAg bmV0ZGV2LT5yeHMgPSB4ZW5fYmVfbWFwX2dyYW50X3JlZigmbmV0ZGV2LT54ZW5kZXYsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXRkZXYtPnJ4X3JpbmdfcmVmLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9X UklURSk7CiAgICAgaWYgKCFuZXRkZXYtPnJ4cykgewotICAgICAgICB4ZW5nbnR0YWJfdW5tYXAo bmV0ZGV2LT54ZW5kZXYuZ250dGFiZGV2LCBuZXRkZXYtPnR4cywgMSk7CisgICAgICAgIHhlbl9i ZV91bm1hcF9ncmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCBuZXRkZXYtPnR4cyk7CiAgICAgICAg IG5ldGRldi0+dHhzID0gTlVMTDsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KQEAgLTM3NSwx MSArMzcwLDExIEBAIHN0YXRpYyB2b2lkIG5ldF9kaXNjb25uZWN0KHN0cnVjdCBYZW5EZXZpY2Ug KnhlbmRldikKICAgICB4ZW5fcHZfdW5iaW5kX2V2dGNobigmbmV0ZGV2LT54ZW5kZXYpOwogCiAg ICAgaWYgKG5ldGRldi0+dHhzKSB7Ci0gICAgICAgIHhlbmdudHRhYl91bm1hcChuZXRkZXYtPnhl bmRldi5nbnR0YWJkZXYsIG5ldGRldi0+dHhzLCAxKTsKKyAgICAgICAgeGVuX2JlX3VubWFwX2dy YW50X3JlZigmbmV0ZGV2LT54ZW5kZXYsIG5ldGRldi0+dHhzKTsKICAgICAgICAgbmV0ZGV2LT50 eHMgPSBOVUxMOwogICAgIH0KICAgICBpZiAobmV0ZGV2LT5yeHMpIHsKLSAgICAgICAgeGVuZ250 dGFiX3VubWFwKG5ldGRldi0+eGVuZGV2LmdudHRhYmRldiwgbmV0ZGV2LT5yeHMsIDEpOworICAg ICAgICB4ZW5fYmVfdW5tYXBfZ3JhbnRfcmVmKCZuZXRkZXYtPnhlbmRldiwgbmV0ZGV2LT5yeHMp OwogICAgICAgICBuZXRkZXYtPnJ4cyA9IE5VTEw7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvaHcv dXNiL3hlbi11c2IuYyBiL2h3L3VzYi94ZW4tdXNiLmMKaW5kZXggYjNhOTBjMC4uNWIyZTIxZSAx MDA2NDQKLS0tIGEvaHcvdXNiL3hlbi11c2IuYworKysgYi9ody91c2IveGVuLXVzYi5jCkBAIC0x NzMsOCArMTczLDkgQEAgc3RhdGljIGludCB1c2JiYWNrX2dudHRhYl9tYXAoc3RydWN0IHVzYmJh Y2tfcmVxICp1c2JiYWNrX3JlcSkKICAgICAgICAgZm9yIChpID0gMDsgaSA8IHVzYmJhY2tfcmVx LT5ucl9idWZmZXJfc2VnczsgaSsrKSB7CiAgICAgICAgICAgICByZWZbaV0gPSB1c2JiYWNrX3Jl cS0+cmVxLnNlZ1tpXS5ncmVmOwogICAgICAgICB9Ci0gICAgICAgIHVzYmJhY2tfcmVxLT5idWZm ZXIgPSB4ZW5nbnR0YWJfbWFwX2RvbWFpbl9ncmFudF9yZWZzKHhlbmRldi0+Z250dGFiZGV2LAot ICAgICAgICAgICAgdXNiYmFja19yZXEtPm5yX2J1ZmZlcl9zZWdzLCB4ZW5kZXYtPmRvbSwgcmVm LCBwcm90KTsKKyAgICAgICAgdXNiYmFja19yZXEtPmJ1ZmZlciA9CisgICAgICAgICAgICB4ZW5f YmVfbWFwX2dyYW50X3JlZnMoeGVuZGV2LCByZWYsIHVzYmJhY2tfcmVxLT5ucl9idWZmZXJfc2Vn cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm90KTsKIAogICAgICAgICBp ZiAoIXVzYmJhY2tfcmVxLT5idWZmZXIpIHsKICAgICAgICAgICAgIHJldHVybiAtRU5PTUVNOwpA QCAtMjA2LDggKzIwNyw5IEBAIHN0YXRpYyBpbnQgdXNiYmFja19nbnR0YWJfbWFwKHN0cnVjdCB1 c2JiYWNrX3JlcSAqdXNiYmFja19yZXEpCiAgICAgZm9yIChpID0gMDsgaSA8IHVzYmJhY2tfcmVx LT5ucl9leHRyYV9zZWdzOyBpKyspIHsKICAgICAgICAgcmVmW2ldID0gdXNiYmFja19yZXEtPnJl cS5zZWdbaSArIHVzYmJhY2tfcmVxLT5yZXEubnJfYnVmZmVyX3NlZ3NdLmdyZWY7CiAgICAgfQot ICAgIHVzYmJhY2tfcmVxLT5pc29jX2J1ZmZlciA9IHhlbmdudHRhYl9tYXBfZG9tYWluX2dyYW50 X3JlZnMoCi0gICAgICAgICB4ZW5kZXYtPmdudHRhYmRldiwgdXNiYmFja19yZXEtPm5yX2V4dHJh X3NlZ3MsIHhlbmRldi0+ZG9tLCByZWYsIHByb3QpOworICAgIHVzYmJhY2tfcmVxLT5pc29jX2J1 ZmZlciA9CisgICAgICAgIHhlbl9iZV9tYXBfZ3JhbnRfcmVmcyh4ZW5kZXYsIHJlZiwgdXNiYmFj a19yZXEtPm5yX2V4dHJhX3NlZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm90 KTsKIAogICAgIGlmICghdXNiYmFja19yZXEtPmlzb2NfYnVmZmVyKSB7CiAgICAgICAgIHJldHVy biAtRU5PTUVNOwpAQCAtMjkxLDE0ICsyOTMsMTQgQEAgc3RhdGljIHZvaWQgdXNiYmFja19kb19y ZXNwb25zZShzdHJ1Y3QgdXNiYmFja19yZXEgKnVzYmJhY2tfcmVxLCBpbnQzMl90IHN0YXR1cywK ICAgICB9CiAKICAgICBpZiAodXNiYmFja19yZXEtPmJ1ZmZlcikgewotICAgICAgICB4ZW5nbnR0 YWJfdW5tYXAoeGVuZGV2LT5nbnR0YWJkZXYsIHVzYmJhY2tfcmVxLT5idWZmZXIsCi0gICAgICAg ICAgICAgICAgICAgICAgICB1c2JiYWNrX3JlcS0+bnJfYnVmZmVyX3NlZ3MpOworICAgICAgICB4 ZW5fYmVfdW5tYXBfZ3JhbnRfcmVmcyh4ZW5kZXYsIHVzYmJhY2tfcmVxLT5idWZmZXIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzYmJhY2tfcmVxLT5ucl9idWZmZXJfc2Vncyk7 CiAgICAgICAgIHVzYmJhY2tfcmVxLT5idWZmZXIgPSBOVUxMOwogICAgIH0KIAogICAgIGlmICh1 c2JiYWNrX3JlcS0+aXNvY19idWZmZXIpIHsKLSAgICAgICAgeGVuZ250dGFiX3VubWFwKHhlbmRl di0+Z250dGFiZGV2LCB1c2JiYWNrX3JlcS0+aXNvY19idWZmZXIsCi0gICAgICAgICAgICAgICAg ICAgICAgICB1c2JiYWNrX3JlcS0+bnJfZXh0cmFfc2Vncyk7CisgICAgICAgIHhlbl9iZV91bm1h cF9ncmFudF9yZWZzKHhlbmRldiwgdXNiYmFja19yZXEtPmlzb2NfYnVmZmVyLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1c2JiYWNrX3JlcS0+bnJfZXh0cmFfc2Vncyk7CiAgICAg ICAgIHVzYmJhY2tfcmVxLT5pc29jX2J1ZmZlciA9IE5VTEw7CiAgICAgfQogCkBAIC04MzQsMTEg KzgzNiwxMSBAQCBzdGF0aWMgdm9pZCB1c2JiYWNrX2Rpc2Nvbm5lY3Qoc3RydWN0IFhlbkRldmlj ZSAqeGVuZGV2KQogICAgIHhlbl9wdl91bmJpbmRfZXZ0Y2huKHhlbmRldik7CiAKICAgICBpZiAo dXNiaWYtPnVyYl9zcmluZykgewotICAgICAgICB4ZW5nbnR0YWJfdW5tYXAoeGVuZGV2LT5nbnR0 YWJkZXYsIHVzYmlmLT51cmJfc3JpbmcsIDEpOworICAgICAgICB4ZW5fYmVfdW5tYXBfZ3JhbnRf cmVmKHhlbmRldiwgdXNiaWYtPnVyYl9zcmluZyk7CiAgICAgICAgIHVzYmlmLT51cmJfc3Jpbmcg PSBOVUxMOwogICAgIH0KICAgICBpZiAodXNiaWYtPmNvbm5fc3JpbmcpIHsKLSAgICAgICAgeGVu Z250dGFiX3VubWFwKHhlbmRldi0+Z250dGFiZGV2LCB1c2JpZi0+Y29ubl9zcmluZywgMSk7Cisg ICAgICAgIHhlbl9iZV91bm1hcF9ncmFudF9yZWYoeGVuZGV2LCB1c2JpZi0+Y29ubl9zcmluZyk7 CiAgICAgICAgIHVzYmlmLT5jb25uX3NyaW5nID0gTlVMTDsKICAgICB9CiAKQEAgLTg3NywxMiAr ODc5LDEwIEBAIHN0YXRpYyBpbnQgdXNiYmFja19jb25uZWN0KHN0cnVjdCBYZW5EZXZpY2UgKnhl bmRldikKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KIAotICAgIHVzYmlmLT51cmJfc3Jpbmcg PSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZih4ZW5kZXYtPmdudHRhYmRldiwgeGVuZGV2LT5kb20s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVyYl9yaW5n X3JlZiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJP VF9SRUFEIHwgUFJPVF9XUklURSk7Ci0gICAgdXNiaWYtPmNvbm5fc3JpbmcgPSB4ZW5nbnR0YWJf bWFwX2dyYW50X3JlZih4ZW5kZXYtPmdudHRhYmRldiwgeGVuZGV2LT5kb20sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25uX3JpbmdfcmVmLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwg UFJPVF9XUklURSk7CisgICAgdXNiaWYtPnVyYl9zcmluZyA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVm KHhlbmRldiwgdXJiX3JpbmdfcmVmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKKyAgICB1c2JpZi0+Y29ubl9zcmlu ZyA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKHhlbmRldiwgY29ubl9yaW5nX3JlZiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBST1RfV1JJ VEUpOwogICAgIGlmICghdXNiaWYtPnVyYl9zcmluZyB8fCAhdXNiaWYtPmNvbm5fc3JpbmcpIHsK ICAgICAgICAgeGVuX3B2X3ByaW50Zih4ZW5kZXYsIDAsICJlcnJvciBtYXBwaW5nIHJpbmdzXG4i KTsKICAgICAgICAgdXNiYmFja19kaXNjb25uZWN0KHhlbmRldik7CkBAIC0xMDI0LDEwICsxMDI0 LDcgQEAgc3RhdGljIHZvaWQgdXNiYmFja19hbGxvYyhzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYp CiAKICAgICAvKiBtYXhfZ3JhbnRzOiBmb3IgZWFjaCByZXF1ZXN0IGFuZCBmb3IgdGhlIHJpbmdz IChyZXF1ZXN0IGFuZCBjb25uZWN0KS4gKi8KICAgICBtYXhfZ3JhbnRzID0gVVNCSUZfTUFYX1NF R01FTlRTX1BFUl9SRVFVRVNUICogVVNCX1VSQl9SSU5HX1NJWkUgKyAyOwotICAgIGlmICh4ZW5n bnR0YWJfc2V0X21heF9ncmFudHMoeGVuZGV2LT5nbnR0YWJkZXYsIG1heF9ncmFudHMpIDwgMCkg ewotICAgICAgICB4ZW5fcHZfcHJpbnRmKHhlbmRldiwgMCwgInhlbmdudHRhYl9zZXRfbWF4X2dy YW50cyBmYWlsZWQ6ICVzXG4iLAotICAgICAgICAgICAgICAgICAgICAgIHN0cmVycm9yKGVycm5v KSk7Ci0gICAgfQorICAgIHhlbl9iZV9zZXRfbWF4X2dyYW50X3JlZnMoeGVuZGV2LCBtYXhfZ3Jh bnRzKTsKIH0KIAogc3RhdGljIGludCB1c2JiYWNrX2ZyZWUoc3RydWN0IFhlbkRldmljZSAqeGVu ZGV2KQotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs