From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v3 12/17] xen/arm: vpsci: Remove parameter 'ver' from do_common_cpu Date: Thu, 15 Feb 2018 15:02:43 +0000 Message-ID: <20180215150248.28922-13-julien.grall@arm.com> References: <20180215150248.28922-1-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180215150248.28922-1-julien.grall@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Julien Grall , sstabellini@kernel.org, volodymyr_babchuk@epam.com, andre.przywara@linaro.org List-Id: xen-devel@lists.xenproject.org Q3VycmVudGx5LCB0aGUgYmVoYXZpb3Igb2YgZG9fY29tbW9uX2NwdSB3aWxsIHNsaWdodGx5IGNo YW5nZSBkZXBlbmRpbmcKb24gdGhlIFBTQ0kgdmVyc2lvbiBwYXNzZWQgaW4gcGFyYW1ldGVyLiBM b29raW5nIGF0IHRoZSBjb2RlLCBtb3JlIHRoZQpzcGVjaWZpYyAwLjIgYmVoYXZpb3IgY291bGQg bW92ZSBvdXQgb2YgdGhlIGZ1bmN0aW9uIG9yIGFkYXB0ZWQgZm9yIDAuMToKCiAgICAtIHgwL3Iw IGNhbiBiZSB1cGRhdGVkIG9uIFBTQ0kgMC4xIGJlY2F1c2UgZ2VuZXJhbCBwdXJwb3NlIHJlZ2lz dGVycwogICAgYXJlIHVuZGVmaW5lZCB1cG9uIENQVSBvbi4KICAgIC0gUFNDSSAwLjEgZG9lcyBu b3QgZGVmaW5lZCBQU0NJX0FMUkVBRFlfT04uIEhvd2V2ZXIsIGl0IHdvdWxkIGJlCiAgICBzYWZl ciB0byBiYWlsIG91dCBpZiB0aGUgQ1BVIGlzIGFscmVhZHkgb24uCgpCYXNlZCBvbiB0aGlzLCB0 aGUgcGFyYW1ldGVyICd2ZXInIGlzIHJlbW92ZWQgYW5kIGRvX3BzY2lfY3B1X29uCihpbXBsZW1l bnRhdGlvbiBmb3IgUFNDSSAwLjEpIGlzIGFkYXB0ZWQgdG8gYXZvaWQgcmV0dXJuaW5nClBTQ0lf QUxSRUFEWV9PTi4KClNpZ25lZC1vZmYtYnk6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxsQGFy bS5jb20+ClJldmlld2VkLWJ5OiBWb2xvZHlteXIgQmFiY2h1ayA8dm9sb2R5bXlyLmJhYmNodWtA ZXBhbS5jb20+CgotLS0KICAgIFRoZSByZXZpZXdlZC1ieSB3YXMga2VwdCBkZXNwaXRlIG1vdmUg dGhpcyBwYXRjaCB0b3dhcmRzIHRoZSBlbmQKICAgIG9mIHRoZSBzZXJpZXMgYmVjYXVzZSB0aGVy ZSB3YXMgbm8gY2xhc2ggd2l0aCB0aGUgcmVzdCBvZiB0aGUgc2VyaWVzLgoKICAgIENoYW5nZXMg aW4gdjI6CiAgICAgICAgLSBNb3ZlIHRoZSBwYXRjaCB0b3dhcmRzIHRoZSBlbmQgb2YgdGhlIHNl cmllcyBhcyBub3Qgc3RyaWN0bHkKICAgICAgICBuZWNlc3NhcnkgZm9yIFNQMi4KICAgICAgICAt IEFkZCBWb2xvZHlteXIncyByZXZpZXdlZC1ieQotLS0KIHhlbi9hcmNoL2FybS92cHNjaS5jIHwg MjggKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS92cHNj aS5jIGIveGVuL2FyY2gvYXJtL3Zwc2NpLmMKaW5kZXggMTllZTdjYWViNC4uN2VhM2VhNThlMyAx MDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL3Zwc2NpLmMKKysrIGIveGVuL2FyY2gvYXJtL3Zwc2Np LmMKQEAgLTIyLDcgKzIyLDcgQEAKICNpbmNsdWRlIDxwdWJsaWMvc2NoZWQuaD4KIAogc3RhdGlj IGludCBkb19jb21tb25fY3B1X29uKHJlZ2lzdGVyX3QgdGFyZ2V0X2NwdSwgcmVnaXN0ZXJfdCBl bnRyeV9wb2ludCwKLSAgICAgICAgICAgICAgICAgICAgICAgcmVnaXN0ZXJfdCBjb250ZXh0X2lk LGludCB2ZXIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnaXN0ZXJfdCBjb250ZXh0 X2lkKQogewogICAgIHN0cnVjdCB2Y3B1ICp2OwogICAgIHN0cnVjdCBkb21haW4gKmQgPSBjdXJy ZW50LT5kb21haW47CkBAIC00MCw4ICs0MCw3IEBAIHN0YXRpYyBpbnQgZG9fY29tbW9uX2NwdV9v bihyZWdpc3Rlcl90IHRhcmdldF9jcHUsIHJlZ2lzdGVyX3QgZW50cnlfcG9pbnQsCiAgICAgaWYg KCBpc182NGJpdF9kb21haW4oZCkgJiYgaXNfdGh1bWIgKQogICAgICAgICByZXR1cm4gUFNDSV9J TlZBTElEX1BBUkFNRVRFUlM7CiAKLSAgICBpZiAoICh2ZXIgPT0gUFNDSV9WRVJTSU9OKDAsIDIp KSAmJgotICAgICAgICAgICAgIXRlc3RfYml0KF9WUEZfZG93biwgJnYtPnBhdXNlX2ZsYWdzKSAp CisgICAgaWYgKCAhdGVzdF9iaXQoX1ZQRl9kb3duLCAmdi0+cGF1c2VfZmxhZ3MpICkKICAgICAg ICAgcmV0dXJuIFBTQ0lfQUxSRUFEWV9PTjsKIAogICAgIGlmICggKGN0eHQgPSBhbGxvY192Y3B1 X2d1ZXN0X2NvbnRleHQoKSkgPT0gTlVMTCApCkBAIC01NSwxOCArNTQsMjEgQEAgc3RhdGljIGlu dCBkb19jb21tb25fY3B1X29uKHJlZ2lzdGVyX3QgdGFyZ2V0X2NwdSwgcmVnaXN0ZXJfdCBlbnRy eV9wb2ludCwKICAgICBjdHh0LT50dGJyMCA9IDA7CiAgICAgY3R4dC0+dHRicjEgPSAwOwogICAg IGN0eHQtPnR0YmNyID0gMDsgLyogRGVmaW5lZCBSZXNldCBWYWx1ZSAqLworCisgICAgLyoKKyAg ICAgKiB4MC9yMF91c3IgYXJlIGFsd2F5cyB1cGRhdGVkIGJlY2F1c2UgZm9yIFBTQ0kgMC4xIHRo ZSBnZW5lcmFsCisgICAgICogcHVycG9zZSByZWdpc3RlcnMgYXJlIHVuZGVmaW5lZCB1cG9uIENQ VV9vbi4KKyAgICAgKi8KICAgICBpZiAoIGlzXzMyYml0X2RvbWFpbihkKSApCiAgICAgewogICAg ICAgICBjdHh0LT51c2VyX3JlZ3MuY3BzciA9IFBTUl9HVUVTVDMyX0lOSVQ7Ci0gICAgICAgIGlm ICggdmVyID09IFBTQ0lfVkVSU0lPTigwLCAyKSApCi0gICAgICAgICAgICBjdHh0LT51c2VyX3Jl Z3MucjBfdXNyID0gY29udGV4dF9pZDsKKyAgICAgICAgY3R4dC0+dXNlcl9yZWdzLnIwX3VzciA9 IGNvbnRleHRfaWQ7CiAgICAgfQogI2lmZGVmIENPTkZJR19BUk1fNjQKICAgICBlbHNlCiAgICAg ewogICAgICAgICBjdHh0LT51c2VyX3JlZ3MuY3BzciA9IFBTUl9HVUVTVDY0X0lOSVQ7Ci0gICAg ICAgIGlmICggdmVyID09IFBTQ0lfVkVSU0lPTigwLCAyKSApCi0gICAgICAgICAgICBjdHh0LT51 c2VyX3JlZ3MueDAgPSBjb250ZXh0X2lkOworICAgICAgICBjdHh0LT51c2VyX3JlZ3MueDAgPSBj b250ZXh0X2lkOwogICAgIH0KICNlbmRpZgogCkBAIC05Myw3ICs5NSwxNCBAQCBzdGF0aWMgaW50 IGRvX2NvbW1vbl9jcHVfb24ocmVnaXN0ZXJfdCB0YXJnZXRfY3B1LCByZWdpc3Rlcl90IGVudHJ5 X3BvaW50LAogCiBzdGF0aWMgaW50MzJfdCBkb19wc2NpX2NwdV9vbih1aW50MzJfdCB2Y3B1aWQs IHJlZ2lzdGVyX3QgZW50cnlfcG9pbnQpCiB7Ci0gICAgcmV0dXJuIGRvX2NvbW1vbl9jcHVfb24o dmNwdWlkLCBlbnRyeV9wb2ludCwgMCAsIFBTQ0lfVkVSU0lPTigwLCAxKSk7CisgICAgaW50MzJf dCByZXQ7CisKKyAgICByZXQgPSBkb19jb21tb25fY3B1X29uKHZjcHVpZCwgZW50cnlfcG9pbnQs IDApOworICAgIC8qCisgICAgICogUFNDSSAwLjEgZG9lcyBub3QgZGVmaW5lIHRoZSByZXR1cm4g Y29kZSBQU0NJX0FMUkVBRFlfT04uCisgICAgICogSW5zdGVhZCwgcmV0dXJuIFBTQ0lfSU5WQUxJ RF9QQVJBTUVURVJTLgorICAgICAqLworICAgIHJldHVybiAocmV0ID09IFBTQ0lfQUxSRUFEWV9P TikgPyBQU0NJX0lOVkFMSURfUEFSQU1FVEVSUyA6IHJldDsKIH0KIAogc3RhdGljIGludDMyX3Qg ZG9fcHNjaV9jcHVfb2ZmKHVpbnQzMl90IHBvd2VyX3N0YXRlKQpAQCAtMTM3LDggKzE0Niw3IEBA IHN0YXRpYyBpbnQzMl90IGRvX3BzY2lfMF8yX2NwdV9vbihyZWdpc3Rlcl90IHRhcmdldF9jcHUs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnaXN0ZXJfdCBlbnRyeV9wb2lu dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWdpc3Rlcl90IGNvbnRleHRf aWQpCiB7Ci0gICAgcmV0dXJuIGRvX2NvbW1vbl9jcHVfb24odGFyZ2V0X2NwdSwgZW50cnlfcG9p bnQsIGNvbnRleHRfaWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNDSV9WRVJTSU9O KDAsIDIpKTsKKyAgICByZXR1cm4gZG9fY29tbW9uX2NwdV9vbih0YXJnZXRfY3B1LCBlbnRyeV9w b2ludCwgY29udGV4dF9pZCk7CiB9CiAKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBsb25nIHRhcmdl dF9hZmZpbml0eV9tYXNrW10gPSB7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxt YW4vbGlzdGluZm8veGVuLWRldmVs