From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v3 07/25] xen/arm: rename acpi_make_chosen_node to make_chosen_node Date: Tue, 31 Jul 2018 16:27:50 -0700 Message-ID: <1533079688-9541-7-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: julien.grall@arm.com Cc: Stefano Stabellini , sstabellini@kernel.org, andrii_anisov@epam.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org YWNwaV9tYWtlX2Nob3Nlbl9ub2RlIGlzIGFjdHVhbGx5IGdlbmVyaWMgYW5kIGNhbiBiZSByZXVz ZWQuIFJlbmFtZSBpdAp0byBtYWtlX2Nob3Nlbl9ub2RlIGFuZCBtYWtlIGl0IGF2YWlsYWJsZSB0 byBub24tQUNQSSBidWlsZHMuCgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHN0 ZWZhbm9zQHhpbGlueC5jb20+Ci0tLQpSZW1vdmVkIEp1bGllbidzIGFjayBkdWUgdG8gc21hbGwg Y2hhbmdlIGJlbG93CgpDaGFuZ2VzIGluIHYzOgotIHJldGFpbiBDT05GSUdfQUNQSSBub3QgdG8g YnJlYWsgYmlzZWN0aW9uIGZvciAhQUNQSSBidWlsZCwgaXQgd2lsbCBiZQogIHJlbW92ZWQgYnkg YSBsYXRlciBwYXRjaAotLS0KIHhlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYyB8IDkxICsrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDQ5IGluc2VydGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L2FybS9kb21haW5fYnVpbGQuYyBiL3hlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYwppbmRleCBi NTFkMDE0Li5jZDQ3YTY4IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMK KysrIGIveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jCkBAIC05MzIsNiArOTMyLDU0IEBAIHN0 YXRpYyBpbnQgX19pbml0IG1ha2VfdGltZXJfbm9kZShjb25zdCBzdHJ1Y3QgZG9tYWluICpkLCB2 b2lkICpmZHQsCiAgICAgcmV0dXJuIHJlczsKIH0KIAorI2lmZGVmIENPTkZJR19BQ1BJCisvKgor ICogVGhpcyBmdW5jdGlvbiBpcyB1c2VkIGFzIHBhcnQgb2YgdGhlIGRldmljZSB0cmVlIGdlbmVy YXRpb24gZm9yIERvbTAKKyAqIG9uIEFDUEkgc3lzdGVtcywgYW5kIERvbVVzIHN0YXJ0ZWQgZGly ZWN0bHkgZnJvbSBYZW4gYmFzZWQgb24gZGV2aWNlCisgKiB0cmVlIGluZm9ybWF0aW9uLgorICov CitzdGF0aWMgaW50IF9faW5pdCBtYWtlX2Nob3Nlbl9ub2RlKGNvbnN0IHN0cnVjdCBrZXJuZWxf aW5mbyAqa2luZm8pCit7CisgICAgaW50IHJlczsKKyAgICBjb25zdCBjaGFyICpib290YXJncyA9 IE5VTEw7CisgICAgY29uc3Qgc3RydWN0IGJvb3Rtb2R1bGUgKm1vZCA9IGtpbmZvLT5rZXJuZWxf Ym9vdG1vZHVsZTsKKyAgICB2b2lkICpmZHQgPSBraW5mby0+ZmR0OworCisgICAgZHRfZHByaW50 aygiQ3JlYXRlIGNob3NlbiBub2RlXG4iKTsKKyAgICByZXMgPSBmZHRfYmVnaW5fbm9kZShmZHQs ICJjaG9zZW4iKTsKKyAgICBpZiAoIHJlcyApCisgICAgICAgIHJldHVybiByZXM7CisKKyAgICBp ZiAoIG1vZCAmJiBtb2QtPmNtZGxpbmVbMF0gKQorICAgIHsKKyAgICAgICAgYm9vdGFyZ3MgPSAm bW9kLT5jbWRsaW5lWzBdOworICAgICAgICByZXMgPSBmZHRfcHJvcGVydHkoZmR0LCAiYm9vdGFy Z3MiLCBib290YXJncywgc3RybGVuKGJvb3RhcmdzKSArIDEpOworICAgICAgICBpZiAoIHJlcyAp CisgICAgICAgICAgIHJldHVybiByZXM7CisgICAgfQorCisgICAgLyoKKyAgICAgKiBJZiB0aGUg Ym9vdGxvYWRlciBwcm92aWRlcyBhbiBpbml0cmQsIHdlIG11c3QgY3JlYXRlIGEgcGxhY2Vob2xk ZXIKKyAgICAgKiBmb3IgdGhlIGluaXRyZCBwcm9wZXJ0aWVzLiBUaGUgdmFsdWVzIHdpbGwgYmUg cmVwbGFjZWQgbGF0ZXIuCisgICAgICovCisgICAgaWYgKCBtb2QgJiYgbW9kLT5zaXplICkKKyAg ICB7CisgICAgICAgIHU2NCBhID0gMDsKKyAgICAgICAgcmVzID0gZmR0X3Byb3BlcnR5KGtpbmZv LT5mZHQsICJsaW51eCxpbml0cmQtc3RhcnQiLCAmYSwgc2l6ZW9mKGEpKTsKKyAgICAgICAgaWYg KCByZXMgKQorICAgICAgICAgICAgcmV0dXJuIHJlczsKKworICAgICAgICByZXMgPSBmZHRfcHJv cGVydHkoa2luZm8tPmZkdCwgImxpbnV4LGluaXRyZC1lbmQiLCAmYSwgc2l6ZW9mKGEpKTsKKyAg ICAgICAgaWYgKCByZXMgKQorICAgICAgICAgICAgcmV0dXJuIHJlczsKKyAgICB9CisKKyAgICBy ZXMgPSBmZHRfZW5kX25vZGUoZmR0KTsKKworICAgIHJldHVybiByZXM7Cit9CisjZW5kaWYKKwog c3RhdGljIGludCBfX2luaXQgbWFwX2lycV90b19kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgdW5z aWduZWQgaW50IGlycSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wg bmVlZF9tYXBwaW5nLCBjb25zdCBjaGFyICpkZXZuYW1lKQogewpAQCAtMTQyNCw0NyArMTQ3Miw2 IEBAIHN0YXRpYyBpbnQgX19pbml0IGFjcGlfcm91dGVfc3BpcyhzdHJ1Y3QgZG9tYWluICpkKQog ICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IF9faW5pdCBhY3BpX21ha2VfY2hvc2VuX25v ZGUoY29uc3Qgc3RydWN0IGtlcm5lbF9pbmZvICpraW5mbykKLXsKLSAgICBpbnQgcmVzOwotICAg IGNvbnN0IGNoYXIgKmJvb3RhcmdzID0gTlVMTDsKLSAgICBjb25zdCBzdHJ1Y3QgYm9vdG1vZHVs ZSAqbW9kID0ga2luZm8tPmtlcm5lbF9ib290bW9kdWxlOwotICAgIHZvaWQgKmZkdCA9IGtpbmZv LT5mZHQ7Ci0KLSAgICBkdF9kcHJpbnRrKCJDcmVhdGUgY2hvc2VuIG5vZGVcbiIpOwotICAgIHJl cyA9IGZkdF9iZWdpbl9ub2RlKGZkdCwgImNob3NlbiIpOwotICAgIGlmICggcmVzICkKLSAgICAg ICAgcmV0dXJuIHJlczsKLQotICAgIGlmICggbW9kICYmIG1vZC0+Y21kbGluZVswXSApCi0gICAg ewotICAgICAgICBib290YXJncyA9ICZtb2QtPmNtZGxpbmVbMF07Ci0gICAgICAgIHJlcyA9IGZk dF9wcm9wZXJ0eShmZHQsICJib290YXJncyIsIGJvb3RhcmdzLCBzdHJsZW4oYm9vdGFyZ3MpICsg MSk7Ci0gICAgICAgIGlmICggcmVzICkKLSAgICAgICAgICAgcmV0dXJuIHJlczsKLSAgICB9Ci0K LSAgICAvKgotICAgICAqIElmIHRoZSBib290bG9hZGVyIHByb3ZpZGVzIGFuIGluaXRyZCwgd2Ug bXVzdCBjcmVhdGUgYSBwbGFjZWhvbGRlcgotICAgICAqIGZvciB0aGUgaW5pdHJkIHByb3BlcnRp ZXMuIFRoZSB2YWx1ZXMgd2lsbCBiZSByZXBsYWNlZCBsYXRlci4KLSAgICAgKi8KLSAgICBpZiAo IG1vZCAmJiBtb2QtPnNpemUgKQotICAgIHsKLSAgICAgICAgdTY0IGEgPSAwOwotICAgICAgICBy ZXMgPSBmZHRfcHJvcGVydHkoa2luZm8tPmZkdCwgImxpbnV4LGluaXRyZC1zdGFydCIsICZhLCBz aXplb2YoYSkpOwotICAgICAgICBpZiAoIHJlcyApCi0gICAgICAgICAgICByZXR1cm4gcmVzOwot Ci0gICAgICAgIHJlcyA9IGZkdF9wcm9wZXJ0eShraW5mby0+ZmR0LCAibGludXgsaW5pdHJkLWVu ZCIsICZhLCBzaXplb2YoYSkpOwotICAgICAgICBpZiAoIHJlcyApCi0gICAgICAgICAgICByZXR1 cm4gcmVzOwotICAgIH0KLQotICAgIHJlcyA9IGZkdF9lbmRfbm9kZShmZHQpOwotCi0gICAgcmV0 dXJuIHJlczsKLX0KLQogc3RhdGljIGludCBfX2luaXQgYWNwaV9tYWtlX2h5cGVydmlzb3Jfbm9k ZShjb25zdCBzdHJ1Y3Qga2VybmVsX2luZm8gKmtpbmZvLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgbWVtYmFuayB0YmxfYWRkW10pCiB7CkBAIC0x NTM3LDcgKzE1NDQsNyBAQCBzdGF0aWMgaW50IF9faW5pdCBjcmVhdGVfYWNwaV9kdGIoc3RydWN0 IGtlcm5lbF9pbmZvICpraW5mbywKICAgICAgICAgcmV0dXJuIHJldDsKIAogICAgIC8qIENyZWF0 ZSBhIGNob3NlbiBub2RlIGZvciBET00wICovCi0gICAgcmV0ID0gYWNwaV9tYWtlX2Nob3Nlbl9u b2RlKGtpbmZvKTsKKyAgICByZXQgPSBtYWtlX2Nob3Nlbl9ub2RlKGtpbmZvKTsKICAgICBpZiAo IHJldCApCiAgICAgICAgIGdvdG8gZXJyOwogCi0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=