From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v2 09/21] xen/arm: move cmdline out of boot_modules Date: Fri, 6 Jul 2018 16:12:04 -0700 Message-ID: <1530918736-13965-9-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 UmVtb3ZlIHRoZSBjbWRsaW5lIGZpZWxkIGZyb20gc3RydWN0IGJvb3RfbW9kdWxlLCBjbWRsaW5l IGlzIHN0b3JlZAppbmRlcGVuZGVudGx5IG91dCBvZiB0aGUgYm9vdF9tb2R1bGVzIGFycmF5IGFz IGRvbTBfY21kbGluZS4KCkFkZCBhIHBvaW50ZXIgdG8gc3RydWN0IGtlcm5lbF9pbmZvIHRvIHBv aW50IHRvIHRoZSBjbWRsaW5lIGZvciBhIGdpdmVuCmtlcm5lbC4KCmJvb3RfZmR0X2NtZGxpbmUg aXMgb25seSB1c2VkIHRvIHJldHJpZXZlIHRoZSBYZW4gY21kbGluZS4gUmVtb3ZlIHRoZQpjb2Rl IHRvIHJldHVybiB0aGUgZG9tMCBjbWRsaW5lIHdoZW4gdGhlIFhlbiBjbWRsaW5lIGlzIG5vdCBh dmFpbGFibGUuCgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHN0ZWZhbm9zQHhp bGlueC5jb20+CgotLS0KQ2hhbmdlcyBpbiB2MjoKLSBuZXcgcGF0Y2gKLS0tCiB4ZW4vYXJjaC9h cm0vYm9vdGZkdC5jICAgICAgfCAyNSArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vYXJj aC9hcm0vZG9tYWluX2J1aWxkLmMgfCAxMSArKysrKy0tLS0tLQogeGVuL2FyY2gvYXJtL2tlcm5l bC5oICAgICAgIHwgIDEgKwogeGVuL2FyY2gvYXJtL3NldHVwLmMgICAgICAgIHwgMTAgKysrLS0t LS0tLQogeGVuL2luY2x1ZGUvYXNtLWFybS9zZXR1cC5oIHwgIDUgKystLS0KIDUgZmlsZXMgY2hh bmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVu L2FyY2gvYXJtL2Jvb3RmZHQuYyBiL3hlbi9hcmNoL2FybS9ib290ZmR0LmMKaW5kZXggOGViYTQy Yy4uYjNlMWUwMCAxMDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL2Jvb3RmZHQuYworKysgYi94ZW4v YXJjaC9hcm0vYm9vdGZkdC5jCkBAIC0yMjYsMTEgKzIyNiwxMCBAQCBzdGF0aWMgdm9pZCBfX2lu aXQgcHJvY2Vzc19tdWx0aWJvb3Rfbm9kZShjb25zdCB2b2lkICpmZHQsIGludCBub2RlLAogICAg ICAgICBpZiAoIGxlbiA+IEJPT1RNT0RfTUFYX0NNRExJTkUgKQogICAgICAgICAgICAgcGFuaWMo Im1vZHVsZSAlcyBjb21tYW5kIGxpbmUgdG9vIGxvbmdcbiIsIG5hbWUpOwogICAgICAgICBjbWRs aW5lID0gcHJvcC0+ZGF0YTsKKyAgICAgICAgc2FmZV9zdHJjcHkoZG9tMF9jbWRsaW5lLCBjbWRs aW5lKTsKICAgICB9Ci0gICAgZWxzZQotICAgICAgICBjbWRsaW5lID0gTlVMTDsKLQotICAgIGFk ZF9ib290X21vZHVsZShraW5kLCBzdGFydCwgc2l6ZSwgY21kbGluZSk7CisgCisgICAgYWRkX2Jv b3RfbW9kdWxlKGtpbmQsIHN0YXJ0LCBzaXplKTsKIH0KIAogc3RhdGljIHZvaWQgX19pbml0IHBy b2Nlc3NfY2hvc2VuX25vZGUoY29uc3Qgdm9pZCAqZmR0LCBpbnQgbm9kZSwKQEAgLTI3Niw3ICsy NzUsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgcHJvY2Vzc19jaG9zZW5fbm9kZShjb25zdCB2b2lk ICpmZHQsIGludCBub2RlLAogCiAgICAgcHJpbnRrKCJJbml0cmQgJSJQUklwYWRkciItJSJQUklw YWRkciJcbiIsIHN0YXJ0LCBlbmQpOwogCi0gICAgYWRkX2Jvb3RfbW9kdWxlKEJPT1RNT0RfUkFN RElTSywgc3RhcnQsIGVuZC1zdGFydCwgTlVMTCk7CisgICAgYWRkX2Jvb3RfbW9kdWxlKEJPT1RN T0RfUkFNRElTSywgc3RhcnQsIGVuZC1zdGFydCk7CiB9CiAKIHN0YXRpYyBpbnQgX19pbml0IGVh cmx5X3NjYW5fbm9kZShjb25zdCB2b2lkICpmZHQsCkBAIC0zMDcsMTIgKzMwNiwxMSBAQCBzdGF0 aWMgdm9pZCBfX2luaXQgZWFybHlfcHJpbnRfaW5mbyh2b2lkKQogICAgICAgICAgICAgICAgICAg ICAgbWktPmJhbmtbaV0uc3RhcnQgKyBtaS0+YmFua1tpXS5zaXplIC0gMSk7CiAgICAgcHJpbnRr KCJcbiIpOwogICAgIGZvciAoIGkgPSAwIDsgaSA8IG1vZHMtPm5yX21vZHM7IGkrKyApCi0gICAg ICAgIHByaW50aygiTU9EVUxFWyVkXTogJSJQUklwYWRkciIgLSAlIlBSSXBhZGRyIiAlLTEycyAl c1xuIiwKKyAgICAgICAgcHJpbnRrKCJNT0RVTEVbJWRdOiAlIlBSSXBhZGRyIiAtICUiUFJJcGFk ZHIiICUtMTJzXG4iLAogICAgICAgICAgICAgICAgICAgICAgaSwKICAgICAgICAgICAgICAgICAg ICAgIG1vZHMtPm1vZHVsZVtpXS5zdGFydCwKICAgICAgICAgICAgICAgICAgICAgIG1vZHMtPm1v ZHVsZVtpXS5zdGFydCArIG1vZHMtPm1vZHVsZVtpXS5zaXplLAotICAgICAgICAgICAgICAgICAg ICAgYm9vdF9tb2R1bGVfa2luZF9hc19zdHJpbmcobW9kcy0+bW9kdWxlW2ldLmtpbmQpLAotICAg ICAgICAgICAgICAgICAgICAgbW9kcy0+bW9kdWxlW2ldLmNtZGxpbmUpOworICAgICAgICAgICAg ICAgICAgICAgYm9vdF9tb2R1bGVfa2luZF9hc19zdHJpbmcobW9kcy0+bW9kdWxlW2ldLmtpbmQp KTsKICAgICBucl9yc3ZkID0gZmR0X251bV9tZW1fcnN2KGRldmljZV90cmVlX2ZsYXR0ZW5lZCk7 CiAgICAgZm9yICggaSA9IDA7IGkgPCBucl9yc3ZkOyBpKysgKQogICAgIHsKQEAgLTM0MSw3ICsz MzksNyBAQCBzaXplX3QgX19pbml0IGJvb3RfZmR0X2luZm8oY29uc3Qgdm9pZCAqZmR0LCBwYWRk cl90IHBhZGRyKQogICAgIGlmICggcmV0IDwgMCApCiAgICAgICAgIHBhbmljKCJObyB2YWxpZCBk ZXZpY2UgdHJlZVxuIik7CiAKLSAgICBhZGRfYm9vdF9tb2R1bGUoQk9PVE1PRF9GRFQsIHBhZGRy LCBmZHRfdG90YWxzaXplKGZkdCksIE5VTEwpOworICAgIGFkZF9ib290X21vZHVsZShCT09UTU9E X0ZEVCwgcGFkZHIsIGZkdF90b3RhbHNpemUoZmR0KSk7CiAKICAgICBkZXZpY2VfdHJlZV9mb3Jf ZWFjaF9ub2RlKCh2b2lkICopZmR0LCBlYXJseV9zY2FuX25vZGUsIE5VTEwpOwogICAgIGVhcmx5 X3ByaW50X2luZm8oKTsKQEAgLTM2MCwxNSArMzU4LDYgQEAgY29uc3QgY2hhciAqYm9vdF9mZHRf Y21kbGluZShjb25zdCB2b2lkICpmZHQpCiAKICAgICBwcm9wID0gZmR0X2dldF9wcm9wZXJ0eShm ZHQsIG5vZGUsICJ4ZW4seGVuLWJvb3RhcmdzIiwgTlVMTCk7CiAgICAgaWYgKCBwcm9wID09IE5V TEwgKQotICAgIHsKLSAgICAgICAgc3RydWN0IGJvb3Rtb2R1bGUgKmRvbTBfbW9kID0KLSAgICAg ICAgICAgIGJvb3RfbW9kdWxlX2ZpbmRfYnlfa2luZChCT09UTU9EX0tFUk5FTCk7Ci0KLSAgICAg ICAgaWYgKGZkdF9nZXRfcHJvcGVydHkoZmR0LCBub2RlLCAieGVuLGRvbTAtYm9vdGFyZ3MiLCBO VUxMKSB8fAotICAgICAgICAgICAgKCBkb20wX21vZCAmJiBkb20wX21vZC0+Y21kbGluZVswXSAp ICkKLSAgICAgICAgICAgIHByb3AgPSBmZHRfZ2V0X3Byb3BlcnR5KGZkdCwgbm9kZSwgImJvb3Rh cmdzIiwgTlVMTCk7Ci0gICAgfQotICAgIGlmICggcHJvcCA9PSBOVUxMICkKICAgICAgICAgcmV0 dXJuIE5VTEw7CiAKICAgICByZXR1cm4gcHJvcC0+ZGF0YTsKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L2FybS9kb21haW5fYnVpbGQuYyBiL3hlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYwppbmRleCA0 ZDA2NTg0Li5kN2U2NDJiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMK KysrIGIveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jCkBAIC00MDIsMTAgKzQwMiw4IEBAIHN0 YXRpYyBpbnQgd3JpdGVfcHJvcGVydGllcyhzdHJ1Y3QgZG9tYWluICpkLCBzdHJ1Y3Qga2VybmVs X2luZm8gKmtpbmZvLAogICAgIGludCByZXMgPSAwOwogICAgIGludCBoYWRfZG9tMF9ib290YXJn cyA9IDA7CiAKLSAgICBjb25zdCBzdHJ1Y3QgYm9vdG1vZHVsZSAqa2VybmVsID0ga2luZm8tPmtl cm5lbF9ib290bW9kdWxlOwotCi0gICAgaWYgKCBrZXJuZWwgJiYga2VybmVsLT5jbWRsaW5lWzBd ICkKLSAgICAgICAgYm9vdGFyZ3MgPSAma2VybmVsLT5jbWRsaW5lWzBdOworICAgIGlmICggZG9t MF9jbWRsaW5lWzBdICkKKyAgICAgICAgYm9vdGFyZ3MgPSAmZG9tMF9jbWRsaW5lWzBdOwogCiAg ICAgZHRfZm9yX2VhY2hfcHJvcGVydHlfbm9kZSAobm9kZSwgcHJvcCkKICAgICB7CkBAIC05NzEs OSArOTY5LDkgQEAgc3RhdGljIGludCBtYWtlX2Nob3Nlbl9ub2RlKGNvbnN0IHN0cnVjdCBrZXJu ZWxfaW5mbyAqa2luZm8pCiAgICAgaWYgKCByZXMgKQogICAgICAgICByZXR1cm4gcmVzOwogCi0g ICAgaWYgKCBtb2QgJiYgbW9kLT5jbWRsaW5lWzBdICkKKyAgICBpZiAoIGtpbmZvLT5jbWRsaW5l ICYmIGtpbmZvLT5jbWRsaW5lWzBdICkKICAgICB7Ci0gICAgICAgIGJvb3RhcmdzID0gJm1vZC0+ Y21kbGluZVswXTsKKyAgICAgICAgYm9vdGFyZ3MgPSAma2luZm8tPmNtZGxpbmVbMF07CiAgICAg ICAgIHJlcyA9IGZkdF9wcm9wZXJ0eShmZHQsICJib290YXJncyIsIGJvb3RhcmdzLCBzdHJsZW4o Ym9vdGFyZ3MpICsgMSk7CiAgICAgICAgIGlmICggcmVzICkKICAgICAgICAgICAgcmV0dXJuIHJl czsKQEAgLTIxNzMsNiArMjE3MSw3IEBAIGludCBfX2luaXQgY29uc3RydWN0X2RvbTAoc3RydWN0 IGRvbWFpbiAqZCkKIAogI2VuZGlmCiAKKyAgICBraW5mby5jbWRsaW5lID0gJmRvbTBfY21kbGlu ZVswXTsKICAgICBhbGxvY2F0ZV9tZW1vcnkoZCwgJmtpbmZvKTsKICAgICBmaW5kX2dudHRhYl9y ZWdpb24oZCwgJmtpbmZvKTsKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2tlcm5lbC5oIGIv eGVuL2FyY2gvYXJtL2tlcm5lbC5oCmluZGV4IDZkNjk1MDkuLmE0N2FhNGMgMTAwNjQ0Ci0tLSBh L3hlbi9hcmNoL2FybS9rZXJuZWwuaAorKysgYi94ZW4vYXJjaC9hcm0va2VybmVsLmgKQEAgLTMw LDYgKzMwLDcgQEAgc3RydWN0IGtlcm5lbF9pbmZvIHsKIAogICAgIC8qIGJvb3QgYmxvYiBsb2Fk IGFkZHJlc3NlcyAqLwogICAgIGNvbnN0IHN0cnVjdCBib290bW9kdWxlICprZXJuZWxfYm9vdG1v ZHVsZSwgKmluaXRyZF9ib290bW9kdWxlOworICAgIGNvbnN0IGNoYXIqIGNtZGxpbmU7CiAgICAg cGFkZHJfdCBkdGJfcGFkZHI7CiAgICAgcGFkZHJfdCBpbml0cmRfcGFkZHI7CiAKZGlmZiAtLWdp dCBhL3hlbi9hcmNoL2FybS9zZXR1cC5jIGIveGVuL2FyY2gvYXJtL3NldHVwLmMKaW5kZXggMWQ2 ZjZiZi4uMTg4YjJjYiAxMDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL3NldHVwLmMKKysrIGIveGVu L2FyY2gvYXJtL3NldHVwLmMKQEAgLTUxLDYgKzUxLDcgQEAKICNpbmNsdWRlIDxhc20vYWNwaS5o PgogCiBzdHJ1Y3QgYm9vdGluZm8gX19pbml0ZGF0YSBib290aW5mbzsKK2NoYXIgX19pbml0ZGF0 YSBkb20wX2NtZGxpbmVbQk9PVE1PRF9NQVhfQ01ETElORV07CiAKIHN0cnVjdCBjcHVpbmZvX2Fy bSBfX3JlYWRfbW9zdGx5IGJvb3RfY3B1X2RhdGE7CiAKQEAgLTIwMiw4ICsyMDMsNyBAQCB2b2lk IGR0X3VucmVzZXJ2ZWRfcmVnaW9ucyhwYWRkcl90IHMsIHBhZGRyX3QgZSwKIH0KIAogc3RydWN0 IGJvb3Rtb2R1bGUgKmFkZF9ib290X21vZHVsZShib290bW9kdWxlX2tpbmQga2luZCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFkZHJfdCBzdGFydCwgcGFkZHJfdCBzaXpl LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpjbWRsaW5l KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWRkcl90IHN0YXJ0LCBwYWRk cl90IHNpemUpCiB7CiAgICAgc3RydWN0IGJvb3Rtb2R1bGVzICptb2RzID0gJmJvb3RpbmZvLm1v ZHVsZXM7CiAgICAgc3RydWN0IGJvb3Rtb2R1bGUgKm1vZDsKQEAgLTIxOSwxMCArMjE5LDYgQEAg c3RydWN0IGJvb3Rtb2R1bGUgKmFkZF9ib290X21vZHVsZShib290bW9kdWxlX2tpbmQga2luZCwK ICAgICBtb2QtPmtpbmQgPSBraW5kOwogICAgIG1vZC0+c3RhcnQgPSBzdGFydDsKICAgICBtb2Qt PnNpemUgPSBzaXplOwotICAgIGlmICggY21kbGluZSApCi0gICAgICAgIHNhZmVfc3RyY3B5KG1v ZC0+Y21kbGluZSwgY21kbGluZSk7Ci0gICAgZWxzZQotICAgICAgICBtb2QtPmNtZGxpbmVbMF0g PSAwOwogCiAgICAgcmV0dXJuIG1vZDsKIH0KQEAgLTcyNSw3ICs3MjEsNyBAQCB2b2lkIF9faW5p dCBzdGFydF94ZW4odW5zaWduZWQgbG9uZyBib290X3BoeXNfb2Zmc2V0LAogICAgIC8qIFJlZ2lz dGVyIFhlbidzIGxvYWQgYWRkcmVzcyBhcyBhIGJvb3QgbW9kdWxlLiAqLwogICAgIHhlbl9ib290 bW9kdWxlID0gYWRkX2Jvb3RfbW9kdWxlKEJPT1RNT0RfWEVOLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAocGFkZHJfdCkodWludHB0cl90KShfc3RhcnQgKyBib290X3BoeXNfb2Zmc2V0 KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBhZGRyX3QpKHVpbnRwdHJfdCkoX2Vu ZCAtIF9zdGFydCArIDEpLCBOVUxMKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBh ZGRyX3QpKHVpbnRwdHJfdCkoX2VuZCAtIF9zdGFydCArIDEpKTsKICAgICBCVUdfT04oIXhlbl9i b290bW9kdWxlKTsKIAogICAgIHhlbl9wYWRkciA9IGdldF94ZW5fcGFkZHIoKTsKZGlmZiAtLWdp dCBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vc2V0dXAuaCBiL3hlbi9pbmNsdWRlL2FzbS1hcm0vc2V0 dXAuaAppbmRleCBmMWU0YTNmLi42ZDA4ZWI0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20t YXJtL3NldHVwLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLWFybS9zZXR1cC5oCkBAIC0zNSwxMyAr MzUsMTMgQEAgc3RydWN0IGJvb3Rtb2R1bGUgewogICAgIGJvb3Rtb2R1bGVfa2luZCBraW5kOwog ICAgIHBhZGRyX3Qgc3RhcnQ7CiAgICAgcGFkZHJfdCBzaXplOwotICAgIGNoYXIgY21kbGluZVtC T09UTU9EX01BWF9DTURMSU5FXTsKIH07CiAKIHN0cnVjdCBib290bW9kdWxlcyB7CiAgICAgaW50 IG5yX21vZHM7CiAgICAgc3RydWN0IGJvb3Rtb2R1bGUgbW9kdWxlW01BWF9NT0RVTEVTXTsKIH07 CitleHRlcm4gY2hhciBkb20wX2NtZGxpbmVbQk9PVE1PRF9NQVhfQ01ETElORV07CiAKIHN0cnVj dCBib290aW5mbyB7CiAgICAgc3RydWN0IG1lbWluZm8gbWVtOwpAQCAtNzgsOCArNzgsNyBAQCBz aXplX3QgX19pbml0IGJvb3RfZmR0X2luZm8oY29uc3Qgdm9pZCAqZmR0LCBwYWRkcl90IHBhZGRy KTsKIGNvbnN0IGNoYXIgX19pbml0ICpib290X2ZkdF9jbWRsaW5lKGNvbnN0IHZvaWQgKmZkdCk7 CiAKIHN0cnVjdCBib290bW9kdWxlICphZGRfYm9vdF9tb2R1bGUoYm9vdG1vZHVsZV9raW5kIGtp bmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhZGRyX3Qgc3RhcnQsIHBh ZGRyX3Qgc2l6ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hh ciAqY21kbGluZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhZGRyX3Qg c3RhcnQsIHBhZGRyX3Qgc2l6ZSk7CiBzdHJ1Y3QgYm9vdG1vZHVsZSAqYm9vdF9tb2R1bGVfZmlu ZF9ieV9raW5kKGJvb3Rtb2R1bGVfa2luZCBraW5kKTsKIGNvbnN0IGNoYXIgKiBfX2luaXQgYm9v dF9tb2R1bGVfa2luZF9hc19zdHJpbmcoYm9vdG1vZHVsZV9raW5kIGtpbmQpOwogCi0tIAoxLjku MQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1k ZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8v bGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=