From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [v2 15/16] xen/arm: traps: Move the definition of mmio_info_t in try_handle_mmio Date: Tue, 12 Dec 2017 19:02:11 +0000 Message-ID: <20171212190212.5535-16-julien.grall@linaro.org> References: <20171212190212.5535-1-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171212190212.5535-1-julien.grall@linaro.org> 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: sstabellini@kernel.org, Julien Grall , andre.przywara@linaro.org List-Id: xen-devel@lists.xenproject.org bW1pb19pbmZvX3QgaXMgY3VycmVudGx5IGZpbGxlZCBieSBkb190cmFwX2RhdGFfZ3Vlc3RfYWJv cnQgYnV0IG9ubHkKaW1wb3J0YW50IHdoZW4gZW11bGF0aW9uIGFuIE1NSU8gcmVnaW9uLgoKQSBm b2xsb3ctdXAgcGF0Y2ggd2lsbCBtZXJnZSBzdGFnZS0yIHByZWZldGNoIGFib3J0IGFuZCBzdGFn ZS0yIGRhdGEgYWJvcnQKaW4gYSBzaW5nbGUgaGVscGVyLiBUbyBwcmVwYXJlIHRoYXQsIG1taW9f aW5mb190IGlzIG5vdyBmaWxsZWQgYnkKdHJ5X2hhbmRsZV9tbWlvLgoKU2lnbmVkLW9mZi1ieTog SnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAbGluYXJvLm9yZz4KUmV2aWV3ZWQtYnk6IFN0ZWZh bm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZy4KCi0tLQogICAgQ2hhbmdlcyBp biB2MjoKICAgICAgICAtIEFkZCBTdGVmYW5vJ3MgcmV2aWV3ZWQtYnkKLS0tCiB4ZW4vYXJjaC9h cm0vdHJhcHMuYyB8IDMxICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94 ZW4vYXJjaC9hcm0vdHJhcHMuYyBiL3hlbi9hcmNoL2FybS90cmFwcy5jCmluZGV4IDEzMGU4NWE2 YmEuLjA4MjM5NmMyNmQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS90cmFwcy5jCisrKyBiL3hl bi9hcmNoL2FybS90cmFwcy5jCkBAIC0xOTM1LDkgKzE5MzUsMTQgQEAgc3RhdGljIHZvaWQgZG9f dHJhcF9pbnN0cl9hYm9ydF9ndWVzdChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncywKIH0KIAog c3RhdGljIGJvb2wgdHJ5X2hhbmRsZV9tbWlvKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1taW9faW5mb190ICppbmZvKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IHVuaW9uIGhzciBoc3IsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcGFkZHJfdCBncGEpCiB7Ci0gICAgY29uc3Qgc3RydWN0IGhzcl9kYWJ0IGRh YnQgPSBpbmZvLT5kYWJ0OworICAgIGNvbnN0IHN0cnVjdCBoc3JfZGFidCBkYWJ0ID0gaHNyLmRh YnQ7CisgICAgbW1pb19pbmZvX3QgaW5mbyA9IHsKKyAgICAgICAgLmdwYSA9IGdwYSwKKyAgICAg ICAgLmRhYnQgPSBkYWJ0CisgICAgfTsKICAgICBpbnQgcmM7CiAKICAgICAvKiBzdGFnZS0xIHBh Z2UgdGFibGUgc2hvdWxkIG5ldmVyIGxpdmUgaW4gYW4gZW11bGF0ZWQgTU1JTyByZWdpb24gKi8K QEAgLTE5NTUsNyArMTk2MCw3IEBAIHN0YXRpYyBib29sIHRyeV9oYW5kbGVfbW1pbyhzdHJ1Y3Qg Y3B1X3VzZXJfcmVncyAqcmVncywKICAgICBpZiAoIGNoZWNrX3dvcmthcm91bmRfNzY2NDIyKCkg JiYgKHJlZ3MtPmNwc3IgJiBQU1JfVEhVTUIpICYmCiAgICAgICAgICBkYWJ0LndyaXRlICkKICAg ICB7Ci0gICAgICAgIHJjID0gZGVjb2RlX2luc3RydWN0aW9uKHJlZ3MsICZpbmZvLT5kYWJ0KTsK KyAgICAgICAgcmMgPSBkZWNvZGVfaW5zdHJ1Y3Rpb24ocmVncywgJmluZm8uZGFidCk7CiAgICAg ICAgIGlmICggcmMgKQogICAgICAgICB7CiAgICAgICAgICAgICBncHJpbnRrKFhFTkxPR19ERUJV RywgIlVuYWJsZSB0byBkZWNvZGUgaW5zdHJ1Y3Rpb25cbiIpOwpAQCAtMTk2Myw3ICsxOTY4LDcg QEAgc3RhdGljIGJvb2wgdHJ5X2hhbmRsZV9tbWlvKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdz LAogICAgICAgICB9CiAgICAgfQogCi0gICAgcmV0dXJuICEhaGFuZGxlX21taW8oaW5mbyk7Cisg ICAgcmV0dXJuICEhaGFuZGxlX21taW8oJmluZm8pOwogfQogCiAvKgpAQCAtMjAwMSw3ICsyMDA2 LDcgQEAgc3RhdGljIHZvaWQgZG9fdHJhcF9kYXRhX2Fib3J0X2d1ZXN0KHN0cnVjdCBjcHVfdXNl cl9yZWdzICpyZWdzLAogICAgIGNvbnN0IHN0cnVjdCBoc3JfZGFidCBkYWJ0ID0gaHNyLmRhYnQ7 CiAgICAgaW50IHJjOwogICAgIHZhZGRyX3QgZ3ZhOwotICAgIG1taW9faW5mb190IGluZm87Cisg ICAgcGFkZHJfdCBncGE7CiAgICAgdWludDhfdCBmc2MgPSBoc3IuZGFidC5kZnNjICYgfkZTQ19M TF9NQVNLOwogICAgIG1mbl90IG1mbjsKIApAQCAtMjAxMiwxNSArMjAxNywxMyBAQCBzdGF0aWMg dm9pZCBkb190cmFwX2RhdGFfYWJvcnRfZ3Vlc3Qoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3Ms CiAgICAgaWYgKCBkYWJ0LmVhdCApCiAgICAgICAgIHJldHVybiBfX2RvX3RyYXBfc2Vycm9yKHJl Z3MsIHRydWUpOwogCi0gICAgaW5mby5kYWJ0ID0gZGFidDsKLQogICAgIGd2YSA9IGdldF9oZmFy KHRydWUgLyogaXNfZGF0YSAqLyk7CiAKICAgICBpZiAoIGhwZmFyX2lzX3ZhbGlkKGRhYnQuczFw dHcsIGZzYykgKQotICAgICAgICBpbmZvLmdwYSA9IGdldF9mYXVsdGluZ19pcGEoZ3ZhKTsKKyAg ICAgICAgZ3BhID0gZ2V0X2ZhdWx0aW5nX2lwYShndmEpOwogICAgIGVsc2UKICAgICB7Ci0gICAg ICAgIHJjID0gZ3ZhX3RvX2lwYShndmEsICZpbmZvLmdwYSwgR1YyTV9SRUFEKTsKKyAgICAgICAg cmMgPSBndmFfdG9faXBhKGd2YSwgJmdwYSwgR1YyTV9SRUFEKTsKICAgICAgICAgLyoKICAgICAg ICAgICogV2UgbWF5IG5vdCBiZSBhYmxlIHRvIHRyYW5zbGF0ZSBiZWNhdXNlIHNvbWVvbmUgaXMK ICAgICAgICAgICogcGxheWluZyB3aXRoIHRoZSBTdGFnZS0yIHBhZ2UgdGFibGUgb2YgdGhlIGRv bWFpbi4KQEAgLTIwNDEsNyArMjA0NCw3IEBAIHN0YXRpYyB2b2lkIGRvX3RyYXBfZGF0YV9hYm9y dF9ndWVzdChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncywKICAgICAgICAgICAgIC5raW5kID0g ZGFidC5zMXB0dyA/IG5wZmVjX2tpbmRfaW5fZ3B0IDogbnBmZWNfa2luZF93aXRoX2dsYQogICAg ICAgICB9OwogCi0gICAgICAgIHAybV9tZW1fYWNjZXNzX2NoZWNrKGluZm8uZ3BhLCBndmEsIG5w ZmVjKTsKKyAgICAgICAgcDJtX21lbV9hY2Nlc3NfY2hlY2soZ3BhLCBndmEsIG5wZmVjKTsKICAg ICAgICAgLyoKICAgICAgICAgICogVGhlIG9ubHkgd2F5IHRvIGdldCBoZXJlIHJpZ2h0IG5vdyBp cyBiZWNhdXNlIG9mIG1lbV9hY2Nlc3MsCiAgICAgICAgICAqIHRodXMgcmVpbmplY3RpbmcgdGhl IGV4Y2VwdGlvbiB0byB0aGUgZ3Vlc3QgaXMgbmV2ZXIgcmVxdWlyZWQuCkBAIC0yMDUzLDcgKzIw NTYsNyBAQCBzdGF0aWMgdm9pZCBkb190cmFwX2RhdGFfYWJvcnRfZ3Vlc3Qoc3RydWN0IGNwdV91 c2VyX3JlZ3MgKnJlZ3MsCiAgICAgICAgICAqIEF0dGVtcHQgZmlyc3QgdG8gZW11bGF0ZSB0aGUg TU1JTyBhcyB0aGUgZGF0YSBhYm9ydCB3aWxsCiAgICAgICAgICAqIGxpa2VseSBoYXBwZW4gaW4g YW4gZW11bGF0ZWQgcmVnaW9uLgogICAgICAgICAgKi8KLSAgICAgICAgaWYgKCB0cnlfaGFuZGxl X21taW8ocmVncywgJmluZm8pICkKKyAgICAgICAgaWYgKCB0cnlfaGFuZGxlX21taW8ocmVncywg aHNyLCBncGEpICkKICAgICAgICAgewogICAgICAgICAgICAgYWR2YW5jZV9wYyhyZWdzLCBoc3Ip OwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjA2NCwxMSArMjA2NywxMSBAQCBzdGF0aWMgdm9p ZCBkb190cmFwX2RhdGFfYWJvcnRfZ3Vlc3Qoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MsCiAg ICAgICAgICAqIHdpdGggdGhlIFN0YWdlLTIgcGFnZSB0YWJsZS4gV2FsayB0aGUgU3RhZ2UtMiBQ VCB0byBjaGVjawogICAgICAgICAgKiBpZiB0aGUgZW50cnkgZXhpc3RzLiBJZiBpdCdzIHRoZSBj YXNlLCByZXR1cm4gdG8gdGhlIGd1ZXN0CiAgICAgICAgICAqLwotICAgICAgICBtZm4gPSBnZm5f dG9fbWZuKGN1cnJlbnQtPmRvbWFpbiwgZ2FkZHJfdG9fZ2ZuKGluZm8uZ3BhKSk7CisgICAgICAg IG1mbiA9IGdmbl90b19tZm4oY3VycmVudC0+ZG9tYWluLCBnYWRkcl90b19nZm4oZ3BhKSk7CiAg ICAgICAgIGlmICggIW1mbl9lcShtZm4sIElOVkFMSURfTUZOKSApCiAgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgaWYgKCB0cnlfbWFwX21taW8oZ2FkZHJfdG9fZ2ZuKGluZm8uZ3BhKSkg KQorICAgICAgICBpZiAoIHRyeV9tYXBfbW1pbyhnYWRkcl90b19nZm4oZ3BhKSkgKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGJyZWFrOwpAQCAtMjA3OCw3ICsyMDgxLDcgQEAgc3Rh dGljIHZvaWQgZG9fdHJhcF9kYXRhX2Fib3J0X2d1ZXN0KHN0cnVjdCBjcHVfdXNlcl9yZWdzICpy ZWdzLAogICAgIH0KIAogICAgIGdkcHJpbnRrKFhFTkxPR19ERUJVRywgIkhTUj0weCV4IHBjPSUj IlBSSXJlZ2lzdGVyIiBndmE9JSMiUFJJdmFkZHIKLSAgICAgICAgICAgICAiIGdwYT0lIyJQUklw YWRkciJcbiIsIGhzci5iaXRzLCByZWdzLT5wYywgZ3ZhLCBpbmZvLmdwYSk7CisgICAgICAgICAg ICAgIiBncGE9JSMiUFJJcGFkZHIiXG4iLCBoc3IuYml0cywgcmVncy0+cGMsIGd2YSwgZ3BhKTsK ICAgICBpbmplY3RfZGFidF9leGNlcHRpb24ocmVncywgZ3ZhLCBoc3IubGVuKTsKIH0KIAotLSAK Mi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0 cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==