From: Julien Grall Subject: [PATCH MM-PART2 v2 02/19] xen/arm: Rename SCTLR_* defines and remove unused one Date: Tue, 14 May 2019 13:21:13 +0100 Message-ID: <20190514122136.28215-5-julien.grall@arm.com> References: <20190514122136.28215-1-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQWRM-00087u-0l for xen-devel@lists.xenproject.org; Tue, 14 May 2019 12:21:52 +0000 In-Reply-To: <20190514122136.28215-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.xenproject.org Cc: Oleksandr_Tyshchenko@epam.com, Julien Grall , Stefano Stabellini , Andrii Anisov List-Id: xen-devel@lists.xenproject.org VGhlIFNDVExSXyogYXJlIGN1cnJlbnRseSB1c2VkIGZvciBTQ1RMUi9IU0NUTFIgKGFybTMyKSBh bmQKU0NUTFJfRUwxL1NDVExSX0VMMiAoYXJtNjQpLgoKVGhlIG5hbWluZyBzY2hlbWUgaXMgYWN0 dWFsbHkgcXVpdGUgY29uZnVzaW5nIGJlY2F1c2UgdGhleSBtYXkgb25seSBiZQpkZWZpbmVkIGZv ciBhbiBhcmNoaWN0dXJlIChvciBldmVuIGFuIGV4Y2VwdGlvbiBsZXZlbCkuIFNvIGl0IGlzIG5v dCBlYXN5CmZvciB0aGUgZGV2ZWxvcGVyIHRvIGtub3cgd2hpY2ggb25lIHRvIHVzZS4KClRoZSBu YW1pbmcgc2NoZW1lIGlzIHJld29ya2VkIGJ5IGFkZGluZyBBeHhfRUx4IGluIGVhY2ggZGVmaW5l OgogICAgKiB4eCBpcyByZXBsYWNlZCBieSAzMiBvciA2NCBpZiBzcGVjaWZpYyB0byBhbiBhcmNo aXRlY3R1cmUKICAgICogeCBpcyByZXBsYWNlZCBieSAyIChoeXBlcnZpc29yKSBvciAxIChrZXJu ZWwpIGlmIHNwZWNpZmljIHRvIGFuCiAgICBleGNlcHRpb24gbGV2ZWwKCldoaWxlIGRvaW5nIHRo ZSByZW5hbWluZywgcmVtb3ZlIHRoZSB1bnVzZWQgZGVmaW5lcyAob3IgYXQgbGVhc3QgdGhlIG9u ZXMKdGhhdCBhcmUgdW5saWtlbHkgZ29pbmcgdG8gYmUgdXNlZCkuCgpTaWduZWQtb2ZmLWJ5OiBK dWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgpSZXZpZXdlZC1ieTogQW5kcmlpIEFu aXNvdiA8YW5kcmlpX2FuaXNvdkBlcGFtLmNvbT4KCi0tLQogICAgQ2hhbmdlcyBpbiB2MjoKICAg ICAgICAtIEZpeCBidWlsZCBvbiBhcm0zMgogICAgICAgIC0gQWRkIEFuZHJpaSdzIHJldmlld2Vk LWJ5Ci0tLQogeGVuL2FyY2gvYXJtL2FybTMyL2hlYWQuUyAgICAgICB8ICA1ICsrKy0tCiB4ZW4v YXJjaC9hcm0vYXJtNjQvaGVhZC5TICAgICAgIHwgIDQgKystLQogeGVuL2FyY2gvYXJtL2d1ZXN0 X3dhbGsuYyAgICAgICB8ICAyICstCiB4ZW4vYXJjaC9hcm0vbW0uYyAgICAgICAgICAgICAgIHwg IDIgKy0KIHhlbi9hcmNoL2FybS90cmFwcy5jICAgICAgICAgICAgfCAgNiArKystLS0KIHhlbi9p bmNsdWRlL2FzbS1hcm0vcDJtLmggICAgICAgfCAgNCArKystCiB4ZW4vaW5jbHVkZS9hc20tYXJt L3Byb2Nlc3Nvci5oIHwgMzcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQog NyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW4vYXJjaC9hcm0vYXJtMzIvaGVhZC5TIGIveGVuL2FyY2gvYXJtL2FybTMyL2hl YWQuUwppbmRleCAzOTBhNTA1ZTA1Li40NTRkMjQ1MzdjIDEwMDY0NAotLS0gYS94ZW4vYXJjaC9h cm0vYXJtMzIvaGVhZC5TCisrKyBiL3hlbi9hcmNoL2FybS9hcm0zMi9oZWFkLlMKQEAgLTI0NCw3 ICsyNDQsNyBAQCBjcHVfaW5pdF9kb25lOgogICAgICAgICAgKiBBbGlnbm1lbnQgY2hlY2tpbmcg ZW5hYmxlZCwKICAgICAgICAgICogTU1VIHRyYW5zbGF0aW9uIGRpc2FibGVkIChmb3Igbm93KS4K ICAgICAgICAgICovCi0gICAgICAgIGxkciAgIHIwLCA9KEhTQ1RMUl9CQVNFfFNDVExSX0EpCisg ICAgICAgIGxkciAgIHIwLCA9KEhTQ1RMUl9CQVNFfFNDVExSX0F4eF9FTHhfQSkKICAgICAgICAg bWNyICAgQ1AzMihyMCwgSFNDVExSKQogCiAgICAgICAgIC8qCkBAIC0zNjksNyArMzY5LDggQEAg dmlydHBoeXNfY2xhc2g6CiAKICAgICAgICAgbGRyICAgcjEsID1wYWdpbmcgICAgICAgICAgICAv KiBFeHBsaWNpdCB2YWRkciwgbm90IFJJUC1yZWxhdGl2ZSAqLwogICAgICAgICBtcmMgICBDUDMy KHIwLCBIU0NUTFIpCi0gICAgICAgIG9yciAgIHIwLCByMCwgIyhTQ1RMUl9NfFNDVExSX0MpIC8q IEVuYWJsZSBNTVUgYW5kIEQtY2FjaGUgKi8KKyAgICAgICAgLyogRW5hYmxlIE1NVSBhbmQgRC1j YWNoZSAqLworICAgICAgICBvcnIgICByMCwgcjAsICMoU0NUTFJfQXh4X0VMeF9NfFNDVExSX0F4 eF9FTHhfQykKICAgICAgICAgZHNiICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBGbHVzaCBQ VEUgd3JpdGVzIGFuZCBmaW5pc2ggcmVhZHMgKi8KICAgICAgICAgbWNyICAgQ1AzMihyMCwgSFND VExSKSAgICAgICAvKiBub3cgcGFnaW5nIGlzIGVuYWJsZWQgKi8KICAgICAgICAgaXNiICAgICAg ICAgICAgICAgICAgICAgICAgICAvKiBOb3csIGZsdXNoIHRoZSBpY2FjaGUgKi8KZGlmZiAtLWdp dCBhL3hlbi9hcmNoL2FybS9hcm02NC9oZWFkLlMgYi94ZW4vYXJjaC9hcm0vYXJtNjQvaGVhZC5T CmluZGV4IDQ1ODlhMzc4NzQuLjhhNmJlMzM1MmUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9h cm02NC9oZWFkLlMKKysrIGIveGVuL2FyY2gvYXJtL2FybTY0L2hlYWQuUwpAQCAtNTE0LDggKzUx NCw4IEBAIHZpcnRwaHlzX2NsYXNoOgogCiAgICAgICAgIGxkciAgIHgxLCA9cGFnaW5nICAgICAg ICAgICAgLyogRXhwbGljaXQgdmFkZHIsIG5vdCBSSVAtcmVsYXRpdmUgKi8KICAgICAgICAgbXJz ICAgeDAsIFNDVExSX0VMMgotICAgICAgICBvcnIgICB4MCwgeDAsICNTQ1RMUl9NICAgICAgIC8q IEVuYWJsZSBNTVUgKi8KLSAgICAgICAgb3JyICAgeDAsIHgwLCAjU0NUTFJfQyAgICAgICAvKiBF bmFibGUgRC1jYWNoZSAqLworICAgICAgICBvcnIgICB4MCwgeDAsICNTQ1RMUl9BeHhfRUx4X00g IC8qIEVuYWJsZSBNTVUgKi8KKyAgICAgICAgb3JyICAgeDAsIHgwLCAjU0NUTFJfQXh4X0VMeF9D ICAvKiBFbmFibGUgRC1jYWNoZSAqLwogICAgICAgICBkc2IgICBzeSAgICAgICAgICAgICAgICAg ICAgIC8qIEZsdXNoIFBURSB3cml0ZXMgYW5kIGZpbmlzaCByZWFkcyAqLwogICAgICAgICBtc3Ig ICBTQ1RMUl9FTDIsIHgwICAgICAgICAgIC8qIG5vdyBwYWdpbmcgaXMgZW5hYmxlZCAqLwogICAg ICAgICBpc2IgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIE5vdywgZmx1c2ggdGhlIGljYWNo ZSAqLwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2d1ZXN0X3dhbGsuYyBiL3hlbi9hcmNoL2Fy bS9ndWVzdF93YWxrLmMKaW5kZXggZjEwZDJlOWY3Ni4uYzZkNmUyM2JmNSAxMDA2NDQKLS0tIGEv eGVuL2FyY2gvYXJtL2d1ZXN0X3dhbGsuYworKysgYi94ZW4vYXJjaC9hcm0vZ3Vlc3Rfd2Fsay5j CkBAIC02MTIsNyArNjEyLDcgQEAgYm9vbCBndWVzdF93YWxrX3RhYmxlcyhjb25zdCBzdHJ1Y3Qg dmNwdSAqdiwgdmFkZHJfdCBndmEsCiAgICAgKnBlcm1zID0gR1YyTV9SRUFEOwogCiAgICAgLyog SWYgdGhlIE1NVSBpcyBkaXNhYmxlZCwgdGhlcmUgaXMgbm8gbmVlZCB0byB0cmFuc2xhdGUgdGhl IGd2YS4gKi8KLSAgICBpZiAoICEoc2N0bHIgJiBTQ1RMUl9NKSApCisgICAgaWYgKCAhKHNjdGxy ICYgU0NUTFJfQXh4X0VMeF9NKSApCiAgICAgewogICAgICAgICAqaXBhID0gZ3ZhOwogCmRpZmYg LS1naXQgYS94ZW4vYXJjaC9hcm0vbW0uYyBiL3hlbi9hcmNoL2FybS9tbS5jCmluZGV4IDlkNTg0 ZTRjYmYuLmUwOTBhZmI5NzYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9tbS5jCisrKyBiL3hl bi9hcmNoL2FybS9tbS5jCkBAIC02MDksNyArNjA5LDcgQEAgdm9pZCBfX2luaXQgcmVtb3ZlX2Vh cmx5X21hcHBpbmdzKHZvaWQpCiAgKi8KIHN0YXRpYyB2b2lkIHhlbl9wdF9lbmZvcmNlX3dueCh2 b2lkKQogewotICAgIFdSSVRFX1NZU1JFRzMyKFJFQURfU1lTUkVHMzIoU0NUTFJfRUwyKSB8IFND VExSX1dYTiwgU0NUTFJfRUwyKTsKKyAgICBXUklURV9TWVNSRUczMihSRUFEX1NZU1JFRzMyKFND VExSX0VMMikgfCBTQ1RMUl9BeHhfRUx4X1dYTiwgU0NUTFJfRUwyKTsKICAgICAvKgogICAgICAq IFRoZSBUTEJzIG1heSBjYWNoZSBTQ1RMUl9FTDIuV1hOLiBTbyBlbnN1cmUgaXQgaXMgc3luY2hy b25pemVkCiAgICAgICogYmVmb3JlIGZsdXNoaW5nIHRoZSBUTEJzLgpkaWZmIC0tZ2l0IGEveGVu L2FyY2gvYXJtL3RyYXBzLmMgYi94ZW4vYXJjaC9hcm0vdHJhcHMuYwppbmRleCAxYWJhOTcwNDE1 Li42Yzc1N2MxMmE4IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vdHJhcHMuYworKysgYi94ZW4v YXJjaC9hcm0vdHJhcHMuYwpAQCAtMzkyLDkgKzM5Miw5IEBAIHN0YXRpYyB2b2lkIGNwc3Jfc3dp dGNoX21vZGUoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MsIGludCBtb2RlKQogICAgIHJlZ3Mt PmNwc3IgfD0gUFNSX0lSUV9NQVNLOwogICAgIGlmICggbW9kZSA9PSBQU1JfTU9ERV9BQlQgKQog ICAgICAgICByZWdzLT5jcHNyIHw9IFBTUl9BQlRfTUFTSzsKLSAgICBpZiAoIHNjdGxyICYgU0NU TFJfVEUgKQorICAgIGlmICggc2N0bHIgJiBTQ1RMUl9BMzJfRUx4X1RFICkKICAgICAgICAgcmVn cy0+Y3BzciB8PSBQU1JfVEhVTUI7Ci0gICAgaWYgKCBzY3RsciAmIFNDVExSX0VFICkKKyAgICBp ZiAoIHNjdGxyICYgU0NUTFJfQXh4X0VMeF9FRSApCiAgICAgICAgIHJlZ3MtPmNwc3IgfD0gUFNS X0JJR19FTkRJQU47CiB9CiAKQEAgLTQwMiw3ICs0MDIsNyBAQCBzdGF0aWMgdmFkZHJfdCBleGNl cHRpb25faGFuZGxlcjMyKHZhZGRyX3Qgb2Zmc2V0KQogewogICAgIHVpbnQzMl90IHNjdGxyID0g UkVBRF9TWVNSRUczMihTQ1RMUl9FTDEpOwogCi0gICAgaWYgKCBzY3RsciAmIFNDVExSX1YgKQor ICAgIGlmICggc2N0bHIgJiBTQ1RMUl9BMzJfRUwxX1YgKQogICAgICAgICByZXR1cm4gMHhmZmZm MDAwMCArIG9mZnNldDsKICAgICBlbHNlIC8qIGFsd2F5cyBoYXZlIHNlY3VyaXR5IGV4Y2VwdGlv bnMgKi8KICAgICAgICAgcmV0dXJuIFJFQURfU1lTUkVHKFZCQVJfRUwxKSArIG9mZnNldDsKZGlm ZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vcDJtLmggYi94ZW4vaW5jbHVkZS9hc20tYXJt L3AybS5oCmluZGV4IDA0MWRlYTgyN2MuLjJmODliYjAwYzMgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNs dWRlL2FzbS1hcm0vcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLWFybS9wMm0uaApAQCAtMzkx LDEwICszOTEsMTIgQEAgc3RhdGljIGlubGluZSBpbnQgc2V0X2ZvcmVpZ25fcDJtX2VudHJ5KHN0 cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICovCiBzdGF0aWMgaW5saW5lIGJv b2wgdmNwdV9oYXNfY2FjaGVfZW5hYmxlZChzdHJ1Y3QgdmNwdSAqdikKIHsKKyAgICBjb25zdCB1 aW50MzJfdCBtYXNrID0gU0NUTFJfQXh4X0VMeF9DIHwgU0NUTFJfQXh4X0VMeF9NOworCiAgICAg LyogT25seSB3b3JrcyB3aXRoIHRoZSBjdXJyZW50IHZDUFUgKi8KICAgICBBU1NFUlQoY3VycmVu dCA9PSB2KTsKIAotICAgIHJldHVybiAoUkVBRF9TWVNSRUczMihTQ1RMUl9FTDEpICYgKFNDVExS X0N8U0NUTFJfTSkpID09IChTQ1RMUl9DfFNDVExSX00pOworICAgIHJldHVybiAoUkVBRF9TWVNS RUczMihTQ1RMUl9FTDEpICYgbWFzaykgPT0gbWFzazsKIH0KIAogI2VuZGlmIC8qIF9YRU5fUDJN X0ggKi8KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vcHJvY2Vzc29yLmggYi94ZW4v aW5jbHVkZS9hc20tYXJtL3Byb2Nlc3Nvci5oCmluZGV4IDA0YjA1YjNmMzkuLmYzYjY4MTg1ZWIg MTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vcHJvY2Vzc29yLmgKKysrIGIveGVuL2lu Y2x1ZGUvYXNtLWFybS9wcm9jZXNzb3IuaApAQCAtMTE3LDI2ICsxMTcsMjMgQEAKICNkZWZpbmUg VFRCQ1JfUEQxICAgICAgIChfQUMoMSxVKTw8NSkKIAogLyogU0NUTFIgU3lzdGVtIENvbnRyb2wg UmVnaXN0ZXIuICovCi0vKiBIU0NUTFIgaXMgYSBzdWJzZXQgb2YgdGhpcy4gKi8KLSNkZWZpbmUg U0NUTFJfVEUgICAgICAgIChfQUMoMSxVKTw8MzApCi0jZGVmaW5lIFNDVExSX0FGRSAgICAgICAo X0FDKDEsVSk8PDI5KQotI2RlZmluZSBTQ1RMUl9UUkUgICAgICAgKF9BQygxLFUpPDwyOCkKLSNk ZWZpbmUgU0NUTFJfTk1GSSAgICAgIChfQUMoMSxVKTw8MjcpCi0jZGVmaW5lIFNDVExSX0VFICAg ICAgICAoX0FDKDEsVSk8PDI1KQotI2RlZmluZSBTQ1RMUl9WRSAgICAgICAgKF9BQygxLFUpPDwy NCkKLSNkZWZpbmUgU0NUTFJfVSAgICAgICAgIChfQUMoMSxVKTw8MjIpCi0jZGVmaW5lIFNDVExS X0ZJICAgICAgICAoX0FDKDEsVSk8PDIxKQotI2RlZmluZSBTQ1RMUl9XWE4gICAgICAgKF9BQygx LFUpPDwxOSkKLSNkZWZpbmUgU0NUTFJfSEEgICAgICAgIChfQUMoMSxVKTw8MTcpCi0jZGVmaW5l IFNDVExSX1JSICAgICAgICAoX0FDKDEsVSk8PDE0KQotI2RlZmluZSBTQ1RMUl9WICAgICAgICAg KF9BQygxLFUpPDwxMykKLSNkZWZpbmUgU0NUTFJfSSAgICAgICAgIChfQUMoMSxVKTw8MTIpCi0j ZGVmaW5lIFNDVExSX1ogICAgICAgICAoX0FDKDEsVSk8PDExKQotI2RlZmluZSBTQ1RMUl9TVyAg ICAgICAgKF9BQygxLFUpPDwxMCkKLSNkZWZpbmUgU0NUTFJfQiAgICAgICAgIChfQUMoMSxVKTw8 NykKLSNkZWZpbmUgU0NUTFJfQyAgICAgICAgIChfQUMoMSxVKTw8MikKLSNkZWZpbmUgU0NUTFJf QSAgICAgICAgIChfQUMoMSxVKTw8MSkKLSNkZWZpbmUgU0NUTFJfTSAgICAgICAgIChfQUMoMSxV KTw8MCkKKworLyogQml0cyBzcGVjaWZpYyB0byBTQ1RMUl9FTDEgZm9yIEFybTMyICovCisKKyNk ZWZpbmUgU0NUTFJfQTMyX0VMMV9WICAgICAoX0FDKDEsVSk8PDEzKQorCisvKiBDb21tb24gYml0 cyBmb3IgU0NUTFJfRUx4IGZvciBBcm0zMiAqLworCisjZGVmaW5lIFNDVExSX0EzMl9FTHhfVEUg ICAgKF9BQygxLFUpPDwzMCkKKyNkZWZpbmUgU0NUTFJfQTMyX0VMeF9GSSAgICAoX0FDKDEsVSk8 PDIxKQorCisvKiBDb21tb24gYml0cyBmb3IgU0NUTFJfRUx4IG9uIGFsbCBhcmNoaXRlY3R1cmVz ICovCisjZGVmaW5lIFNDVExSX0F4eF9FTHhfRUUgICAgKF9BQygxLFUpPDwyNSkKKyNkZWZpbmUg U0NUTFJfQXh4X0VMeF9XWE4gICAoX0FDKDEsVSk8PDE5KQorI2RlZmluZSBTQ1RMUl9BeHhfRUx4 X0kgICAgIChfQUMoMSxVKTw8MTIpCisjZGVmaW5lIFNDVExSX0F4eF9FTHhfQyAgICAgKF9BQygx LFUpPDwyKQorI2RlZmluZSBTQ1RMUl9BeHhfRUx4X0EgICAgIChfQUMoMSxVKTw8MSkKKyNkZWZp bmUgU0NUTFJfQXh4X0VMeF9NICAgICAoX0FDKDEsVSk8PDApCiAKICNkZWZpbmUgSFNDVExSX0JB U0UgICAgIF9BQygweDMwYzUxODc4LFUpCiAKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=