From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH 6/8] xen/arm: efi: Avoid duplicating the addition of a new efi memory descriptor Date: Fri, 3 Feb 2017 19:18:54 +0000 Message-ID: <1486149538-20432-11-git-send-email-julien.grall@arm.com> References: <1486149538-20432-1-git-send-email-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1486149538-20432-1-git-send-email-julien.grall@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Julien Grall , sstabellini@kernel.org, shankerd@codeaurora.org List-Id: xen-devel@lists.xenproject.org VGhlIGNvZGUgdG8gYWRkIGEgbmV3IG1lbW9yeSBkZXNjcmlwdG9yIGlzIGR1cGxpY2F0ZWQgdGhy ZWUgdGltZXMuIEFkZCBhCm5ldyBoZWxwZXIgdGhhdCBhZGRzIHRoZSBkZXNjcmlwdG9yLgoKU2ln bmVkLW9mZi1ieTogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJtLmNvbT4KLS0tCiB4ZW4v YXJjaC9hcm0vZWZpL2VmaS1kb20wLmMgfCA0MCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2VmaS9lZmktZG9tMC5jIGIveGVuL2Fy Y2gvYXJtL2VmaS9lZmktZG9tMC5jCmluZGV4IGM0MGE3YzUuLmYzMDdmMjYgMTAwNjQ0Ci0tLSBh L3hlbi9hcmNoL2FybS9lZmkvZWZpLWRvbTAuYworKysgYi94ZW4vYXJjaC9hcm0vZWZpL2VmaS1k b20wLmMKQEAgLTk2LDYgKzk2LDE4IEBAIHZvaWQgX19pbml0IGFjcGlfY3JlYXRlX2VmaV9zeXN0 ZW1fdGFibGUoc3RydWN0IGRvbWFpbiAqZCwKICAgICB0YmxfYWRkW1RCTF9FRklUXS5zaXplID0g dGFibGVfc2l6ZTsKIH0KIAorc3RhdGljIHZvaWQgX19pbml0IGZpbGxfZWZpX21lbW9yeV9kZXNj cmlwdG9yKEVGSV9NRU1PUllfREVTQ1JJUFRPUiAqZGVzYywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBVSU5UMzIgdHlwZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFRklfUEhZU0lDQUxfQUREUkVTUyBzdGFydCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBVSU5UNjQgc2l6 ZSkKK3sKKyAgICBkZXNjLT5UeXBlID0gdHlwZTsKKyAgICBkZXNjLT5QaHlzaWNhbFN0YXJ0ID0g c3RhcnQ7CisgICAgQlVHX09OKHNpemUgJiBFRklfUEFHRV9NQVNLKTsKKyAgICBkZXNjLT5OdW1i ZXJPZlBhZ2VzID0gRUZJX1NJWkVfVE9fUEFHRVMoc2l6ZSk7CisgICAgZGVzYy0+QXR0cmlidXRl ID0gRUZJX01FTU9SWV9XQjsKK30KKwogdm9pZCBfX2luaXQgYWNwaV9jcmVhdGVfZWZpX21tYXBf dGFibGUoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IHN0cnVjdCBtZW1pbmZvICptZW0sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdHJ1Y3QgbWVtYmFuayB0YmxfYWRkW10pCkBAIC0xMTAsMjggKzEy MiwxNiBAQCB2b2lkIF9faW5pdCBhY3BpX2NyZWF0ZV9lZmlfbW1hcF90YWJsZShzdHJ1Y3QgZG9t YWluICpkLAogCiAgICAgb2Zmc2V0ID0gMDsKICAgICBmb3IoIGkgPSAwOyBpIDwgbWVtLT5ucl9i YW5rczsgaSsrLCBvZmZzZXQrKyApCi0gICAgewotICAgICAgICBtZW1vcnlfbWFwW29mZnNldF0u VHlwZSA9IEVmaUNvbnZlbnRpb25hbE1lbW9yeTsKLSAgICAgICAgbWVtb3J5X21hcFtvZmZzZXRd LlBoeXNpY2FsU3RhcnQgPSBtZW0tPmJhbmtbaV0uc3RhcnQ7Ci0gICAgICAgIEJVR19PTihtZW0t PmJhbmtbaV0uc2l6ZSAmIEVGSV9QQUdFX01BU0spOwotICAgICAgICBtZW1vcnlfbWFwW29mZnNl dF0uTnVtYmVyT2ZQYWdlcyA9IEVGSV9TSVpFX1RPX1BBR0VTKG1lbS0+YmFua1tpXS5zaXplKTsK LSAgICAgICAgbWVtb3J5X21hcFtvZmZzZXRdLkF0dHJpYnV0ZSA9IEVGSV9NRU1PUllfV0I7Ci0g ICAgfQorICAgICAgICBmaWxsX2VmaV9tZW1vcnlfZGVzY3JpcHRvcigmbWVtb3J5X21hcFtvZmZz ZXRdLCBFZmlDb252ZW50aW9uYWxNZW1vcnksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1lbS0+YmFua1tpXS5zdGFydCwgbWVtLT5iYW5rW2ldLnNpemUpOwogCiAgICAgZm9y KCBpID0gMDsgaSA8IGFjcGlfbWVtLm5yX2JhbmtzOyBpKyssIG9mZnNldCsrICkKLSAgICB7Ci0g ICAgICAgIG1lbW9yeV9tYXBbb2Zmc2V0XS5UeXBlID0gRWZpQUNQSVJlY2xhaW1NZW1vcnk7Ci0g ICAgICAgIG1lbW9yeV9tYXBbb2Zmc2V0XS5QaHlzaWNhbFN0YXJ0ID0gYWNwaV9tZW0uYmFua1tp XS5zdGFydDsKLSAgICAgICAgQlVHX09OKGFjcGlfbWVtLmJhbmtbaV0uc2l6ZSAmIEVGSV9QQUdF X01BU0spOwotICAgICAgICBtZW1vcnlfbWFwW29mZnNldF0uTnVtYmVyT2ZQYWdlcyA9IEVGSV9T SVpFX1RPX1BBR0VTKGFjcGlfbWVtLmJhbmtbaV0uc2l6ZSk7Ci0gICAgICAgIG1lbW9yeV9tYXBb b2Zmc2V0XS5BdHRyaWJ1dGUgPSBFRklfTUVNT1JZX1dCOwotICAgIH0KLQotICAgIG1lbW9yeV9t YXBbb2Zmc2V0XS5UeXBlID0gRWZpQUNQSVJlY2xhaW1NZW1vcnk7Ci0gICAgbWVtb3J5X21hcFtv ZmZzZXRdLlBoeXNpY2FsU3RhcnQgPSBkLT5hcmNoLmVmaV9hY3BpX2dwYTsKLSAgICBCVUdfT04o ZC0+YXJjaC5lZmlfYWNwaV9sZW4gJiBFRklfUEFHRV9NQVNLKTsKLSAgICBtZW1vcnlfbWFwW29m ZnNldF0uTnVtYmVyT2ZQYWdlcyA9IEVGSV9TSVpFX1RPX1BBR0VTKGQtPmFyY2guZWZpX2FjcGlf bGVuKTsKLSAgICBtZW1vcnlfbWFwW29mZnNldF0uQXR0cmlidXRlID0gRUZJX01FTU9SWV9XQjsK KyAgICAgICAgZmlsbF9lZmlfbWVtb3J5X2Rlc2NyaXB0b3IoJm1lbW9yeV9tYXBbb2Zmc2V0XSwg RWZpQUNQSVJlY2xhaW1NZW1vcnksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGFjcGlfbWVtLmJhbmtbaV0uc3RhcnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGFjcGlfbWVtLmJhbmtbaV0uc2l6ZSk7CisKKyAgICBmaWxsX2VmaV9tZW1vcnlfZGVzY3Jp cHRvcigmbWVtb3J5X21hcFtvZmZzZXRdLCBFZmlBQ1BJUmVjbGFpbU1lbW9yeSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLmVmaV9hY3BpX2dwYSwgZC0+YXJjaC5lZmlf YWNwaV9sZW4pOwogCiAgICAgdGJsX2FkZFtUQkxfTU1BUF0uc3RhcnQgPSBkLT5hcmNoLmVmaV9h Y3BpX2dwYQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBhY3BpX2dldF90YWJsZV9v ZmZzZXQodGJsX2FkZCwgVEJMX01NQVApOwotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK