From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v10 08/11] xen/arm: move arch specific grant table bits into grant_table.c Date: Mon, 25 Sep 2017 12:00:32 +0200 Message-ID: <20170925100035.432-9-jgross@suse.com> References: <20170925100035.432-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwQC3-0002CF-KL for xen-devel@lists.xenproject.org; Mon, 25 Sep 2017 10:00:51 +0000 In-Reply-To: <20170925100035.432-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, dgdegra@tycho.nsa.gov List-Id: xen-devel@lists.xenproject.org SW5zdGVhZCBvZiBhdHRhY2hpbmcgdGhlIEFSTSBzcGVjaWZpYyBncmFudCB0YWJsZSBkYXRhIHRv IHRoZSBkb21haW4Kc3RydWN0dXJlIGFkZCBpdCB0byBzdHJ1Y3QgZ3JhbnRfdGFibGUuIEFkZCB0 aGUgbmVlZGVkIGFyY2ggZnVuY3Rpb25zCnRvIHRoZSBhc20tKi9ncmFudF90YWJsZS5oIGluY2x1 ZGVzLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgpSZXZp ZXdlZC1ieTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KQWNrZWQtYnk6 IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4gW25vbi1BUk0gcGFydHNdCi0tLQpWOToK LSBjb3JyZWN0IGFuZCBjbGVhbnVwIGdudHRhYl9pbml0X2FyY2goKSBmb3IgQVJNIChKdWxpZW4g R3JhbGwpCgpWNzoKLSByZS1hZGQgI2luY2x1ZGUgPGFzbS9ncmFudC10YWJsZS5oPiBpbiBncmFu dF90YWJsZS5oIChKdWxpZW4gR3JhbGwpCi0tLQogeGVuL2FyY2gvYXJtL2RvbWFpbi5jICAgICAg ICAgICAgIHwgIDIgLS0KIHhlbi9jb21tb24vZ3JhbnRfdGFibGUuYyAgICAgICAgICB8IDE2ICsr KysrKysrKysrKysrLS0KIHhlbi9pbmNsdWRlL2FzbS1hcm0vZG9tYWluLmggICAgICB8ICAxIC0K IHhlbi9pbmNsdWRlL2FzbS1hcm0vZ3JhbnRfdGFibGUuaCB8IDI5ICsrKysrKysrKysrKysrKysr KysrKystLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2dyYW50X3RhYmxlLmggfCAxMiArKysr KysrLS0tLS0KIHhlbi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oICAgICB8ICAyICsrCiA2IGZp bGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3hlbi9hcmNoL2FybS9kb21haW4uYyBiL3hlbi9hcmNoL2FybS9kb21haW4uYwppbmRleCA3 ODRhZTM5MmNmLi5lMzlhNzk4ODVjIDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vZG9tYWluLmMK KysrIGIveGVuL2FyY2gvYXJtL2RvbWFpbi5jCkBAIC00ODYsMTMgKzQ4NiwxMSBAQCBzdHJ1Y3Qg ZG9tYWluICphbGxvY19kb21haW5fc3RydWN0KHZvaWQpCiAgICAgICAgIHJldHVybiBOVUxMOwog CiAgICAgY2xlYXJfcGFnZShkKTsKLSAgICBkLT5hcmNoLmdyYW50X3RhYmxlX2dmbiA9IHh6YWxs b2NfYXJyYXkoZ2ZuX3QsIG1heF9ncmFudF9mcmFtZXMpOwogICAgIHJldHVybiBkOwogfQogCiB2 b2lkIGZyZWVfZG9tYWluX3N0cnVjdChzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHhmcmVlKGQt PmFyY2guZ3JhbnRfdGFibGVfZ2ZuKTsKICAgICBmcmVlX3hlbmhlYXBfcGFnZShkKTsKIH0KIApk aWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jIGIveGVuL2NvbW1vbi9ncmFudF90 YWJsZS5jCmluZGV4IGQ4NmE0ZTAyNDguLjcxNzA2ZjVjYmEgMTAwNjQ0Ci0tLSBhL3hlbi9jb21t b24vZ3JhbnRfdGFibGUuYworKysgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKQEAgLTcyLDYg KzcyLDggQEAgc3RydWN0IGdyYW50X3RhYmxlIHsKICAgICBzdHJ1Y3QgYWN0aXZlX2dyYW50X2Vu dHJ5ICoqYWN0aXZlOwogICAgIC8qIE1hcHBpbmcgdHJhY2tpbmcgdGFibGUgcGVyIHZjcHUuICov CiAgICAgc3RydWN0IGdyYW50X21hcHBpbmcgKiptYXB0cmFjazsKKworICAgIHN0cnVjdCBncmFu dF90YWJsZV9hcmNoIGFyY2g7CiB9OwogCiAjaWZuZGVmIERFRkFVTFRfTUFYX05SX0dSQU5UX0ZS QU1FUyAvKiB0byBhbGxvdyBhcmNoIHRvIG92ZXJyaWRlICovCkBAIC0xNzMwLDcgKzE3MzIsNyBA QCBhY3RpdmVfYWxsb2NfZmFpbGVkOgogc3RhdGljIGludAogZ3JhbnRfdGFibGVfaW5pdChzdHJ1 Y3QgZG9tYWluICpkLCBzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0KQogewotICAgIGludCByZXQgPSAw OworICAgIGludCByZXQ7CiAKICAgICBncmFudF93cml0ZV9sb2NrKGd0KTsKIApAQCAtMTc2Miwx MiArMTc2NCwyMCBAQCBncmFudF90YWJsZV9pbml0KHN0cnVjdCBkb21haW4gKmQsIHN0cnVjdCBn cmFudF90YWJsZSAqZ3QpCiAgICAgaWYgKCBndC0+c3RhdHVzID09IE5VTEwgKQogICAgICAgICBn b3RvIG5vX21lbTsKIAorICAgIHJldCA9IGdudHRhYl9pbml0X2FyY2goZ3QpOworICAgIGlmICgg cmV0ICkKKyAgICAgICAgZ290byBvdXQ7CisKICAgICAvKiBnbnR0YWJfZ3Jvd190YWJsZSgpIGFs bG9jYXRlcyBhIG1pbiBudW1iZXIgb2YgZnJhbWVzLCBzbyAwIGlzIG9rYXkuICovCiAgICAgaWYg KCBnbnR0YWJfZ3Jvd190YWJsZShkLCAwKSApCiAgICAgICAgIGdvdG8gdW5sb2NrOwogCiAgbm9f bWVtOgogICAgIHJldCA9IC1FTk9NRU07Cisgb3V0OgorICAgIGdudHRhYl9kZXN0cm95X2FyY2go Z3QpOworICAgIHhmcmVlKGd0LT5zdGF0dXMpOworICAgIGd0LT5zdGF0dXMgPSBOVUxMOwogICAg IHhmcmVlKGd0LT5zaGFyZWRfcmF3KTsKICAgICBndC0+c2hhcmVkX3JhdyA9IE5VTEw7CiAgICAg dmZyZWUoZ3QtPm1hcHRyYWNrKTsKQEAgLTM2MjIsNiArMzYzMiw4IEBAIGdyYW50X3RhYmxlX2Rl c3Ryb3koCiAgICAgaWYgKCB0ID09IE5VTEwgKQogICAgICAgICByZXR1cm47CiAKKyAgICBnbnR0 YWJfZGVzdHJveV9hcmNoKHQpOworCiAgICAgZm9yICggaSA9IDA7IGkgPCBucl9ncmFudF9mcmFt ZXModCk7IGkrKyApCiAgICAgICAgIGZyZWVfeGVuaGVhcF9wYWdlKHQtPnNoYXJlZF9yYXdbaV0p OwogICAgIHhmcmVlKHQtPnNoYXJlZF9yYXcpOwpAQCAtMzc0MCw3ICszNzUyLDcgQEAgaW50IGdu dHRhYl9tYXBfZnJhbWUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBpZHgsIGdmbl90 IGdmbiwKICAgICB9CiAKICAgICBpZiAoICFyYyApCi0gICAgICAgIGdudHRhYl9zZXRfZnJhbWVf Z2ZuKGQsIGlkeCwgZ2ZuKTsKKyAgICAgICAgZ250dGFiX3NldF9mcmFtZV9nZm4oZ3QsIGlkeCwg Z2ZuKTsKIAogICAgIGdyYW50X3dyaXRlX3VubG9jayhndCk7CiAKZGlmZiAtLWdpdCBhL3hlbi9p bmNsdWRlL2FzbS1hcm0vZG9tYWluLmggYi94ZW4vaW5jbHVkZS9hc20tYXJtL2RvbWFpbi5oCmlu ZGV4IGIxNzRjNjUwODAuLmNlOWI2YTQwMzIgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS1h cm0vZG9tYWluLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLWFybS9kb21haW4uaApAQCAtNTAsNyAr NTAsNiBAQCBzdHJ1Y3QgYXJjaF9kb21haW4KICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiBwMm07CiAK ICAgICBzdHJ1Y3QgaHZtX2RvbWFpbiBodm1fZG9tYWluOwotICAgIGdmbl90ICpncmFudF90YWJs ZV9nZm47CiAKICAgICBzdHJ1Y3Qgdm1taW8gdm1taW87CiAKZGlmZiAtLWdpdCBhL3hlbi9pbmNs dWRlL2FzbS1hcm0vZ3JhbnRfdGFibGUuaCBiL3hlbi9pbmNsdWRlL2FzbS1hcm0vZ3JhbnRfdGFi bGUuaAppbmRleCAwYTI0OGE3NjVhLi4zMGRiMmQxNjE2IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVk ZS9hc20tYXJtL2dyYW50X3RhYmxlLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLWFybS9ncmFudF90 YWJsZS5oCkBAIC02LDYgKzYsMTAgQEAKIAogI2RlZmluZSBJTklUSUFMX05SX0dSQU5UX0ZSQU1F UyA0CiAKK3N0cnVjdCBncmFudF90YWJsZV9hcmNoIHsKKyAgICBnZm5fdCAqZ2ZuOworfTsKKwog dm9pZCBnbnR0YWJfY2xlYXJfZmxhZyh1bnNpZ25lZCBsb25nIG5yLCB1aW50MTZfdCAqYWRkcik7 CiBpbnQgY3JlYXRlX2dyYW50X2hvc3RfbWFwcGluZyh1bnNpZ25lZCBsb25nIGdwYWRkciwKICAg ICAgICAgdW5zaWduZWQgbG9uZyBtZm4sIHVuc2lnbmVkIGludCBmbGFncywgdW5zaWduZWQgaW50 CkBAIC0yMiwxMSArMjYsMjIgQEAgc3RhdGljIGlubGluZSBpbnQgcmVwbGFjZV9ncmFudF9zdXBw b3J0ZWQodm9pZCkKICAgICByZXR1cm4gMTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGdudHRh Yl9zZXRfZnJhbWVfZ2ZuKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgaWR4LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdmbl90IGdmbikKLXsKLSAgICBk LT5hcmNoLmdyYW50X3RhYmxlX2dmbltpZHhdID0gZ2ZuOwotfQorI2RlZmluZSBnbnR0YWJfaW5p dF9hcmNoKGd0KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK Kyh7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCisgICAgKGd0KS0+YXJjaC5nZm4gPSB4emFsbG9jX2FycmF5KGdm bl90LCBtYXhfZ3JhbnRfZnJhbWVzKTsgICAgICAgICAgICAgXAorICAgICggKGd0KS0+YXJjaC5n Zm4gPyAwIDogLUVOT01FTSApOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK K30pCisKKyNkZWZpbmUgZ250dGFiX2Rlc3Ryb3lfYXJjaChndCkgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgZG8geyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICB4ZnJl ZSgoZ3QpLT5hcmNoLmdmbik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKKyAgICAgICAgKGd0KS0+YXJjaC5nZm4gPSBOVUxMOyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgfSB3aGlsZSAoIDAgKQorCisjZGVmaW5lIGdu dHRhYl9zZXRfZnJhbWVfZ2ZuKGd0LCBpZHgsIGdmbikgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXAorICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgKGd0KS0+YXJjaC5nZm5baWR4XSA9 IGdmbjsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgfSB3aGls ZSAoIDAgKQogCiAjZGVmaW5lIGdudHRhYl9jcmVhdGVfc2hhcmVkX3BhZ2UoZCwgdCwgaSkgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgIGRvIHsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKQEAgLTM2LDgg KzUxLDggQEAgc3RhdGljIGlubGluZSB2b2lkIGdudHRhYl9zZXRfZnJhbWVfZ2ZuKHN0cnVjdCBk b21haW4gKmQsIHVuc2lnbmVkIGxvbmcgaWR4LAogICAgIH0gd2hpbGUgKCAwICkKIAogI2RlZmlu ZSBnbnR0YWJfc2hhcmVkX2dtZm4oZCwgdCwgaSkgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICAoICgoaSA+PSBucl9ncmFudF9mcmFtZXMoZC0+Z3JhbnRfdGFibGUp KSAmJiAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgIChpIDwgbWF4X2dyYW50X2ZyYW1l cykpID8gMCA6IGdmbl94KGQtPmFyY2guZ3JhbnRfdGFibGVfZ2ZuW2ldKSkKKyAgICAoICgoaSA+ PSBucl9ncmFudF9mcmFtZXModCkpICYmICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCisgICAgICAgKGkgPCBtYXhfZ3JhbnRfZnJhbWVzKSkgPyAwIDogZ2ZuX3godC0+YXJj aC5nZm5baV0pKQogCiAjZGVmaW5lIGdudHRhYl9uZWVkX2lvbW11X21hcHBpbmcoZCkgICAgICAg ICAgICAgICAgICAgIFwKICAgICAoaXNfZG9tYWluX2RpcmVjdF9tYXBwZWQoZCkgJiYgbmVlZF9p b21tdShkKSkKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvZ3JhbnRfdGFibGUuaCBi L3hlbi9pbmNsdWRlL2FzbS14ODYvZ3JhbnRfdGFibGUuaAppbmRleCBjODY1OTk5YTMzLi4xYjkz YzU3MjBkIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2dyYW50X3RhYmxlLmgKKysr IGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9ncmFudF90YWJsZS5oCkBAIC0xNCw2ICsxNCw5IEBACiAK ICNkZWZpbmUgSU5JVElBTF9OUl9HUkFOVF9GUkFNRVMgNAogCitzdHJ1Y3QgZ3JhbnRfdGFibGVf YXJjaCB7Cit9OworCiAvKgogICogQ2FsbGVyIG11c3Qgb3duIGNhbGxlcidzIEJJR0xPQ0ssIGlz IHJlc3BvbnNpYmxlIGZvciBmbHVzaGluZyB0aGUgVExCLCBhbmQKICAqIG11c3QgaG9sZCBhIHJl ZmVyZW5jZSB0byB0aGUgcGFnZS4KQEAgLTM2LDYgKzM5LDEwIEBAIHN0YXRpYyBpbmxpbmUgaW50 IHJlcGxhY2VfZ3JhbnRfaG9zdF9tYXBwaW5nKHVpbnQ2NF90IGFkZHIsIHVuc2lnbmVkIGxvbmcg ZnJhbWUsCiAgICAgcmV0dXJuIHJlcGxhY2VfZ3JhbnRfcHZfbWFwcGluZyhhZGRyLCBmcmFtZSwg bmV3X2FkZHIsIGZsYWdzKTsKIH0KIAorI2RlZmluZSBnbnR0YWJfaW5pdF9hcmNoKGd0KSAwCisj ZGVmaW5lIGdudHRhYl9kZXN0cm95X2FyY2goZ3QpIGRvIHt9IHdoaWxlICggMCApCisjZGVmaW5l IGdudHRhYl9zZXRfZnJhbWVfZ2ZuKGd0LCBpZHgsIGdmbikgZG8ge30gd2hpbGUgKCAwICkKKwog I2RlZmluZSBnbnR0YWJfY3JlYXRlX3NoYXJlZF9wYWdlKGQsIHQsIGkpICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKICAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIHNoYXJlX3hlbl9w YWdlX3dpdGhfZ3Vlc3QoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApA QCAtNzUsMTEgKzgyLDYgQEAgc3RhdGljIGlubGluZSB2b2lkIGdudHRhYl9jbGVhcl9mbGFnKHVu c2lnbmVkIGludCBuciwgdWludDE2X3QgKnN0KQogICAgIGFzbSB2b2xhdGlsZSAoImxvY2sgYnRy dyAldzEsJTAiIDogIj1tIiAoKnN0KSA6ICJJciIgKG5yKSwgIm0iICgqc3QpKTsKIH0KIAotc3Rh dGljIGlubGluZSB2b2lkIGdudHRhYl9zZXRfZnJhbWVfZ2ZuKHN0cnVjdCBkb21haW4gKmQsIHVu c2lnbmVkIGxvbmcgaWR4LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdmbl90IGdmbikKLXsKLX0KLQogLyogRm9yZWlnbiBtYXBwaW5ncyBvZiBISFZNLWd1ZXN0IHBh Z2VzIGRvIG5vdCBtb2RpZnkgdGhlIHR5cGUgY291bnQuICovCiAjZGVmaW5lIGdudHRhYl9ob3N0 X21hcHBpbmdfZ2V0X3BhZ2VfdHlwZShybywgbGQsIHJkKSAgIFwKICAgICAoIShybykgJiYgKCgo bGQpID09IChyZCkpIHx8ICFwYWdpbmdfbW9kZV9leHRlcm5hbChyZCkpKQpkaWZmIC0tZ2l0IGEv eGVuL2luY2x1ZGUveGVuL2dyYW50X3RhYmxlLmggYi94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFi bGUuaAppbmRleCBkZjExYjMxMjY0Li5kMmJkMjQxNmM0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVk ZS94ZW4vZ3JhbnRfdGFibGUuaAorKysgYi94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaApA QCAtMjksNiArMjksOCBAQAogI2luY2x1ZGUgPGFzbS9wYWdlLmg+CiAjaW5jbHVkZSA8YXNtL2dy YW50X3RhYmxlLmg+CiAKK3N0cnVjdCBncmFudF90YWJsZTsKKwogLyogVGhlIG1heGltdW0gc2l6 ZSBvZiBhIGdyYW50IHRhYmxlLiAqLwogZXh0ZXJuIHVuc2lnbmVkIGludCBtYXhfZ3JhbnRfZnJh bWVzOwogCi0tIAoyLjEyLjMKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK