From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v2 07/21] xen/arm: rename acpi_make_chosen_node to make_chosen_node Date: Fri, 6 Jul 2018 16:12:02 -0700 Message-ID: <1530918736-13965-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+Ci0tLQogeGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jIHwgODkg KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVu L2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jIGIveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jCmlu ZGV4IGMzNDljZTQuLjRkMDY1ODQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9kb21haW5fYnVp bGQuYworKysgYi94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMKQEAgLTk1NCw2ICs5NTQsNTIg QEAgc3RhdGljIGludCBtYWtlX3RpbWVyX25vZGUoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCwgdm9p ZCAqZmR0LAogICAgIHJldHVybiByZXM7CiB9CiAKKy8qCisgKiBUaGlzIGZ1bmN0aW9uIGlzIHVz ZWQgYXMgcGFydCBvZiB0aGUgZGV2aWNlIHRyZWUgZ2VuZXJhdGlvbiBmb3IgRG9tMAorICogb24g QUNQSSBzeXN0ZW1zLCBhbmQgRG9tVXMgc3RhcnRlZCBkaXJlY3RseSBmcm9tIFhlbiBiYXNlZCBv biBkZXZpY2UKKyAqIHRyZWUgaW5mb3JtYXRpb24uCisgKi8KK3N0YXRpYyBpbnQgbWFrZV9jaG9z ZW5fbm9kZShjb25zdCBzdHJ1Y3Qga2VybmVsX2luZm8gKmtpbmZvKQoreworICAgIGludCByZXM7 CisgICAgY29uc3QgY2hhciAqYm9vdGFyZ3MgPSBOVUxMOworICAgIGNvbnN0IHN0cnVjdCBib290 bW9kdWxlICptb2QgPSBraW5mby0+a2VybmVsX2Jvb3Rtb2R1bGU7CisgICAgdm9pZCAqZmR0ID0g a2luZm8tPmZkdDsKKworICAgIGR0X2RwcmludGsoIkNyZWF0ZSBjaG9zZW4gbm9kZVxuIik7Cisg ICAgcmVzID0gZmR0X2JlZ2luX25vZGUoZmR0LCAiY2hvc2VuIik7CisgICAgaWYgKCByZXMgKQor ICAgICAgICByZXR1cm4gcmVzOworCisgICAgaWYgKCBtb2QgJiYgbW9kLT5jbWRsaW5lWzBdICkK KyAgICB7CisgICAgICAgIGJvb3RhcmdzID0gJm1vZC0+Y21kbGluZVswXTsKKyAgICAgICAgcmVz ID0gZmR0X3Byb3BlcnR5KGZkdCwgImJvb3RhcmdzIiwgYm9vdGFyZ3MsIHN0cmxlbihib290YXJn cykgKyAxKTsKKyAgICAgICAgaWYgKCByZXMgKQorICAgICAgICAgICByZXR1cm4gcmVzOworICAg IH0KKworICAgIC8qCisgICAgICogSWYgdGhlIGJvb3Rsb2FkZXIgcHJvdmlkZXMgYW4gaW5pdHJk LCB3ZSBtdXN0IGNyZWF0ZSBhIHBsYWNlaG9sZGVyCisgICAgICogZm9yIHRoZSBpbml0cmQgcHJv cGVydGllcy4gVGhlIHZhbHVlcyB3aWxsIGJlIHJlcGxhY2VkIGxhdGVyLgorICAgICAqLworICAg IGlmICggbW9kICYmIG1vZC0+c2l6ZSApCisgICAgeworICAgICAgICB1NjQgYSA9IDA7CisgICAg ICAgIHJlcyA9IGZkdF9wcm9wZXJ0eShraW5mby0+ZmR0LCAibGludXgsaW5pdHJkLXN0YXJ0Iiwg JmEsIHNpemVvZihhKSk7CisgICAgICAgIGlmICggcmVzICkKKyAgICAgICAgICAgIHJldHVybiBy ZXM7CisKKyAgICAgICAgcmVzID0gZmR0X3Byb3BlcnR5KGtpbmZvLT5mZHQsICJsaW51eCxpbml0 cmQtZW5kIiwgJmEsIHNpemVvZihhKSk7CisgICAgICAgIGlmICggcmVzICkKKyAgICAgICAgICAg IHJldHVybiByZXM7CisgICAgfQorCisgICAgcmVzID0gZmR0X2VuZF9ub2RlKGZkdCk7CisKKyAg ICByZXR1cm4gcmVzOworfQorCiBzdGF0aWMgaW50IG1hcF9pcnFfdG9fZG9tYWluKHN0cnVjdCBk b21haW4gKmQsIHVuc2lnbmVkIGludCBpcnEsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJvb2wgbmVlZF9tYXBwaW5nLCBjb25zdCBjaGFyICpkZXZuYW1lKQogCkBAIC0xNDQ5LDQ3ICsx NDk1LDYgQEAgc3RhdGljIGludCBhY3BpX3JvdXRlX3NwaXMoc3RydWN0IGRvbWFpbiAqZCkKICAg ICByZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBhY3BpX21ha2VfY2hvc2VuX25vZGUoY29uc3Qg c3RydWN0IGtlcm5lbF9pbmZvICpraW5mbykKLXsKLSAgICBpbnQgcmVzOwotICAgIGNvbnN0IGNo YXIgKmJvb3RhcmdzID0gTlVMTDsKLSAgICBjb25zdCBzdHJ1Y3QgYm9vdG1vZHVsZSAqbW9kID0g a2luZm8tPmtlcm5lbF9ib290bW9kdWxlOwotICAgIHZvaWQgKmZkdCA9IGtpbmZvLT5mZHQ7Ci0K LSAgICBkdF9kcHJpbnRrKCJDcmVhdGUgY2hvc2VuIG5vZGVcbiIpOwotICAgIHJlcyA9IGZkdF9i ZWdpbl9ub2RlKGZkdCwgImNob3NlbiIpOwotICAgIGlmICggcmVzICkKLSAgICAgICAgcmV0dXJu IHJlczsKLQotICAgIGlmICggbW9kICYmIG1vZC0+Y21kbGluZVswXSApCi0gICAgewotICAgICAg ICBib290YXJncyA9ICZtb2QtPmNtZGxpbmVbMF07Ci0gICAgICAgIHJlcyA9IGZkdF9wcm9wZXJ0 eShmZHQsICJib290YXJncyIsIGJvb3RhcmdzLCBzdHJsZW4oYm9vdGFyZ3MpICsgMSk7Ci0gICAg ICAgIGlmICggcmVzICkKLSAgICAgICAgICAgcmV0dXJuIHJlczsKLSAgICB9Ci0KLSAgICAvKgot ICAgICAqIElmIHRoZSBib290bG9hZGVyIHByb3ZpZGVzIGFuIGluaXRyZCwgd2UgbXVzdCBjcmVh dGUgYSBwbGFjZWhvbGRlcgotICAgICAqIGZvciB0aGUgaW5pdHJkIHByb3BlcnRpZXMuIFRoZSB2 YWx1ZXMgd2lsbCBiZSByZXBsYWNlZCBsYXRlci4KLSAgICAgKi8KLSAgICBpZiAoIG1vZCAmJiBt b2QtPnNpemUgKQotICAgIHsKLSAgICAgICAgdTY0IGEgPSAwOwotICAgICAgICByZXMgPSBmZHRf cHJvcGVydHkoa2luZm8tPmZkdCwgImxpbnV4LGluaXRyZC1zdGFydCIsICZhLCBzaXplb2YoYSkp OwotICAgICAgICBpZiAoIHJlcyApCi0gICAgICAgICAgICByZXR1cm4gcmVzOwotCi0gICAgICAg IHJlcyA9IGZkdF9wcm9wZXJ0eShraW5mby0+ZmR0LCAibGludXgsaW5pdHJkLWVuZCIsICZhLCBz aXplb2YoYSkpOwotICAgICAgICBpZiAoIHJlcyApCi0gICAgICAgICAgICByZXR1cm4gcmVzOwot ICAgIH0KLQotICAgIHJlcyA9IGZkdF9lbmRfbm9kZShmZHQpOwotCi0gICAgcmV0dXJuIHJlczsK LX0KLQogc3RhdGljIGludCBhY3BpX21ha2VfaHlwZXJ2aXNvcl9ub2RlKGNvbnN0IHN0cnVjdCBr ZXJuZWxfaW5mbyAqa2luZm8sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RydWN0IG1lbWJhbmsgdGJsX2FkZFtdKQogewpAQCAtMTU2MSw3ICsxNTY2LDcgQEAgc3RhdGlj IGludCBjcmVhdGVfYWNwaV9kdGIoc3RydWN0IGtlcm5lbF9pbmZvICpraW5mbywgc3RydWN0IG1l bWJhbmsgdGJsX2FkZFtdKQogICAgICAgICByZXR1cm4gcmV0OwogCiAgICAgLyogQ3JlYXRlIGEg Y2hvc2VuIG5vZGUgZm9yIERPTTAgKi8KLSAgICByZXQgPSBhY3BpX21ha2VfY2hvc2VuX25vZGUo a2luZm8pOworICAgIHJldCA9IG1ha2VfY2hvc2VuX25vZGUoa2luZm8pOwogICAgIGlmICggcmV0 ICkKICAgICAgICAgZ290byBlcnI7CiAKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==