From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v4 4/9] xen: remove other open-coded use of libxengnttab Date: Thu, 17 May 2018 16:35:53 +0100 Message-ID: <1526571358-26685-5-git-send-email-paul.durrant@citrix.com> References: <1526571358-26685-1-git-send-email-paul.durrant@citrix.com> 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 1fJKwu-0001sc-VS for xen-devel@lists.xenproject.org; Thu, 17 May 2018 15:36:12 +0000 In-Reply-To: <1526571358-26685-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Stefano Stabellini , Jason Wang , Greg Kurz , Paul Durrant , Gerd Hoffmann , Paolo Bonzini List-Id: xen-devel@lists.xenproject.org Tm93IHRoYXQgaGVscGVycyBhcmUgYXZhaWxhYmxlIGluIHhlbl9iYWNrZW5kLCB1c2UgdGhlbSB0 aHJvdWdob3V0IGFsbApYZW4gUFYgYmFja2VuZHMuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJh bnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgpBY2tlZC1ieTogQW50aG9ueSBQZXJhcmQgPGFu dGhvbnkucGVyYXJkQGNpdHJpeC5jb20+Ci0tLQpDYzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3Rh YmVsbGluaUBrZXJuZWwub3JnPgpDYzogR3JlZyBLdXJ6IDxncm91Z0BrYW9kLm9yZz4KQ2M6IFBh b2xvIEJvbnppbmkgPHBib256aW5pQHJlZGhhdC5jb20+CkNjOiBKYXNvbiBXYW5nIDxqYXNvd2Fu Z0ByZWRoYXQuY29tPgpDYzogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Cgp2MjoK IC0gTmV3IGluIHYyCi0tLQogaHcvOXBmcy94ZW4tOXAtYmFja2VuZC5jIHwgMzIgKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGh3L2NoYXIveGVuX2NvbnNvbGUuYyAgICB8ICA5ICsr KystLS0tLQogaHcvbmV0L3hlbl9uaWMuYyAgICAgICAgIHwgMzMgKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiBody91c2IveGVuLXVzYi5jICAgICAgICAgfCAzNyArKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlv bnMoKyksIDYxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3LzlwZnMveGVuLTlwLWJhY2tl bmQuYyBiL2h3LzlwZnMveGVuLTlwLWJhY2tlbmQuYwppbmRleCA5NWU1MGM0Li42MDI2NzgwIDEw MDY0NAotLS0gYS9ody85cGZzL3hlbi05cC1iYWNrZW5kLmMKKysrIGIvaHcvOXBmcy94ZW4tOXAt YmFja2VuZC5jCkBAIC0zMzEsMTQgKzMzMSwxNCBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2ZyZWUo c3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQogCiAgICAgZm9yIChpID0gMDsgaSA8IHhlbl85cGRl di0+bnVtX3JpbmdzOyBpKyspIHsKICAgICAgICAgaWYgKHhlbl85cGRldi0+cmluZ3NbaV0uZGF0 YSAhPSBOVUxMKSB7Ci0gICAgICAgICAgICB4ZW5nbnR0YWJfdW5tYXAoeGVuXzlwZGV2LT54ZW5k ZXYuZ250dGFiZGV2LAotICAgICAgICAgICAgICAgICAgICB4ZW5fOXBkZXYtPnJpbmdzW2ldLmRh dGEsCi0gICAgICAgICAgICAgICAgICAgICgxIDw8IHhlbl85cGRldi0+cmluZ3NbaV0ucmluZ19v cmRlcikpOworICAgICAgICAgICAgeGVuX2JlX3VubWFwX2dyYW50X3JlZnMoJnhlbl85cGRldi0+ eGVuZGV2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuXzlwZGV2LT5y aW5nc1tpXS5kYXRhLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKDEgPDwg eGVuXzlwZGV2LT5yaW5nc1tpXS5yaW5nX29yZGVyKSk7CiAgICAgICAgIH0KICAgICAgICAgaWYg KHhlbl85cGRldi0+cmluZ3NbaV0uaW50ZiAhPSBOVUxMKSB7Ci0gICAgICAgICAgICB4ZW5nbnR0 YWJfdW5tYXAoeGVuXzlwZGV2LT54ZW5kZXYuZ250dGFiZGV2LAotICAgICAgICAgICAgICAgICAg ICB4ZW5fOXBkZXYtPnJpbmdzW2ldLmludGYsCi0gICAgICAgICAgICAgICAgICAgIDEpOworICAg ICAgICAgICAgeGVuX2JlX3VubWFwX2dyYW50X3JlZnMoJnhlbl85cGRldi0+eGVuZGV2LAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuXzlwZGV2LT5yaW5nc1tpXS5pbnRm LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSk7CiAgICAgICAgIH0KICAg ICAgICAgaWYgKHhlbl85cGRldi0+cmluZ3NbaV0uYmggIT0gTlVMTCkgewogICAgICAgICAgICAg cWVtdV9iaF9kZWxldGUoeGVuXzlwZGV2LT5yaW5nc1tpXS5iaCk7CkBAIC0zOTAsMTEgKzM5MCwx MCBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2Nvbm5lY3Qoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2 KQogICAgICAgICB9CiAgICAgICAgIGdfZnJlZShzdHIpOwogCi0gICAgICAgIHhlbl85cGRldi0+ cmluZ3NbaV0uaW50ZiA9ICB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZigKLSAgICAgICAgICAgICAg ICB4ZW5fOXBkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgeGVuXzlwZGV2 LT54ZW5kZXYuZG9tLAotICAgICAgICAgICAgICAgIHhlbl85cGRldi0+cmluZ3NbaV0ucmVmLAot ICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOworICAgICAgICB4ZW5fOXBk ZXYtPnJpbmdzW2ldLmludGYgPQorICAgICAgICAgICAgeGVuX2JlX21hcF9ncmFudF9yZWYoJnhl bl85cGRldi0+eGVuZGV2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeGVuXzlw ZGV2LT5yaW5nc1tpXS5yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9U X1JFQUQgfCBQUk9UX1dSSVRFKTsKICAgICAgICAgaWYgKCF4ZW5fOXBkZXYtPnJpbmdzW2ldLmlu dGYpIHsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CkBAIC00MDMsMTIgKzQwMiwx MSBAQCBzdGF0aWMgaW50IHhlbl85cGZzX2Nvbm5lY3Qoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2 KQogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KICAgICAgICAgeGVuXzlwZGV2LT5y aW5nc1tpXS5yaW5nX29yZGVyID0gcmluZ19vcmRlcjsKLSAgICAgICAgeGVuXzlwZGV2LT5yaW5n c1tpXS5kYXRhID0geGVuZ250dGFiX21hcF9kb21haW5fZ3JhbnRfcmVmcygKLSAgICAgICAgICAg ICAgICB4ZW5fOXBkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgKDEgPDwg cmluZ19vcmRlciksCi0gICAgICAgICAgICAgICAgeGVuXzlwZGV2LT54ZW5kZXYuZG9tLAotICAg ICAgICAgICAgICAgIHhlbl85cGRldi0+cmluZ3NbaV0uaW50Zi0+cmVmLAotICAgICAgICAgICAg ICAgIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOworICAgICAgICB4ZW5fOXBkZXYtPnJpbmdzW2ld LmRhdGEgPQorICAgICAgICAgICAgeGVuX2JlX21hcF9ncmFudF9yZWZzKCZ4ZW5fOXBkZXYtPnhl bmRldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5fOXBkZXYtPnJpbmdz W2ldLmludGYtPnJlZiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoMSA8PCBy aW5nX29yZGVyKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUQg fCBQUk9UX1dSSVRFKTsKICAgICAgICAgaWYgKCF4ZW5fOXBkZXYtPnJpbmdzW2ldLmRhdGEpIHsK ICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CmRpZmYgLS1naXQgYS9ody9jaGFyL3hl bl9jb25zb2xlLmMgYi9ody9jaGFyL3hlbl9jb25zb2xlLmMKaW5kZXggYmRmYWE0MC4uOGI0YjRi ZiAxMDA2NDQKLS0tIGEvaHcvY2hhci94ZW5fY29uc29sZS5jCisrKyBiL2h3L2NoYXIveGVuX2Nv bnNvbGUuYwpAQCAtMjMzLDEyICsyMzMsMTEgQEAgc3RhdGljIGludCBjb25faW5pdGlhbGlzZShz dHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgaWYgKCF4ZW5kZXYtPmRldikgewogICAgICAg ICB4ZW5fcGZuX3QgbWZuID0gY29uLT5yaW5nX3JlZjsKICAgICAgICAgY29uLT5zcmluZyA9IHhl bmZvcmVpZ25tZW1vcnlfbWFwKHhlbl9mbWVtLCBjb24tPnhlbmRldi5kb20sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJPVF9XUklURSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBST1Rf V1JJVEUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxLCAmbWZu LCBOVUxMKTsKICAgICB9IGVsc2UgewotICAgICAgICBjb24tPnNyaW5nID0geGVuZ250dGFiX21h cF9ncmFudF9yZWYoeGVuZGV2LT5nbnR0YWJkZXYsIGNvbi0+eGVuZGV2LmRvbSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbi0+cmluZ19yZWYsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJPVF9X UklURSk7CisgICAgICAgIGNvbi0+c3JpbmcgPSB4ZW5fYmVfbWFwX2dyYW50X3JlZih4ZW5kZXYs IGNvbi0+cmluZ19yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKICAgICB9CiAgICAgaWYgKCFjb24tPnNyaW5nKQog CXJldHVybiAtMTsKQEAgLTI2Nyw3ICsyNjYsNyBAQCBzdGF0aWMgdm9pZCBjb25fZGlzY29ubmVj dChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgICAgIGlmICgheGVuZGV2LT5kZXYpIHsK ICAgICAgICAgICAgIHhlbmZvcmVpZ25tZW1vcnlfdW5tYXAoeGVuX2ZtZW0sIGNvbi0+c3Jpbmcs IDEpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgeGVuZ250dGFiX3VubWFwKHhlbmRl di0+Z250dGFiZGV2LCBjb24tPnNyaW5nLCAxKTsKKyAgICAgICAgICAgIHhlbl9iZV91bm1hcF9n cmFudF9yZWYoeGVuZGV2LCBjb24tPnNyaW5nKTsKICAgICAgICAgfQogICAgICAgICBjb24tPnNy aW5nID0gTlVMTDsKICAgICB9CmRpZmYgLS1naXQgYS9ody9uZXQveGVuX25pYy5jIGIvaHcvbmV0 L3hlbl9uaWMuYwppbmRleCAyMGM0M2E2Li40NmE4ZGJmIDEwMDY0NAotLS0gYS9ody9uZXQveGVu X25pYy5jCisrKyBiL2h3L25ldC94ZW5fbmljLmMKQEAgLTE2MCw5ICsxNjAsOCBAQCBzdGF0aWMg dm9pZCBuZXRfdHhfcGFja2V0cyhzdHJ1Y3QgWGVuTmV0RGV2ICpuZXRkZXYpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICh0eHJlcS5mbGFncyAmIE5FVFRYRl9tb3JlX2RhdGEpICAgICAgPyAi IG1vcmVfZGF0YSIgICAgICA6ICIiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAodHhyZXEu ZmxhZ3MgJiBORVRUWEZfZXh0cmFfaW5mbykgICAgID8gIiBleHRyYV9pbmZvIiAgICAgOiAiIik7 CiAKLSAgICAgICAgICAgIHBhZ2UgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZihuZXRkZXYtPnhl bmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbmV0ZGV2LT54ZW5kZXYuZG9tLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHR4cmVxLmdyZWYsIFBST1RfUkVBRCk7CisgICAgICAgICAgICBwYWdlID0geGVu X2JlX21hcF9ncmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCB0eHJlcS5ncmVmLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCk7CiAgICAgICAgICAgICBp ZiAocGFnZSA9PSBOVUxMKSB7CiAgICAgICAgICAgICAgICAgeGVuX3B2X3ByaW50ZigmbmV0ZGV2 LT54ZW5kZXYsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZXJyb3I6IHR4IGdy ZWYgZGVyZWZlcmVuY2UgZmFpbGVkICglZClcbiIsCkBAIC0xODMsNyArMTgyLDcgQEAgc3RhdGlj IHZvaWQgbmV0X3R4X3BhY2tldHMoc3RydWN0IFhlbk5ldERldiAqbmV0ZGV2KQogICAgICAgICAg ICAgICAgIHFlbXVfc2VuZF9wYWNrZXQocWVtdV9nZXRfcXVldWUobmV0ZGV2LT5uaWMpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFnZSArIHR4cmVxLm9mZnNldCwgdHhyZXEu c2l6ZSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB4ZW5nbnR0YWJfdW5tYXAobmV0ZGV2 LT54ZW5kZXYuZ250dGFiZGV2LCBwYWdlLCAxKTsKKyAgICAgICAgICAgIHhlbl9iZV91bm1hcF9n cmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCBwYWdlKTsKICAgICAgICAgICAgIG5ldF90eF9yZXNw b25zZShuZXRkZXYsICZ0eHJlcSwgTkVUSUZfUlNQX09LQVkpOwogICAgICAgICB9CiAgICAgICAg IGlmICghbmV0ZGV2LT50eF93b3JrKSB7CkBAIC0yNTQsOSArMjUzLDcgQEAgc3RhdGljIHNzaXpl X3QgbmV0X3J4X3BhY2tldChOZXRDbGllbnRTdGF0ZSAqbmMsIGNvbnN0IHVpbnQ4X3QgKmJ1Ziwg c2l6ZV90IHNpemUKICAgICBtZW1jcHkoJnJ4cmVxLCBSSU5HX0dFVF9SRVFVRVNUKCZuZXRkZXYt PnJ4X3JpbmcsIHJjKSwgc2l6ZW9mKHJ4cmVxKSk7CiAgICAgbmV0ZGV2LT5yeF9yaW5nLnJlcV9j b25zID0gKytyYzsKIAotICAgIHBhZ2UgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZihuZXRkZXYt PnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5l dGRldi0+eGVuZGV2LmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnhy ZXEuZ3JlZiwgUFJPVF9XUklURSk7CisgICAgcGFnZSA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKCZu ZXRkZXYtPnhlbmRldiwgcnhyZXEuZ3JlZiwgUFJPVF9XUklURSk7CiAgICAgaWYgKHBhZ2UgPT0g TlVMTCkgewogICAgICAgICB4ZW5fcHZfcHJpbnRmKCZuZXRkZXYtPnhlbmRldiwgMCwKICAgICAg ICAgICAgICAgICAgICAgICAiZXJyb3I6IHJ4IGdyZWYgZGVyZWZlcmVuY2UgZmFpbGVkICglZClc biIsCkBAIC0yNjUsNyArMjYyLDcgQEAgc3RhdGljIHNzaXplX3QgbmV0X3J4X3BhY2tldChOZXRD bGllbnRTdGF0ZSAqbmMsIGNvbnN0IHVpbnQ4X3QgKmJ1Ziwgc2l6ZV90IHNpemUKICAgICAgICAg cmV0dXJuIC0xOwogICAgIH0KICAgICBtZW1jcHkocGFnZSArIE5FVF9JUF9BTElHTiwgYnVmLCBz aXplKTsKLSAgICB4ZW5nbnR0YWJfdW5tYXAobmV0ZGV2LT54ZW5kZXYuZ250dGFiZGV2LCBwYWdl LCAxKTsKKyAgICB4ZW5fYmVfdW5tYXBfZ3JhbnRfcmVmKCZuZXRkZXYtPnhlbmRldiwgcGFnZSk7 CiAgICAgbmV0X3J4X3Jlc3BvbnNlKG5ldGRldiwgJnJ4cmVxLCBORVRJRl9SU1BfT0tBWSwgTkVU X0lQX0FMSUdOLCBzaXplLCAwKTsKIAogICAgIHJldHVybiBzaXplOwpAQCAtMzM4LDE5ICszMzUs MTcgQEAgc3RhdGljIGludCBuZXRfY29ubmVjdChzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAg ICAgICAgIHJldHVybiAtMTsKICAgICB9CiAKLSAgICBuZXRkZXYtPnR4cyA9IHhlbmdudHRhYl9t YXBfZ3JhbnRfcmVmKG5ldGRldi0+eGVuZGV2LmdudHRhYmRldiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+eGVuZGV2LmRvbSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+dHhfcmluZ19yZWYsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUQgfCBQUk9UX1dS SVRFKTsKKyAgICBuZXRkZXYtPnR4cyA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKCZuZXRkZXYtPnhl bmRldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldGRldi0+dHhf cmluZ19yZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JF QUQgfCBQUk9UX1dSSVRFKTsKICAgICBpZiAoIW5ldGRldi0+dHhzKSB7CiAgICAgICAgIHJldHVy biAtMTsKICAgICB9Ci0gICAgbmV0ZGV2LT5yeHMgPSB4ZW5nbnR0YWJfbWFwX2dyYW50X3JlZihu ZXRkZXYtPnhlbmRldi5nbnR0YWJkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBuZXRkZXYtPnhlbmRldi5kb20sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBuZXRkZXYtPnJ4X3JpbmdfcmVmLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7CisgICAgbmV0 ZGV2LT5yeHMgPSB4ZW5fYmVfbWFwX2dyYW50X3JlZigmbmV0ZGV2LT54ZW5kZXYsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXRkZXYtPnJ4X3JpbmdfcmVmLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklU RSk7CiAgICAgaWYgKCFuZXRkZXYtPnJ4cykgewotICAgICAgICB4ZW5nbnR0YWJfdW5tYXAobmV0 ZGV2LT54ZW5kZXYuZ250dGFiZGV2LCBuZXRkZXYtPnR4cywgMSk7CisgICAgICAgIHhlbl9iZV91 bm1hcF9ncmFudF9yZWYoJm5ldGRldi0+eGVuZGV2LCBuZXRkZXYtPnR4cyk7CiAgICAgICAgIG5l dGRldi0+dHhzID0gTlVMTDsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KQEAgLTM3NSwxMSAr MzcwLDExIEBAIHN0YXRpYyB2b2lkIG5ldF9kaXNjb25uZWN0KHN0cnVjdCBYZW5EZXZpY2UgKnhl bmRldikKICAgICB4ZW5fcHZfdW5iaW5kX2V2dGNobigmbmV0ZGV2LT54ZW5kZXYpOwogCiAgICAg aWYgKG5ldGRldi0+dHhzKSB7Ci0gICAgICAgIHhlbmdudHRhYl91bm1hcChuZXRkZXYtPnhlbmRl di5nbnR0YWJkZXYsIG5ldGRldi0+dHhzLCAxKTsKKyAgICAgICAgeGVuX2JlX3VubWFwX2dyYW50 X3JlZigmbmV0ZGV2LT54ZW5kZXYsIG5ldGRldi0+dHhzKTsKICAgICAgICAgbmV0ZGV2LT50eHMg PSBOVUxMOwogICAgIH0KICAgICBpZiAobmV0ZGV2LT5yeHMpIHsKLSAgICAgICAgeGVuZ250dGFi X3VubWFwKG5ldGRldi0+eGVuZGV2LmdudHRhYmRldiwgbmV0ZGV2LT5yeHMsIDEpOworICAgICAg ICB4ZW5fYmVfdW5tYXBfZ3JhbnRfcmVmKCZuZXRkZXYtPnhlbmRldiwgbmV0ZGV2LT5yeHMpOwog ICAgICAgICBuZXRkZXYtPnJ4cyA9IE5VTEw7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvaHcvdXNi L3hlbi11c2IuYyBiL2h3L3VzYi94ZW4tdXNiLmMKaW5kZXggYjNhOTBjMC4uNWIyZTIxZSAxMDA2 NDQKLS0tIGEvaHcvdXNiL3hlbi11c2IuYworKysgYi9ody91c2IveGVuLXVzYi5jCkBAIC0xNzMs OCArMTczLDkgQEAgc3RhdGljIGludCB1c2JiYWNrX2dudHRhYl9tYXAoc3RydWN0IHVzYmJhY2tf cmVxICp1c2JiYWNrX3JlcSkKICAgICAgICAgZm9yIChpID0gMDsgaSA8IHVzYmJhY2tfcmVxLT5u cl9idWZmZXJfc2VnczsgaSsrKSB7CiAgICAgICAgICAgICByZWZbaV0gPSB1c2JiYWNrX3JlcS0+ cmVxLnNlZ1tpXS5ncmVmOwogICAgICAgICB9Ci0gICAgICAgIHVzYmJhY2tfcmVxLT5idWZmZXIg PSB4ZW5nbnR0YWJfbWFwX2RvbWFpbl9ncmFudF9yZWZzKHhlbmRldi0+Z250dGFiZGV2LAotICAg ICAgICAgICAgdXNiYmFja19yZXEtPm5yX2J1ZmZlcl9zZWdzLCB4ZW5kZXYtPmRvbSwgcmVmLCBw cm90KTsKKyAgICAgICAgdXNiYmFja19yZXEtPmJ1ZmZlciA9CisgICAgICAgICAgICB4ZW5fYmVf bWFwX2dyYW50X3JlZnMoeGVuZGV2LCByZWYsIHVzYmJhY2tfcmVxLT5ucl9idWZmZXJfc2VncywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm90KTsKIAogICAgICAgICBpZiAo IXVzYmJhY2tfcmVxLT5idWZmZXIpIHsKICAgICAgICAgICAgIHJldHVybiAtRU5PTUVNOwpAQCAt MjA2LDggKzIwNyw5IEBAIHN0YXRpYyBpbnQgdXNiYmFja19nbnR0YWJfbWFwKHN0cnVjdCB1c2Ji YWNrX3JlcSAqdXNiYmFja19yZXEpCiAgICAgZm9yIChpID0gMDsgaSA8IHVzYmJhY2tfcmVxLT5u cl9leHRyYV9zZWdzOyBpKyspIHsKICAgICAgICAgcmVmW2ldID0gdXNiYmFja19yZXEtPnJlcS5z ZWdbaSArIHVzYmJhY2tfcmVxLT5yZXEubnJfYnVmZmVyX3NlZ3NdLmdyZWY7CiAgICAgfQotICAg IHVzYmJhY2tfcmVxLT5pc29jX2J1ZmZlciA9IHhlbmdudHRhYl9tYXBfZG9tYWluX2dyYW50X3Jl ZnMoCi0gICAgICAgICB4ZW5kZXYtPmdudHRhYmRldiwgdXNiYmFja19yZXEtPm5yX2V4dHJhX3Nl Z3MsIHhlbmRldi0+ZG9tLCByZWYsIHByb3QpOworICAgIHVzYmJhY2tfcmVxLT5pc29jX2J1ZmZl ciA9CisgICAgICAgIHhlbl9iZV9tYXBfZ3JhbnRfcmVmcyh4ZW5kZXYsIHJlZiwgdXNiYmFja19y ZXEtPm5yX2V4dHJhX3NlZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm90KTsK IAogICAgIGlmICghdXNiYmFja19yZXEtPmlzb2NfYnVmZmVyKSB7CiAgICAgICAgIHJldHVybiAt RU5PTUVNOwpAQCAtMjkxLDE0ICsyOTMsMTQgQEAgc3RhdGljIHZvaWQgdXNiYmFja19kb19yZXNw b25zZShzdHJ1Y3QgdXNiYmFja19yZXEgKnVzYmJhY2tfcmVxLCBpbnQzMl90IHN0YXR1cywKICAg ICB9CiAKICAgICBpZiAodXNiYmFja19yZXEtPmJ1ZmZlcikgewotICAgICAgICB4ZW5nbnR0YWJf dW5tYXAoeGVuZGV2LT5nbnR0YWJkZXYsIHVzYmJhY2tfcmVxLT5idWZmZXIsCi0gICAgICAgICAg ICAgICAgICAgICAgICB1c2JiYWNrX3JlcS0+bnJfYnVmZmVyX3NlZ3MpOworICAgICAgICB4ZW5f YmVfdW5tYXBfZ3JhbnRfcmVmcyh4ZW5kZXYsIHVzYmJhY2tfcmVxLT5idWZmZXIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzYmJhY2tfcmVxLT5ucl9idWZmZXJfc2Vncyk7CiAg ICAgICAgIHVzYmJhY2tfcmVxLT5idWZmZXIgPSBOVUxMOwogICAgIH0KIAogICAgIGlmICh1c2Ji YWNrX3JlcS0+aXNvY19idWZmZXIpIHsKLSAgICAgICAgeGVuZ250dGFiX3VubWFwKHhlbmRldi0+ Z250dGFiZGV2LCB1c2JiYWNrX3JlcS0+aXNvY19idWZmZXIsCi0gICAgICAgICAgICAgICAgICAg ICAgICB1c2JiYWNrX3JlcS0+bnJfZXh0cmFfc2Vncyk7CisgICAgICAgIHhlbl9iZV91bm1hcF9n cmFudF9yZWZzKHhlbmRldiwgdXNiYmFja19yZXEtPmlzb2NfYnVmZmVyLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1c2JiYWNrX3JlcS0+bnJfZXh0cmFfc2Vncyk7CiAgICAgICAg IHVzYmJhY2tfcmVxLT5pc29jX2J1ZmZlciA9IE5VTEw7CiAgICAgfQogCkBAIC04MzQsMTEgKzgz NiwxMSBAQCBzdGF0aWMgdm9pZCB1c2JiYWNrX2Rpc2Nvbm5lY3Qoc3RydWN0IFhlbkRldmljZSAq eGVuZGV2KQogICAgIHhlbl9wdl91bmJpbmRfZXZ0Y2huKHhlbmRldik7CiAKICAgICBpZiAodXNi aWYtPnVyYl9zcmluZykgewotICAgICAgICB4ZW5nbnR0YWJfdW5tYXAoeGVuZGV2LT5nbnR0YWJk ZXYsIHVzYmlmLT51cmJfc3JpbmcsIDEpOworICAgICAgICB4ZW5fYmVfdW5tYXBfZ3JhbnRfcmVm KHhlbmRldiwgdXNiaWYtPnVyYl9zcmluZyk7CiAgICAgICAgIHVzYmlmLT51cmJfc3JpbmcgPSBO VUxMOwogICAgIH0KICAgICBpZiAodXNiaWYtPmNvbm5fc3JpbmcpIHsKLSAgICAgICAgeGVuZ250 dGFiX3VubWFwKHhlbmRldi0+Z250dGFiZGV2LCB1c2JpZi0+Y29ubl9zcmluZywgMSk7CisgICAg ICAgIHhlbl9iZV91bm1hcF9ncmFudF9yZWYoeGVuZGV2LCB1c2JpZi0+Y29ubl9zcmluZyk7CiAg ICAgICAgIHVzYmlmLT5jb25uX3NyaW5nID0gTlVMTDsKICAgICB9CiAKQEAgLTg3NywxMiArODc5 LDEwIEBAIHN0YXRpYyBpbnQgdXNiYmFja19jb25uZWN0KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRl dikKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KIAotICAgIHVzYmlmLT51cmJfc3JpbmcgPSB4 ZW5nbnR0YWJfbWFwX2dyYW50X3JlZih4ZW5kZXYtPmdudHRhYmRldiwgeGVuZGV2LT5kb20sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVyYl9yaW5nX3Jl ZiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9S RUFEIHwgUFJPVF9XUklURSk7Ci0gICAgdXNiaWYtPmNvbm5fc3JpbmcgPSB4ZW5nbnR0YWJfbWFw X2dyYW50X3JlZih4ZW5kZXYtPmdudHRhYmRldiwgeGVuZGV2LT5kb20sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25uX3JpbmdfcmVmLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJP VF9XUklURSk7CisgICAgdXNiaWYtPnVyYl9zcmluZyA9IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKHhl bmRldiwgdXJiX3JpbmdfcmVmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKKyAgICB1c2JpZi0+Y29ubl9zcmluZyA9 IHhlbl9iZV9tYXBfZ3JhbnRfcmVmKHhlbmRldiwgY29ubl9yaW5nX3JlZiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRCB8IFBST1RfV1JJVEUp OwogICAgIGlmICghdXNiaWYtPnVyYl9zcmluZyB8fCAhdXNiaWYtPmNvbm5fc3JpbmcpIHsKICAg ICAgICAgeGVuX3B2X3ByaW50Zih4ZW5kZXYsIDAsICJlcnJvciBtYXBwaW5nIHJpbmdzXG4iKTsK ICAgICAgICAgdXNiYmFja19kaXNjb25uZWN0KHhlbmRldik7CkBAIC0xMDI0LDEwICsxMDI0LDcg QEAgc3RhdGljIHZvaWQgdXNiYmFja19hbGxvYyhzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAK ICAgICAvKiBtYXhfZ3JhbnRzOiBmb3IgZWFjaCByZXF1ZXN0IGFuZCBmb3IgdGhlIHJpbmdzIChy ZXF1ZXN0IGFuZCBjb25uZWN0KS4gKi8KICAgICBtYXhfZ3JhbnRzID0gVVNCSUZfTUFYX1NFR01F TlRTX1BFUl9SRVFVRVNUICogVVNCX1VSQl9SSU5HX1NJWkUgKyAyOwotICAgIGlmICh4ZW5nbnR0 YWJfc2V0X21heF9ncmFudHMoeGVuZGV2LT5nbnR0YWJkZXYsIG1heF9ncmFudHMpIDwgMCkgewot ICAgICAgICB4ZW5fcHZfcHJpbnRmKHhlbmRldiwgMCwgInhlbmdudHRhYl9zZXRfbWF4X2dyYW50 cyBmYWlsZWQ6ICVzXG4iLAotICAgICAgICAgICAgICAgICAgICAgIHN0cmVycm9yKGVycm5vKSk7 Ci0gICAgfQorICAgIHhlbl9iZV9zZXRfbWF4X2dyYW50X3JlZnMoeGVuZGV2LCBtYXhfZ3JhbnRz KTsKIH0KIAogc3RhdGljIGludCB1c2JiYWNrX2ZyZWUoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2 KQotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs