From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fu Wei Subject: Re: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support Date: Tue, 14 Jul 2015 21:09:40 +0800 Message-ID: References: <=fu.wei@linaro.org> <1436777640-31871-1-git-send-email-fu.wei@linaro.org> <1436777640-31871-3-git-send-email-fu.wei@linaro.org> <20150714065317.36dc83aa@opensuse.site> Reply-To: The development of GNU GRUB Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150714065317.36dc83aa@opensuse.site> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: grub-devel-bounces+gcbgd-grub-devel=m.gmane.org@gnu.org Sender: grub-devel-bounces+gcbgd-grub-devel=m.gmane.org@gnu.org To: Andrei Borzenkov Cc: The development of GNU GRUB , xen-devel@lists.xensource.com, Ian Campbell , Stefano Stabellini , Vladimir Serbinenko , Leif Lindholm , Ryan Harkin , Linaro UEFI Mailman List , Jon Masters List-Id: xen-devel@lists.xenproject.org SGkgQW5kcmVpLAoKR3JlYXQgdGhhbmtzIGZvciB5b3VyIHJldmlldy4KClNvIEFyZSB5b3Ugc3Vn Z2VzdGluZyB0aGlzOgooMSkgaW4gdXRpbC9ncnViLmQvMjBfbGludXhfeGVuLmluLCB3ZSBvbmx5 IHVzZSB4ZW5faHlwZXJ2aXNvci94ZW5fbW9kdWxlLgooMikgaW4geGVuX2Jvb3QuYywgd2Ugb25s eSByZWdpc3RlciBjb21tYW5kIHhlbl9oeXBlcnZpc29yL3hlbl9tb2R1bGUuCigzKSBpbiBncnVi LWNvcmUvbG9hZGVyL2kzODYveGVuLmMsIHdlICphZGQqCi0tLS0tLS0tLS0tLS0tLQogIGNtZF94 ZW5faHlwZXJ2aXNvcnQgPSBncnViX3JlZ2lzdGVyX2NvbW1hbmQgKCJ4ZW5faHlwZXJ2aXNvciIs IGdydWJfY21kX3hlbiwKMCwgTl8oIkxvYWQgTGludXguIikpOwogIGNtZF94ZW5fbW9kdWxlID0g Z3J1Yl9yZWdpc3Rlcl9jb21tYW5kICgieGVuX21vZHVsZSIsIGdydWJfY21kX21vZHVsZSwKICAg ICAwLCBOXygiTG9hZCBtb2R1bGUuIikpOwotLS0tLS0tLS0tLS0tLS0KKDQpaW4gZ3J1Yi1jb3Jl L2xvYWRlci9tdWx0aWJvb3QuYywgd2UgKmFkZCoKLS0tLS0tLS0tLS0tLS0tCiNpZiBkZWZpbmVk IChfX2kzODZfXykgfHwgZGVmaW5lZCAoX19hYXJjaDY0X18pCiAgY21kX3hlbl9oeXBlcnZpc29y dCA9CiAgICBncnViX3JlZ2lzdGVyX2NvbW1hbmQgKCJ4ZW5faHlwZXJ2aXNvciIsIGdydWJfY21k X211bHRpYm9vdCwKICAwLCBOXygiTG9hZCBhIG11bHRpYm9vdCBrZXJuZWwuIikpOwogIGNtZF94 ZW5fbW9kdWxlID0KICAgIGdydWJfcmVnaXN0ZXJfY29tbWFuZCAoInhlbl9tb2R1bGUiLCBncnVi X2NtZF9tb2R1bGUsCiAgMCwgTl8oIkxvYWQgYSBtdWx0aWJvb3QgbW9kdWxlLiIpKTsKI2VuZGlm Ci0tLS0tLS0tLS0tLS0tLQoKQlRXLCBmcm9tIHRoZSBzb3VyY2UgY29kZSwgTUlQUyBpc24ndCBz dXBwb3J0ZWQgYnkgbXVsdGlib290LCAgSVMKc3VwcG9ydGVkIGJ5IG11bHRpYm9vdDIuCgpQbGVh c2UgY29ycmVjdCBtZS4gSWYgSSBtaXN1bmRlcnN0YW5kIHlvdXIgc3VnZ2VzdGlvbi4gOi0pCgpU aGFua3MgYWdhaW4hCgoKT24gMTQgSnVseSAyMDE1IGF0IDExOjUzLCBBbmRyZWkgQm9yemVua292 IDxhcnZpZGphYXJAZ21haWwuY29tPiB3cm90ZToKPiDQkiBNb24sIDEzIEp1bCAyMDE1IDE2OjUz OjU5ICswODAwCj4gZnUud2VpQGxpbmFyby5vcmcg0L/QuNGI0LXRgjoKPgo+PiBGcm9tOiBGdSBX ZWkgPGZ1LndlaUBsaW5hcm8ub3JnPgo+Pgo+PiBUaGlzIHBhdGNoIGFkZHMgdGhlIHN1cHBvcnQg b2YgYm9vdCBjb21tYW5kIG9uIGFybTY0IGZvciBYRU46Cj4+ICAgICB4ZW5faHlwZXJ2aXNvcgo+ PiAgICAgeGVuX21vZHVsZQo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBGdSBXZWkgPGZ1LndlaUBsaW5h cm8ub3JnPgo+PiAtLS0KPj4gIHV0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbiB8IDE0ICsrKysr KysrKysrLS0tCj4+ICAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL3V0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbiBiL3V0 aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbgo+PiBpbmRleCBmNTMyZmI5Li5iNTJjNTBkIDEwMDY0 NAo+PiAtLS0gYS91dGlsL2dydWIuZC8yMF9saW51eF94ZW4uaW4KPj4gKysrIGIvdXRpbC9ncnVi LmQvMjBfbGludXhfeGVuLmluCj4+IEBAIC0xMjAsMTYgKzEyMCwxNiBAQCBsaW51eF9lbnRyeSAo KQo+PiAgICAgICAgICBlbHNlCj4+ICAgICAgICAgICAgICB4ZW5fcm1fb3B0cz0ibm8tcmVhbC1t b2RlIGVkZD1vZmYiCj4+ICAgICAgICAgIGZpCj4+IC0gICAgIG11bHRpYm9vdCAgICAgICAke3Jl bF94ZW5fZGlybmFtZX0vJHt4ZW5fYmFzZW5hbWV9IHBsYWNlaG9sZGVyICR7eGVuX2FyZ3N9IFwk e3hlbl9ybV9vcHRzfQo+PiArICAgICAke211bHRpYm9vdF9jbWR9ICAgICAgICAke3JlbF94ZW5f ZGlybmFtZX0vJHt4ZW5fYmFzZW5hbWV9IHBsYWNlaG9sZGVyICR7eGVuX2FyZ3N9IFwke3hlbl9y bV9vcHRzfQo+PiAgICAgICBlY2hvICAgICckKGVjaG8gIiRsbWVzc2FnZSIgfCBncnViX3F1b3Rl KScKPj4gLSAgICAgbW9kdWxlICAke3JlbF9kaXJuYW1lfS8ke2Jhc2VuYW1lfSBwbGFjZWhvbGRl ciByb290PSR7bGludXhfcm9vdF9kZXZpY2VfdGhpc3ZlcnNpb259IHJvICR7YXJnc30KPj4gKyAg ICAgJHttb2R1bGVfY21kfSAgICR7cmVsX2Rpcm5hbWV9LyR7YmFzZW5hbWV9IHBsYWNlaG9sZGVy IHJvb3Q9JHtsaW51eF9yb290X2RldmljZV90aGlzdmVyc2lvbn0gcm8gJHthcmdzfQo+PiAgRU9G Cj4+ICAgIGlmIHRlc3QgLW4gIiR7aW5pdHJkfSIgOyB0aGVuCj4+ICAgICAgIyBUUkFOU0xBVE9S UzogcmFtZGlzayBpc24ndCBpZGVudGlmaWVyLiBTaG91bGQgYmUgdHJhbnNsYXRlZC4KPj4gICAg ICBtZXNzYWdlPSIkKGdldHRleHRfcHJpbnRmICJMb2FkaW5nIGluaXRpYWwgcmFtZGlzayAuLi4i KSIKPj4gICAgICBzZWQgInMvXi8kc3VibWVudV9pbmRlbnRhdGlvbi8iIDw8IEVPRgo+PiAgICAg ICBlY2hvICAgICckKGVjaG8gIiRtZXNzYWdlIiB8IGdydWJfcXVvdGUpJwo+PiAtICAgICBtb2R1 bGUgIC0tbm91bnppcCAgICR7cmVsX2Rpcm5hbWV9LyR7aW5pdHJkfQo+PiArICAgICAke21vZHVs ZV9jbWR9ICAgLS1ub3VuemlwICAgJHtyZWxfZGlybmFtZX0vJHtpbml0cmR9Cj4+ICBFT0YKPj4g ICAgZmkKPj4gICAgc2VkICJzL14vJHN1Ym1lbnVfaW5kZW50YXRpb24vIiA8PCBFT0YKPj4gQEAg LTE4NSw2ICsxODUsMTQgQEAgY2FzZSAiJG1hY2hpbmUiIGluCj4+ICAgICAgKikgR0VOS0VSTkVM X0FSQ0g9IiRtYWNoaW5lIiA7Owo+PiAgZXNhYwo+Pgo+PiAraWYgWyAieCRtYWNoaW5lIiAhPSB4 YWFyY2g2NCBdOyB0aGVuCj4+ICsgICAgIG11bHRpYm9vdF9jbWQ9Im11bHRpYm9vdCIKPj4gKyAg ICAgbW9kdWxlX2NtZD0ibW9kdWxlIgo+PiArZWxzZQo+PiArICAgICBtdWx0aWJvb3RfY21kPSJ4 ZW5faHlwZXJ2aXNvciIKPj4gKyAgICAgbW9kdWxlX2NtZD0ieGVuX21vZHVsZSIKPj4gK2ZpCj4+ ICsKPgo+IFN0cmljdGx5IHNwZWFraW5nLCB0aGlzIGlzIGJvb3QtdGltZSBkZWNpc2lvbi4gQXMg bWVudGlvbmVkIGJ5Cj4gVmxhZGltaXIsIGJldHRlciB3b3VsZCBiZSB0byBwcm92aWRlIGFsaWFz IHhlbl9oeXBlcnZpc29yIGFuZAo+IHhlbl9tb2R1bGUgaW4gbXVsdGlib290IGZvciBwbGF0Zm9y bXMgc3VwcG9ydGluZyBYZW4gKGlzIE1JUFMgcmVhbGx5Cj4gc3VwcG9ydGVkPykgYW5kIHVzZSBp dCBjb25zaXN0ZW50bHkuCj4KPj4gICMgRXh0cmEgaW5kZW50YXRpb24gdG8gYWRkIHRvIG1lbnUg ZW50cmllcyBpbiBhIHN1Ym1lbnUuIFdlJ3JlIG5vdCBpbiBhIHN1Ym1lbnUKPj4gICMgeWV0LCBz byBpdCdzIGVtcHR5LiBJbiBhIHN1Ym1lbnUgaXQgd2lsbCBiZSBlcXVhbCB0byAnXHQnIChvbmUg dGFiKS4KPj4gIHN1Ym1lbnVfaW5kZW50YXRpb249IiIKPgoKCgotLSAKQmVzdCByZWdhcmRzLAoK RnUgV2VpClNvZnR3YXJlIEVuZ2luZWVyClJlZCBIYXQgU29mdHdhcmUgKEJlaWppbmcpIENvLixM dGQuU2hhbmdoYWkgQnJhbmNoClBoOiArODYgMjEgNjEyMjEzMjYoZGlyZWN0KQpQaDogKzg2IDE4 NiAyMDIwIDQ2ODQgKG1vYmlsZSkKUm9vbSAxNTEyLCBSZWd1cyBPbmUgQ29ycG9yYXRlIEF2ZW51 ZSxMZXZlbCAxNSwKT25lIENvcnBvcmF0ZSBBdmVudWUsMjIyIEh1YmluIFJvYWQsSHVhbmdwdSBE aXN0cmljdCwKU2hhbmdoYWksQ2hpbmEgMjAwMDIxCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpHcnViLWRldmVsIG1haWxpbmcgbGlzdApHcnViLWRldmVs QGdudS5vcmcKaHR0cHM6Ly9saXN0cy5nbnUub3JnL21haWxtYW4vbGlzdGluZm8vZ3J1Yi1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZEzy2-0006vq-QC for mharc-grub-devel@gnu.org; Tue, 14 Jul 2015 09:09:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEzxz-0006vT-8D for grub-devel@gnu.org; Tue, 14 Jul 2015 09:09:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEzxt-0000K9-C5 for grub-devel@gnu.org; Tue, 14 Jul 2015 09:09:47 -0400 Received: from mail-oi0-f43.google.com ([209.85.218.43]:34838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEzxt-0000Jb-6i for grub-devel@gnu.org; Tue, 14 Jul 2015 09:09:41 -0400 Received: by oihq81 with SMTP id q81so5921082oih.2 for ; Tue, 14 Jul 2015 06:09:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=FMD3EHA86ryiaBcCQUMObF+uRLU4/cw8SCzH1Fhp0S0=; b=jx/rLWtCNqM/nPUzaIJgs91HwiwLSRGWSF+3TPiKD+XjhMGZ+Knfoz24Dn2BloNTHC iU4tMlWPaTONQRtwFkIsmG5+nEcS96wKbwJquSNcTru+O3bnMoIgqjoQKifpOaCYQWBg agh75MwsTn8e3spbvOIJZnIs+6fAFjvrfrw56zCsUBsCG0NBK4ElxpdN7PmvWSoggcwB c43LN1UnKZAzuRXsnR+wsxy/l4nz5hHeclv9WLX0kz2+k2IDEGMv+mXvt/czF88XDsOR qVMJTPtYvouYtKKO7kIbPQlbnSKVm0b2dh/rT1vqKI8QIOHHAsaOEVEJ3wyZkTyGpg6g FLQw== X-Gm-Message-State: ALoCoQmHFg+LuU5NhJQDlOifrctgjg3XJe4W3emPtRxuLR7JDOwddxyfQGtuMN5U8D2mM0MgeUq5 MIME-Version: 1.0 X-Received: by 10.182.129.19 with SMTP id ns19mr34432938obb.3.1436879380568; Tue, 14 Jul 2015 06:09:40 -0700 (PDT) Received: by 10.202.3.198 with HTTP; Tue, 14 Jul 2015 06:09:40 -0700 (PDT) In-Reply-To: <20150714065317.36dc83aa@opensuse.site> References: <=fu.wei@linaro.org> <1436777640-31871-1-git-send-email-fu.wei@linaro.org> <1436777640-31871-3-git-send-email-fu.wei@linaro.org> <20150714065317.36dc83aa@opensuse.site> Date: Tue, 14 Jul 2015 21:09:40 +0800 Message-ID: Subject: Re: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support From: Fu Wei To: Andrei Borzenkov Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.218.43 Cc: The development of GNU GRUB , xen-devel@lists.xensource.com, Ian Campbell , Stefano Stabellini , Vladimir Serbinenko , Leif Lindholm , Ryan Harkin , Linaro UEFI Mailman List , Jon Masters X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2015 13:09:48 -0000 Hi Andrei, Great thanks for your review. So Are you suggesting this: (1) in util/grub.d/20_linux_xen.in, we only use xen_hypervisor/xen_module. (2) in xen_boot.c, we only register command xen_hypervisor/xen_module. (3) in grub-core/loader/i386/xen.c, we *add* --------------- cmd_xen_hypervisort =3D grub_register_command ("xen_hypervisor", grub_cmd= _xen, 0, N_("Load Linux.")); cmd_xen_module =3D grub_register_command ("xen_module", grub_cmd_module, 0, N_("Load module.")); --------------- (4)in grub-core/loader/multiboot.c, we *add* --------------- #if defined (__i386__) || defined (__aarch64__) cmd_xen_hypervisort =3D grub_register_command ("xen_hypervisor", grub_cmd_multiboot, 0, N_("Load a multiboot kernel.")); cmd_xen_module =3D grub_register_command ("xen_module", grub_cmd_module, 0, N_("Load a multiboot module.")); #endif --------------- BTW, from the source code, MIPS isn't supported by multiboot, IS supported by multiboot2. Please correct me. If I misunderstand your suggestion. :-) Thanks again! On 14 July 2015 at 11:53, Andrei Borzenkov wrote: > =D0=92 Mon, 13 Jul 2015 16:53:59 +0800 > fu.wei@linaro.org =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > >> From: Fu Wei >> >> This patch adds the support of boot command on arm64 for XEN: >> xen_hypervisor >> xen_module >> >> Signed-off-by: Fu Wei >> --- >> util/grub.d/20_linux_xen.in | 14 +++++++++++--- >> 1 file changed, 11 insertions(+), 3 deletions(-) >> >> diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in >> index f532fb9..b52c50d 100644 >> --- a/util/grub.d/20_linux_xen.in >> +++ b/util/grub.d/20_linux_xen.in >> @@ -120,16 +120,16 @@ linux_entry () >> else >> xen_rm_opts=3D"no-real-mode edd=3Doff" >> fi >> - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${x= en_args} \${xen_rm_opts} >> + ${multiboot_cmd} ${rel_xen_dirname}/${xen_basename} placeho= lder ${xen_args} \${xen_rm_opts} >> echo '$(echo "$lmessage" | grub_quote)' >> - module ${rel_dirname}/${basename} placeholder root=3D${linux_root= _device_thisversion} ro ${args} >> + ${module_cmd} ${rel_dirname}/${basename} placeholder root=3D${li= nux_root_device_thisversion} ro ${args} >> EOF >> if test -n "${initrd}" ; then >> # TRANSLATORS: ramdisk isn't identifier. Should be translated. >> message=3D"$(gettext_printf "Loading initial ramdisk ...")" >> sed "s/^/$submenu_indentation/" << EOF >> echo '$(echo "$message" | grub_quote)' >> - module --nounzip ${rel_dirname}/${initrd} >> + ${module_cmd} --nounzip ${rel_dirname}/${initrd} >> EOF >> fi >> sed "s/^/$submenu_indentation/" << EOF >> @@ -185,6 +185,14 @@ case "$machine" in >> *) GENKERNEL_ARCH=3D"$machine" ;; >> esac >> >> +if [ "x$machine" !=3D xaarch64 ]; then >> + multiboot_cmd=3D"multiboot" >> + module_cmd=3D"module" >> +else >> + multiboot_cmd=3D"xen_hypervisor" >> + module_cmd=3D"xen_module" >> +fi >> + > > Strictly speaking, this is boot-time decision. As mentioned by > Vladimir, better would be to provide alias xen_hypervisor and > xen_module in multiboot for platforms supporting Xen (is MIPS really > supported?) and use it consistently. > >> # Extra indentation to add to menu entries in a submenu. We're not in a= submenu >> # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). >> submenu_indentation=3D"" > --=20 Best regards, Fu Wei Software Engineer Red Hat Software (Beijing) Co.,Ltd.Shanghai Branch Ph: +86 21 61221326(direct) Ph: +86 186 2020 4684 (mobile) Room 1512, Regus One Corporate Avenue,Level 15, One Corporate Avenue,222 Hubin Road,Huangpu District, Shanghai,China 200021