From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH 4/7] xen/arm: efi: Avoid duplicating the addition of a new bank Date: Fri, 3 Feb 2017 19:18:51 +0000 Message-ID: <1486149538-20432-8-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 VGhlIGNvZGUgdG8gYWRkIGEgbmV3IGJhbmsgaXMgZHVwbGljYXRlZCB0d2ljZS4gQWRkIGEgbmV3 IGhlbHBlciB0aGF0CmNoZWNrcyBpZiB0aGUgbWF4aW11bSBvZiBiYW5rIGhhcyBub3QgcmVhY2hl ZCBhbmQgYWRkcyB0aGUgYmFuay4KClNpZ25lZC1vZmYtYnk6IEp1bGllbiBHcmFsbCA8anVsaWVu LmdyYWxsQGFybS5jb20+Ci0tLQogeGVuL2FyY2gvYXJtL2VmaS9lZmktYm9vdC5oIHwgMzQgKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9lZmkv ZWZpLWJvb3QuaCBiL3hlbi9hcmNoL2FybS9lZmkvZWZpLWJvb3QuaAppbmRleCAwNDVkNmNlLi43 NTdkOWM2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vZWZpL2VmaS1ib290LmgKKysrIGIveGVu L2FyY2gvYXJtL2VmaS9lZmktYm9vdC5oCkBAIC0xMjQsMTUgKzEyNCwyNyBAQCBzdGF0aWMgdm9p ZCBfX2luaXQgKmxvb2t1cF9mZHRfY29uZmlnX3RhYmxlKEVGSV9TWVNURU1fVEFCTEUgKnN5c190 YWJsZSkKICAgICByZXR1cm4gZmR0OwogfQogCitzdGF0aWMgYm9vbCBtZW1pbmZvX2FkZF9iYW5r KHN0cnVjdCBtZW1pbmZvICptZW0sIEVGSV9NRU1PUllfREVTQ1JJUFRPUiAqZGVzYykKK3sKKyAg ICBzdHJ1Y3QgbWVtYmFuayAqYmFuazsKKworICAgIGlmICggbWVtLT5ucl9iYW5rcyA+IE5SX01F TV9CQU5LUyApCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGJhbmsgPSAmbWVtLT5iYW5r W21lbS0+bnJfYmFua3NdOworICAgIGJhbmstPnN0YXJ0ID0gZGVzYy0+UGh5c2ljYWxTdGFydDsK KyAgICBiYW5rLT5zaXplID0gZGVzYy0+TnVtYmVyT2ZQYWdlcyAqIEVGSV9QQUdFX1NJWkU7CisK KyAgICBtZW0tPm5yX2JhbmtzKys7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogc3RhdGljIEVG SV9TVEFUVVMgX19pbml0IGVmaV9wcm9jZXNzX21lbW9yeV9tYXBfYm9vdGluZm8oRUZJX01FTU9S WV9ERVNDUklQVE9SICptYXAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBVSU5UTiBtbWFwX3NpemUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBVSU5UTiBkZXNjX3NpemUpCiB7CiAgICAgaW50IEluZGV4Owot ICAgIGludCBpID0gMDsKLSNpZmRlZiBDT05GSUdfQUNQSQotICAgIGludCBqID0gMDsKLSNlbmRp ZgogICAgIEVGSV9NRU1PUllfREVTQ1JJUFRPUiAqZGVzY19wdHIgPSBtYXA7CiAKICAgICBmb3Ig KCBJbmRleCA9IDA7IEluZGV4IDwgKG1tYXBfc2l6ZSAvIGRlc2Nfc2l6ZSk7IEluZGV4KysgKQpA QCAtMTQyLDM3ICsxNTQsMjcgQEAgc3RhdGljIEVGSV9TVEFUVVMgX19pbml0IGVmaV9wcm9jZXNz X21lbW9yeV9tYXBfYm9vdGluZm8oRUZJX01FTU9SWV9ERVNDUklQVE9SICoKICAgICAgICAgICAg ICAgKGRlc2NfcHRyLT5UeXBlID09IEVmaUJvb3RTZXJ2aWNlc0NvZGUgfHwKICAgICAgICAgICAg ICAgIGRlc2NfcHRyLT5UeXBlID09IEVmaUJvb3RTZXJ2aWNlc0RhdGEpKSApCiAgICAgICAgIHsK LSAgICAgICAgICAgIGlmICggaSA+PSBOUl9NRU1fQkFOS1MgKQorICAgICAgICAgICAgaWYgKCAh bWVtaW5mb19hZGRfYmFuaygmYm9vdGluZm8ubWVtLCBkZXNjX3B0cikgKQogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIFByaW50U3RyKEwiV2FybmluZzogQWxsICIgX19zdHJpbmdpZnko TlJfTUVNX0JBTktTKQogICAgICAgICAgICAgICAgICAgICAgICAgICAiIGJvb3RpbmZvIG1lbSBi YW5rcyBleGhhdXN0ZWQuXHJcbiIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgYm9vdGluZm8ubWVtLmJhbmtbaV0uc3RhcnQgPSBkZXNjX3B0ci0+ UGh5c2ljYWxTdGFydDsKLSAgICAgICAgICAgIGJvb3RpbmZvLm1lbS5iYW5rW2ldLnNpemUgPSBk ZXNjX3B0ci0+TnVtYmVyT2ZQYWdlcyAqIEVGSV9QQUdFX1NJWkU7Ci0gICAgICAgICAgICArK2k7 CiAgICAgICAgIH0KICNpZmRlZiBDT05GSUdfQUNQSQogICAgICAgICBlbHNlIGlmICggZGVzY19w dHItPlR5cGUgPT0gRWZpQUNQSVJlY2xhaW1NZW1vcnkgKQogICAgICAgICB7Ci0gICAgICAgICAg ICBpZiAoIGogPj0gTlJfTUVNX0JBTktTICkKKyAgICAgICAgICAgIGlmICggIW1lbWluZm9fYWRk X2JhbmsoJmFjcGlfbWVtLCBkZXNjX3B0cikgKQogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgIFByaW50U3RyKEwiRXJyb3I6IEFsbCAiIF9fc3RyaW5naWZ5KE5SX01FTV9CQU5LUykKICAg ICAgICAgICAgICAgICAgICAgICAgICAgIiBhY3BpIG1lbWluZm8gbWVtIGJhbmtzIGV4aGF1c3Rl ZC5cclxuIik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIEVGSV9MT0FEX0VSUk9SOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgYWNwaV9tZW0uYmFua1tqXS5zdGFydCA9IGRlc2NfcHRyLT5Q aHlzaWNhbFN0YXJ0OwotICAgICAgICAgICAgYWNwaV9tZW0uYmFua1tqXS5zaXplICA9IGRlc2Nf cHRyLT5OdW1iZXJPZlBhZ2VzICogRUZJX1BBR0VfU0laRTsKLSAgICAgICAgICAgICsrajsKICAg ICAgICAgfQogI2VuZGlmCiAgICAgICAgIGRlc2NfcHRyID0gTmV4dE1lbW9yeURlc2NyaXB0b3Io ZGVzY19wdHIsIGRlc2Nfc2l6ZSk7CiAgICAgfQogCi0gICAgYm9vdGluZm8ubWVtLm5yX2Jhbmtz ID0gaTsKLSNpZmRlZiBDT05GSUdfQUNQSQotICAgIGFjcGlfbWVtLm5yX2JhbmtzID0gajsKLSNl bmRpZgogICAgIHJldHVybiBFRklfU1VDQ0VTUzsKIH0KIAotLSAKMS45LjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK