From: Andre Przywara Subject: [PATCH v4 5/8] ARM: VGIC: factor out vgic_connect_hw_irq() Date: Mon, 5 Feb 2018 16:19:22 +0000 Message-ID: <20180205161925.11054-6-andre.przywara@arm.com> References: <20180205161925.11054-1-andre.przywara@arm.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.84_2) (envelope-from ) id 1eijUj-0007LQ-AY for xen-devel@lists.xenproject.org; Mon, 05 Feb 2018 16:19:49 +0000 In-Reply-To: <20180205161925.11054-1-andre.przywara@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Julien Grall , Stefano Stabellini Cc: xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org QXQgdGhlIG1vbWVudCB3ZSBoYXBwaWx5IGFjY2VzcyBWR0lDIGludGVybmFsIGRhdGEgc3RydWN0 dXJlcyBsaWtlCnRoZSByYW5rIGFuZCBzdHJ1Y3QgcGVuZGluZ19pcnEgaW4gZ2ljLmMsIHdoaWNo IHNob3VsZCBiZSBWR0lDIGFnbm9zdGljLgoKRmFjdG9yIG91dCBhIG5ldyBmdW5jdGlvbiB2Z2lj X2Nvbm5lY3RfaHdfaXJxKCksIHdoaWNoIGFsbG93cyBhIHZpcnR1YWwKSVJRIHRvIGJlIGNvbm5l Y3RlZCB0byBhIGhhcmR3YXJlIElSUSAodXNpbmcgdGhlIGh3IGJpdCBpbiB0aGUgTFIpLgoKVGhp cyByZW1vdmVzIHNhaWQgYWNjZXNzZXMgdG8gVkdJQyBkYXRhIHN0cnVjdHVyZXMgYW5kIGltcHJv dmVzIGFic3RyYWN0aW9uLgoKU2lnbmVkLW9mZi1ieTogQW5kcmUgUHJ6eXdhcmEgPGFuZHJlLnBy enl3YXJhQGFybS5jb20+Ci0tLQogeGVuL2FyY2gvYXJtL2dpYy12Z2ljLmMgICAgfCAzNiArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIHhlbi9hcmNoL2FybS9naWMuYyAgICAg ICAgIHwgNDQgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhl bi9pbmNsdWRlL2FzbS1hcm0vdmdpYy5oIHwgIDIgKysKIDMgZmlsZXMgY2hhbmdlZCwgNDggaW5z ZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2dp Yy12Z2ljLmMgYi94ZW4vYXJjaC9hcm0vZ2ljLXZnaWMuYwppbmRleCAxZDU3NDRlY2M4Li5mZmY3 YzAxZWU4IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vZ2ljLXZnaWMuYworKysgYi94ZW4vYXJj aC9hcm0vZ2ljLXZnaWMuYwpAQCAtMzk3LDYgKzM5Nyw0MiBAQCB2b2lkIGdpY19kdW1wX3ZnaWNf aW5mbyhzdHJ1Y3QgdmNwdSAqdikKICAgICAgICAgcHJpbnRrKCJQZW5kaW5nIGlycT0lZFxuIiwg cC0+aXJxKTsKIH0KIAoraW50IHZnaWNfY29ubmVjdF9od19pcnEoc3RydWN0IGRvbWFpbiAqZCwg c3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCB2aXJxLAorICAgICAgICAgICAgICAgICAgICAg ICAgc3RydWN0IGlycV9kZXNjICpkZXNjLCBib29sIGNvbm5lY3QpCit7CisgICAgdW5zaWduZWQg bG9uZyBmbGFnczsKKyAgICAvKiBVc2UgdmNwdTAgdG8gcmV0cmlldmUgdGhlIHBlbmRpbmdfaXJx IHN0cnVjdC4gR2l2ZW4gdGhhdCB3ZSBvbmx5CisgICAgICogcm91dGUgU1BJcyB0byBndWVzdHMs IGl0IGRvZXNuJ3QgbWFrZSBhbnkgZGlmZmVyZW5jZS4gKi8KKyAgICBzdHJ1Y3QgdmNwdSAqdl90 YXJnZXQgPSB2Z2ljX2dldF90YXJnZXRfdmNwdShkLT52Y3B1WzBdLCB2aXJxKTsKKyAgICBzdHJ1 Y3QgdmdpY19pcnFfcmFuayAqcmFuayA9IHZnaWNfcmFua19pcnEodl90YXJnZXQsIHZpcnEpOwor ICAgIHN0cnVjdCBwZW5kaW5nX2lycSAqcCA9IGlycV90b19wZW5kaW5nKHZfdGFyZ2V0LCB2aXJx KTsKKyAgICBpbnQgcmV0ID0gMDsKKworICAgIEFTU0VSVChjb25uZWN0ICYmIGRlc2MpOworCisg ICAgLyogV2UgYXJlIHRha2luZyB0byByYW5rIGxvY2sgdG8gcHJldmVudCBwYXJhbGxlbCBjb25u ZWN0aW9ucy4gKi8KKyAgICB2Z2ljX2xvY2tfcmFuayh2X3RhcmdldCwgcmFuaywgZmxhZ3MpOwor CisgICAgaWYgKCBjb25uZWN0ICkKKyAgICB7CisgICAgICAgIC8qIFRoZSBWSVJRIHNob3VsZCBu b3QgYmUgYWxyZWFkeSBlbmFibGVkIGJ5IHRoZSBndWVzdCAqLworICAgICAgICBpZiAoICFwLT5k ZXNjICYmCisgICAgICAgICAgICAgIXRlc3RfYml0KEdJQ19JUlFfR1VFU1RfRU5BQkxFRCwgJnAt PnN0YXR1cykgKQorICAgICAgICAgICAgcC0+ZGVzYyA9IGRlc2M7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIHJldCA9IC1FQlVTWTsKKyAgICB9CisgICAgZWxzZQorICAgIHsKKyAgICAgICAg aWYgKCAhZGVzYyB8fCBwLT5kZXNjID09IGRlc2MgKQorICAgICAgICAgICAgcC0+ZGVzYyA9IE5V TEw7CisgICAgfQorCisgICAgdmdpY191bmxvY2tfcmFuayh2X3RhcmdldCwgcmFuaywgZmxhZ3Mp OworCisgICAgcmV0dXJuIHJldDsKK30KKwogLyoKICAqIExvY2FsIHZhcmlhYmxlczoKICAqIG1v ZGU6IEMKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9naWMuYyBiL3hlbi9hcmNoL2FybS9naWMu YwppbmRleCA0Y2I3NGQ0NDllLi45NjhlNDZmYWJiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0v Z2ljLmMKKysrIGIveGVuL2FyY2gvYXJtL2dpYy5jCkBAIC0xMjgsMTMgKzEyOCw3IEBAIHZvaWQg Z2ljX3JvdXRlX2lycV90b194ZW4oc3RydWN0IGlycV9kZXNjICpkZXNjLCB1bnNpZ25lZCBpbnQg cHJpb3JpdHkpCiBpbnQgZ2ljX3JvdXRlX2lycV90b19ndWVzdChzdHJ1Y3QgZG9tYWluICpkLCB1 bnNpZ25lZCBpbnQgdmlycSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBpcnFf ZGVzYyAqZGVzYywgdW5zaWduZWQgaW50IHByaW9yaXR5KQogewotICAgIHVuc2lnbmVkIGxvbmcg ZmxhZ3M7Ci0gICAgLyogVXNlIHZjcHUwIHRvIHJldHJpZXZlIHRoZSBwZW5kaW5nX2lycSBzdHJ1 Y3QuIEdpdmVuIHRoYXQgd2Ugb25seQotICAgICAqIHJvdXRlIFNQSXMgdG8gZ3Vlc3RzLCBpdCBk b2Vzbid0IG1ha2UgYW55IGRpZmZlcmVuY2UuICovCi0gICAgc3RydWN0IHZjcHUgKnZfdGFyZ2V0 ID0gdmdpY19nZXRfdGFyZ2V0X3ZjcHUoZC0+dmNwdVswXSwgdmlycSk7Ci0gICAgc3RydWN0IHZn aWNfaXJxX3JhbmsgKnJhbmsgPSB2Z2ljX3JhbmtfaXJxKHZfdGFyZ2V0LCB2aXJxKTsKLSAgICBz dHJ1Y3QgcGVuZGluZ19pcnEgKnAgPSBpcnFfdG9fcGVuZGluZyh2X3RhcmdldCwgdmlycSk7Ci0g ICAgaW50IHJlcyA9IC1FQlVTWTsKKyAgICBpbnQgcmV0OwogCiAgICAgQVNTRVJUKHNwaW5faXNf bG9ja2VkKCZkZXNjLT5sb2NrKSk7CiAgICAgLyogQ2FsbGVyIGhhcyBhbHJlYWR5IGNoZWNrZWQg dGhhdCB0aGUgSVJRIGlzIGFuIFNQSSAqLwpAQCAtMTQyLDEyICsxMzYsOSBAQCBpbnQgZ2ljX3Jv dXRlX2lycV90b19ndWVzdChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgdmlycSwKICAg ICBBU1NFUlQodmlycSA8IHZnaWNfbnVtX2lycXMoZCkpOwogICAgIEFTU0VSVCghaXNfbHBpKHZp cnEpKTsKIAotICAgIHZnaWNfbG9ja19yYW5rKHZfdGFyZ2V0LCByYW5rLCBmbGFncyk7Ci0KLSAg ICBpZiAoIHAtPmRlc2MgfHwKLSAgICAgICAgIC8qIFRoZSBWSVJRIHNob3VsZCBub3QgYmUgYWxy ZWFkeSBlbmFibGVkIGJ5IHRoZSBndWVzdCAqLwotICAgICAgICAgdGVzdF9iaXQoR0lDX0lSUV9H VUVTVF9FTkFCTEVELCAmcC0+c3RhdHVzKSApCi0gICAgICAgIGdvdG8gb3V0OworICAgIHJldCA9 IHZnaWNfY29ubmVjdF9od19pcnEoZCwgTlVMTCwgdmlycSwgZGVzYywgdHJ1ZSk7CisgICAgaWYg KCByZXQgKQorICAgICAgICByZXR1cm4gcmV0OwogCiAgICAgZGVzYy0+aGFuZGxlciA9IGdpY19o d19vcHMtPmdpY19ndWVzdF9pcnFfdHlwZTsKICAgICBzZXRfYml0KF9JUlFfR1VFU1QsICZkZXNj LT5zdGF0dXMpOwpAQCAtMTU2LDMxICsxNDcsMTkgQEAgaW50IGdpY19yb3V0ZV9pcnFfdG9fZ3Vl c3Qoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHZpcnEsCiAgICAgICAgIGdpY19zZXRf aXJxX3R5cGUoZGVzYywgZGVzYy0+YXJjaC50eXBlKTsKICAgICBnaWNfc2V0X2lycV9wcmlvcml0 eShkZXNjLCBwcmlvcml0eSk7CiAKLSAgICBwLT5kZXNjID0gZGVzYzsKLSAgICByZXMgPSAwOwot Ci1vdXQ6Ci0gICAgdmdpY191bmxvY2tfcmFuayh2X3RhcmdldCwgcmFuaywgZmxhZ3MpOwotCi0g ICAgcmV0dXJuIHJlczsKKyAgICByZXR1cm4gMDsKIH0KIAogLyogVGhpcyBmdW5jdGlvbiBvbmx5 IHdvcmtzIHdpdGggU1BJcyBmb3Igbm93ICovCiBpbnQgZ2ljX3JlbW92ZV9pcnFfZnJvbV9ndWVz dChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgdmlycSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0cnVjdCBpcnFfZGVzYyAqZGVzYykKIHsKLSAgICBzdHJ1Y3QgdmNwdSAq dl90YXJnZXQgPSB2Z2ljX2dldF90YXJnZXRfdmNwdShkLT52Y3B1WzBdLCB2aXJxKTsKLSAgICBz dHJ1Y3QgdmdpY19pcnFfcmFuayAqcmFuayA9IHZnaWNfcmFua19pcnEodl90YXJnZXQsIHZpcnEp OwotICAgIHN0cnVjdCBwZW5kaW5nX2lycSAqcCA9IGlycV90b19wZW5kaW5nKHZfdGFyZ2V0LCB2 aXJxKTsKLSAgICB1bnNpZ25lZCBsb25nIGZsYWdzOworICAgIGludCByZXQ7CiAKICAgICBBU1NF UlQoc3Bpbl9pc19sb2NrZWQoJmRlc2MtPmxvY2spKTsKICAgICBBU1NFUlQodGVzdF9iaXQoX0lS UV9HVUVTVCwgJmRlc2MtPnN0YXR1cykpOwotICAgIEFTU0VSVChwLT5kZXNjID09IGRlc2MpOwog ICAgIEFTU0VSVCghaXNfbHBpKHZpcnEpKTsKIAotICAgIHZnaWNfbG9ja19yYW5rKHZfdGFyZ2V0 LCByYW5rLCBmbGFncyk7Ci0KICAgICBpZiAoIGQtPmlzX2R5aW5nICkKICAgICB7CiAgICAgICAg IGRlc2MtPmhhbmRsZXItPnNodXRkb3duKGRlc2MpOwpAQCAtMTk4LDE5ICsxNzcsMTYgQEAgaW50 IGdpY19yZW1vdmVfaXJxX2Zyb21fZ3Vlc3Qoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50 IHZpcnEsCiAgICAgICAgICAqLwogICAgICAgICBpZiAoIHRlc3RfYml0KF9JUlFfSU5QUk9HUkVT UywgJmRlc2MtPnN0YXR1cykgfHwKICAgICAgICAgICAgICAhdGVzdF9iaXQoX0lSUV9ESVNBQkxF RCwgJmRlc2MtPnN0YXR1cykgKQotICAgICAgICB7Ci0gICAgICAgICAgICB2Z2ljX3VubG9ja19y YW5rKHZfdGFyZ2V0LCByYW5rLCBmbGFncyk7CiAgICAgICAgICAgICByZXR1cm4gLUVCVVNZOwot ICAgICAgICB9CiAgICAgfQogCisgICAgcmV0ID0gdmdpY19jb25uZWN0X2h3X2lycShkLCBOVUxM LCB2aXJxLCBkZXNjLCBmYWxzZSk7CisgICAgaWYgKCByZXQgKQorICAgICAgICByZXR1cm4gcmV0 OworCiAgICAgY2xlYXJfYml0KF9JUlFfR1VFU1QsICZkZXNjLT5zdGF0dXMpOwogICAgIGRlc2Mt PmhhbmRsZXIgPSAmbm9faXJxX3R5cGU7CiAKLSAgICBwLT5kZXNjID0gTlVMTDsKLQotICAgIHZn aWNfdW5sb2NrX3Jhbmsodl90YXJnZXQsIHJhbmssIGZsYWdzKTsKLQogICAgIHJldHVybiAwOwog fQogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20tYXJtL3ZnaWMuaCBiL3hlbi9pbmNsdWRl L2FzbS1hcm0vdmdpYy5oCmluZGV4IDIyYzg1MDJjOTUuLmZkYTA4MjM5NWIgMTAwNjQ0Ci0tLSBh L3hlbi9pbmNsdWRlL2FzbS1hcm0vdmdpYy5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS1hcm0vdmdp Yy5oCkBAIC0yMTksNiArMjE5LDggQEAgaW50IHZnaWNfdjJfaW5pdChzdHJ1Y3QgZG9tYWluICpk LCBpbnQgKm1taW9fY291bnQpOwogaW50IHZnaWNfdjNfaW5pdChzdHJ1Y3QgZG9tYWluICpkLCBp bnQgKm1taW9fY291bnQpOwogCiBib29sIHZnaWNfZXZ0Y2huX2lycV9wZW5kaW5nKHN0cnVjdCB2 Y3B1ICp2KTsKK2ludCB2Z2ljX2Nvbm5lY3RfaHdfaXJxKHN0cnVjdCBkb21haW4gKmQsIHN0cnVj dCB2Y3B1ICp2LCB1bnNpZ25lZCBpbnQgdmlycSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0 cnVjdCBpcnFfZGVzYyAqZGVzYywgYm9vbCBjb25uZWN0KTsKIAogZXh0ZXJuIGludCBkb21haW5f dmdpY19yZWdpc3RlcihzdHJ1Y3QgZG9tYWluICpkLCBpbnQgKm1taW9fY291bnQpOwogZXh0ZXJu IGludCB2Y3B1X3ZnaWNfZnJlZShzdHJ1Y3QgdmNwdSAqdik7Ci0tIAoyLjE0LjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnBy b2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs