From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v2 06/21] xen/arm: do not pass dt_host to make_memory_node and make_hypervisor_node Date: Fri, 6 Jul 2018 16:12:01 -0700 Message-ID: <1530918736-13965-6-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 SW4gb3JkZXIgdG8gbWFrZSBtYWtlX21lbW9yeV9ub2RlIGFuZCBtYWtlX2h5cGVydmlzb3Jfbm9k ZSBtb3JlCnJldXNhYmxlLCBkbyBub3QgcGFzcyB0aGVtIGR0X2hvc3QuIEFzIHRoZXkgb25seSB1 c2UgaXQgdG8gY2FsY3VsYXRlCmFkZHJjZWxscyBhbmQgc2l6ZWNlbGxzLCBwYXNzIGFkZHJjZWxs cyBhbmQgc2l6ZWNlbGxzIGRpcmVjdGx5LgoKSW4gbWFrZV9oeXBlcnZpc29yX25vZGUsIGFzc3Vt ZSB0aGF0IGV2dGNobl9pcnEgaGFzIGFscmVhZHkgYmVlbgphbGxvY2F0ZWQuIE1vdmUgdGhlIGV2 dGNobl9hbGxvY2F0ZSBjYWxsIHRvIGhhbmRsZV9ub2RlLgoKU2lnbmVkLW9mZi1ieTogU3RlZmFu byBTdGFiZWxsaW5pIDxzdGVmYW5vc0B4aWxpbnguY29tPgoKLS0tCkNoYW5nZXMgaW4gdjI6Ci0g YWRkIGJsYW5rIGxpbmUKLSBtb3ZlIGV2dGNobl9hbGxvY2F0ZSB0byBoYW5kbGVfbm9kZQotLS0K IHhlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYyAgIHwgMzYgKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tCiB4ZW4vY29tbW9uL2RldmljZV90cmVlLmMgICAgICB8ICA2ICsrKy0t LQogeGVuL2luY2x1ZGUveGVuL2RldmljZV90cmVlLmggfCAgMiArLQogMyBmaWxlcyBjaGFuZ2Vk LCAyNCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJj aC9hcm0vZG9tYWluX2J1aWxkLmMgYi94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMKaW5kZXgg YWUzZWJjNS4uYzM0OWNlNCAxMDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5j CisrKyBiL3hlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYwpAQCAtNTU4LDExICs1NTgsMTEgQEAg c3RhdGljIGludCBmZHRfcHJvcGVydHlfaW50ZXJydXB0cyh2b2lkICpmZHQsIGdpY19pbnRlcnJ1 cHRfdCAqaW50ciwKIAogc3RhdGljIGludCBtYWtlX21lbW9yeV9ub2RlKGNvbnN0IHN0cnVjdCBk b21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqZmR0LAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBkdF9kZXZpY2Vfbm9kZSAqcGFyZW50 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBhZGRyY2VsbHMsIGludCBzaXplY2Vs bHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGtlcm5lbF9pbmZv ICpraW5mbykKIHsKICAgICBpbnQgcmVzLCBpOwotICAgIGludCByZWdfc2l6ZSA9IGR0X2NoaWxk X25fYWRkcl9jZWxscyhwYXJlbnQpICsgZHRfY2hpbGRfbl9zaXplX2NlbGxzKHBhcmVudCk7Cisg ICAgaW50IHJlZ19zaXplID0gYWRkcmNlbGxzICsgc2l6ZWNlbGxzOwogICAgIGludCBucl9jZWxs cyA9IHJlZ19zaXplKmtpbmZvLT5tZW0ubnJfYmFua3M7CiAgICAgX19iZTMyIHJlZ1tucl9jZWxs c107CiAgICAgX19iZTMyICpjZWxsczsKQEAgLTU4OCw3ICs1ODgsNyBAQCBzdGF0aWMgaW50IG1h a2VfbWVtb3J5X25vZGUoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgZHRfZHByaW50 aygiICBCYW5rICVkOiAlIyJQUkl4NjQiLT4lIyJQUkl4NjQiXG4iLAogICAgICAgICAgICAgICAg ICAgIGksIHN0YXJ0LCBzdGFydCArIHNpemUpOwogCi0gICAgICAgIGR0X2NoaWxkX3NldF9yYW5n ZSgmY2VsbHMsIHBhcmVudCwgc3RhcnQsIHNpemUpOworICAgICAgICBkdF9jaGlsZF9zZXRfcmFu Z2UoJmNlbGxzLCBhZGRyY2VsbHMsIHNpemVjZWxscywgc3RhcnQsIHNpemUpOwogICAgIH0KIAog ICAgIHJlcyA9IGZkdF9wcm9wZXJ0eShmZHQsICJyZWciLCByZWcsIHNpemVvZihyZWcpKTsKQEAg LTYwNCw3ICs2MDQsNyBAQCBzdGF0aWMgdm9pZCBldnRjaG5fYWxsb2NhdGUoc3RydWN0IGRvbWFp biAqZCk7CiAKIHN0YXRpYyBpbnQgbWFrZV9oeXBlcnZpc29yX25vZGUoc3RydWN0IGRvbWFpbiAq ZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGtlcm5lbF9p bmZvICpraW5mbywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0 IGR0X2RldmljZV9ub2RlICpwYXJlbnQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCBhZGRyY2VsbHMsIGludCBzaXplY2VsbHMpCiB7CiAgICAgY29uc3QgY2hhciBjb21wYXRb XSA9CiAgICAgICAgICJ4ZW4seGVuLSJfX3N0cmluZ2lmeShYRU5fVkVSU0lPTikiLiJfX3N0cmlu Z2lmeShYRU5fU1VCVkVSU0lPTikiXDAiCkBAIC02MTMsOSArNjEzLDYgQEAgc3RhdGljIGludCBt YWtlX2h5cGVydmlzb3Jfbm9kZShzdHJ1Y3QgZG9tYWluICpkLAogICAgIGdpY19pbnRlcnJ1cHRf dCBpbnRyOwogICAgIF9fYmUzMiAqY2VsbHM7CiAgICAgaW50IHJlczsKLSAgICAvKiBDb252ZW5p ZW5jZSBhbGlhcyAqLwotICAgIGludCBhZGRyY2VsbHMgPSBkdF9jaGlsZF9uX2FkZHJfY2VsbHMo cGFyZW50KTsKLSAgICBpbnQgc2l6ZWNlbGxzID0gZHRfY2hpbGRfbl9zaXplX2NlbGxzKHBhcmVu dCk7CiAgICAgdm9pZCAqZmR0ID0ga2luZm8tPmZkdDsKIAogICAgIGR0X2RwcmludGsoIkNyZWF0 ZSBoeXBlcnZpc29yIG5vZGVcbiIpOwpAQCAtNjQwLDE5ICs2MzcsMTQgQEAgc3RhdGljIGludCBt YWtlX2h5cGVydmlzb3Jfbm9kZShzdHJ1Y3QgZG9tYWluICpkLAogCiAgICAgLyogcmVnIDAgaXMg Z3JhbnQgdGFibGUgc3BhY2UgKi8KICAgICBjZWxscyA9ICZyZWdbMF07Ci0gICAgZHRfY2hpbGRf c2V0X3JhbmdlKCZjZWxscywgcGFyZW50LCBraW5mby0+Z250dGFiX3N0YXJ0LCBraW5mby0+Z250 dGFiX3NpemUpOworICAgIGR0X2NoaWxkX3NldF9yYW5nZSgmY2VsbHMsIGFkZHJjZWxscywgc2l6 ZWNlbGxzLAorICAgICAgICAgICAgICAgICAgICAgICBraW5mby0+Z250dGFiX3N0YXJ0LCBraW5m by0+Z250dGFiX3NpemUpOwogICAgIHJlcyA9IGZkdF9wcm9wZXJ0eShmZHQsICJyZWciLCByZWcs CiAgICAgICAgICAgICAgICAgICAgICAgIGR0X2NlbGxzX3RvX3NpemUoYWRkcmNlbGxzICsgc2l6 ZWNlbGxzKSk7CiAgICAgaWYgKCByZXMgKQogICAgICAgICByZXR1cm4gcmVzOwogCiAgICAgLyoK LSAgICAgKiBJdCBpcyBzYWZlIHRvIGFsbG9jYXRlIHRoZSBldmVudCBjaGFubmVsIGhlcmUgYmVj YXVzZSBhbGwgdGhlCi0gICAgICogUFBJcyB1c2VkIGJ5IHRoZSBoYXJkd2FyZSBkb21haW4gaGF2 ZSBiZWVuIHJlZ2lzdGVyZWQuCi0gICAgICovCi0gICAgZXZ0Y2huX2FsbG9jYXRlKGQpOwotCi0g ICAgLyoKICAgICAgKiBJbnRlcnJ1cHQgZXZlbnQgY2hhbm5lbCB1cGNhbGw6CiAgICAgICogIC0g QWN0aXZlLWxvdyBsZXZlbC1zZW5zaXRpdmUKICAgICAgKiAgLSBBbGwgQ1BVcwpAQCAtMTMxNywx MSArMTMwOSwyMyBAQCBzdGF0aWMgaW50IGhhbmRsZV9ub2RlKHN0cnVjdCBkb21haW4gKmQsIHN0 cnVjdCBrZXJuZWxfaW5mbyAqa2luZm8sCiAKICAgICBpZiAoIG5vZGUgPT0gZHRfaG9zdCApCiAg ICAgeworICAgICAgICBpbnQgYWRkcmNlbGxzID0gZHRfY2hpbGRfbl9hZGRyX2NlbGxzKG5vZGUp OworICAgICAgICBpbnQgc2l6ZWNlbGxzID0gZHRfY2hpbGRfbl9zaXplX2NlbGxzKG5vZGUpOwor CisKKyAgICAgICAgLyoKKyAgICAgICAgICogICAgICAqIEl0IGlzIHNhZmUgdG8gYWxsb2NhdGUg dGhlIGV2ZW50IGNoYW5uZWwgaGVyZQorICAgICAgICAgKiAgICAgIGJlY2F1c2UgYWxsIHRoZQor ICAgICAgICAgKiAgICAgICAgICAgKiBQUElzIHVzZWQgYnkgdGhlIGhhcmR3YXJlIGRvbWFpbiBo YXZlIGJlZW4KKyAgICAgICAgICogICAgICAgICAgIHJlZ2lzdGVyZWQuCisgICAgICAgICAqICAg ICAgICAgICAgICAgICovCisgICAgICAgIGV2dGNobl9hbGxvY2F0ZShkKTsKKwogICAgICAgICAv KgogICAgICAgICAgKiBUaGUgaHlwZXJ2aXNvciBub2RlIHNob3VsZCBhbHdheXMgYmUgY3JlYXRl ZCBhZnRlciBhbGwgbm9kZXMKICAgICAgICAgICogZnJvbSB0aGUgaG9zdCBEVCBoYXZlIGJlZW4g cGFyc2VkLgogICAgICAgICAgKi8KLSAgICAgICAgcmVzID0gbWFrZV9oeXBlcnZpc29yX25vZGUo ZCwga2luZm8sIG5vZGUpOworICAgICAgICByZXMgPSBtYWtlX2h5cGVydmlzb3Jfbm9kZShkLCBr aW5mbywgYWRkcmNlbGxzLCBzaXplY2VsbHMpOwogICAgICAgICBpZiAoIHJlcyApCiAgICAgICAg ICAgICByZXR1cm4gcmVzOwogCkBAIC0xMzMzLDcgKzEzMzcsNyBAQCBzdGF0aWMgaW50IGhhbmRs ZV9ub2RlKHN0cnVjdCBkb21haW4gKmQsIHN0cnVjdCBrZXJuZWxfaW5mbyAqa2luZm8sCiAgICAg ICAgIGlmICggcmVzICkKICAgICAgICAgICAgIHJldHVybiByZXM7CiAKLSAgICAgICAgcmVzID0g bWFrZV9tZW1vcnlfbm9kZShkLCBraW5mby0+ZmR0LCBub2RlLCBraW5mbyk7CisgICAgICAgIHJl cyA9IG1ha2VfbWVtb3J5X25vZGUoZCwga2luZm8tPmZkdCwgYWRkcmNlbGxzLCBzaXplY2VsbHMs IGtpbmZvKTsKICAgICAgICAgaWYgKCByZXMgKQogICAgICAgICAgICAgcmV0dXJuIHJlczsKIApk aWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9kZXZpY2VfdHJlZS5jIGIveGVuL2NvbW1vbi9kZXZpY2Vf dHJlZS5jCmluZGV4IDdiMDA5ZWEuLjhmYzQwMWQgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vZGV2 aWNlX3RyZWUuYworKysgYi94ZW4vY29tbW9uL2RldmljZV90cmVlLmMKQEAgLTExMiwxMSArMTEy LDExIEBAIHZvaWQgZHRfc2V0X3JhbmdlKF9fYmUzMiAqKmNlbGxwLCBjb25zdCBzdHJ1Y3QgZHRf ZGV2aWNlX25vZGUgKm5wLAogICAgIGR0X3NldF9jZWxsKGNlbGxwLCBkdF9uX3NpemVfY2VsbHMo bnApLCBzaXplKTsKIH0KIAotdm9pZCBkdF9jaGlsZF9zZXRfcmFuZ2UoX19iZTMyICoqY2VsbHAs IGNvbnN0IHN0cnVjdCBkdF9kZXZpY2Vfbm9kZSAqcGFyZW50LAordm9pZCBkdF9jaGlsZF9zZXRf cmFuZ2UoX19iZTMyICoqY2VsbHAsIGludCBhZGRyY2VsbHMsIGludCBzaXplY2VsbHMsCiAgICAg ICAgICAgICAgICAgICAgICAgICB1NjQgYWRkcmVzcywgdTY0IHNpemUpCiB7Ci0gICAgZHRfc2V0 X2NlbGwoY2VsbHAsIGR0X2NoaWxkX25fYWRkcl9jZWxscyhwYXJlbnQpLCBhZGRyZXNzKTsKLSAg ICBkdF9zZXRfY2VsbChjZWxscCwgZHRfY2hpbGRfbl9zaXplX2NlbGxzKHBhcmVudCksIHNpemUp OworICAgIGR0X3NldF9jZWxsKGNlbGxwLCBhZGRyY2VsbHMsIGFkZHJlc3MpOworICAgIGR0X3Nl dF9jZWxsKGNlbGxwLCBzaXplY2VsbHMsIHNpemUpOwogfQogCiBzdGF0aWMgdm9pZCBfX2luaXQg KnVuZmxhdHRlbl9kdF9hbGxvYyh1bnNpZ25lZCBsb25nICptZW0sIHVuc2lnbmVkIGxvbmcgc2l6 ZSwKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3hlbi9kZXZpY2VfdHJlZS5oIGIveGVuL2luY2x1 ZGUveGVuL2RldmljZV90cmVlLmgKaW5kZXggNjM4YjkyNi4uOTFmYTBiNiAxMDA2NDQKLS0tIGEv eGVuL2luY2x1ZGUveGVuL2RldmljZV90cmVlLmgKKysrIGIveGVuL2luY2x1ZGUveGVuL2Rldmlj ZV90cmVlLmgKQEAgLTY3NCw3ICs2NzQsNyBAQCB2b2lkIGR0X3NldF9yYW5nZShfX2JlMzIgKipj ZWxscCwgY29uc3Qgc3RydWN0IGR0X2RldmljZV9ub2RlICpucCwKICAqIFdyaXRlIGEgcmFuZ2Ug aW50byBhIHNlcmllcyBvZiBjZWxscyBhbmQgdXBkYXRlIGNlbGxwIHRvIHBvaW50IHRvIHRoZQog ICogY2VsbCBqdXN0IGFmdGVyLgogICovCi12b2lkIGR0X2NoaWxkX3NldF9yYW5nZShfX2JlMzIg KipjZWxscCwgY29uc3Qgc3RydWN0IGR0X2RldmljZV9ub2RlICpwYXJlbnQsCit2b2lkIGR0X2No aWxkX3NldF9yYW5nZShfX2JlMzIgKipjZWxscCwgaW50IGFkZHJjZWxscywgaW50IHNpemVjZWxs cywKICAgICAgICAgICAgICAgICAgICAgICAgIHU2NCBhZGRyZXNzLCB1NjQgc2l6ZSk7CiAKIC8q KgotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs