From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Shannon Zhao <shannon.zhao@linaro.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Shannon Zhao <zhaoshenglong@huawei.com>,
<linux-arm-kernel@lists.infradead.org>,
<ard.biesheuvel@linaro.org>, <stefano.stabellini@citrix.com>,
<david.vrabel@citrix.com>, <mark.rutland@arm.com>,
<devicetree@vger.kernel.org>, <linux-efi@vger.kernel.org>,
<catalin.marinas@arm.com>, <will.deacon@arm.com>,
<linux-kernel@vger.kernel.org>, <xen-devel@lists.xen.org>,
<julien.grall@citrix.com>, <peter.huangpeng@huawei.com>
Subject: Re: [Xen-devel] [PATCH v2 16/16] ARM64: XEN: Initialize Xen specific UEFI runtime services
Date: Tue, 19 Jan 2016 14:24:53 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1601191424270.9400@kaball.uk.xensource.com> (raw)
In-Reply-To: <569E3654.90100@linaro.org>
On Tue, 19 Jan 2016, Shannon Zhao wrote:
> On 2016/1/19 1:03, Stefano Stabellini wrote:
> > On Fri, 15 Jan 2016, Shannon Zhao wrote:
> > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > >
> > > When running on Xen hypervisor, runtime services are supported through
> > > hypercall. So call Xen specific function to initialize runtime services.
> > >
> > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> >
> > Thanks Shannon, much much better! Just a couple of questions.
> >
> >
> > > arch/arm/xen/enlighten.c | 5 +++++
> > > arch/arm64/xen/Makefile | 1 +
> > > arch/arm64/xen/efi.c | 36 ++++++++++++++++++++++++++++++++++++
> > > drivers/xen/Kconfig | 2 +-
> > > include/xen/xen-ops.h | 1 +
> > > 5 files changed, 44 insertions(+), 1 deletion(-)
> > > create mode 100644 arch/arm64/xen/efi.c
> > >
> > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
> > > index 485e117..84f27ec 100644
> > > --- a/arch/arm/xen/enlighten.c
> > > +++ b/arch/arm/xen/enlighten.c
> > > @@ -414,6 +414,11 @@ static int __init xen_guest_init(void)
> > > if (xen_initial_domain())
> > > pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);
> > >
> > > + if (IS_ENABLED(CONFIG_XEN_EFI)) {
> > > + if (efi_enabled(EFI_PARAVIRT))
> > > + xen_efi_runtime_setup();
> > > + }
> > > +
> > > return 0;
> > > }
> > > early_initcall(xen_guest_init);
> > > diff --git a/arch/arm64/xen/Makefile b/arch/arm64/xen/Makefile
> > > index 74a8d87..62e6fe2 100644
> > > --- a/arch/arm64/xen/Makefile
> > > +++ b/arch/arm64/xen/Makefile
> > > @@ -1,2 +1,3 @@
> > > xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o
> > > mm.o)
> > > obj-y := xen-arm.o hypercall.o
> > > +obj-$(CONFIG_XEN_EFI) += efi.o
> > > diff --git a/arch/arm64/xen/efi.c b/arch/arm64/xen/efi.c
> > > new file mode 100644
> > > index 0000000..33046b0
> > > --- /dev/null
> > > +++ b/arch/arm64/xen/efi.c
> > > @@ -0,0 +1,36 @@
> > > +/*
> > > + * Copyright (c) 2015, Linaro Limited, Shannon Zhao
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License as published by
> > > + * the Free Software Foundation; either version 2 of the License, or
> > > + * (at your option) any later version.
> > > + *
> > > + * This program is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > + * GNU General Public License for more details.
> > > + *
> > > + * You should have received a copy of the GNU General Public License
> > > along
> > > + * with this program. If not, see <http://www.gnu.org/licenses/>.
> > > + */
> > > +
> > > +#include <linux/efi.h>
> > > +#include <xen/xen-ops.h>
> > > +
> > > +void __init xen_efi_runtime_setup(void)
> > > +{
> > > + efi.get_time = xen_efi_get_time;
> > > + efi.set_time = xen_efi_set_time;
> > > + efi.get_wakeup_time = xen_efi_get_wakeup_time;
> > > + efi.set_wakeup_time = xen_efi_set_wakeup_time;
> > > + efi.get_variable = xen_efi_get_variable;
> > > + efi.get_next_variable = xen_efi_get_next_variable;
> > > + efi.set_variable = xen_efi_set_variable;
> > > + efi.query_variable_info = xen_efi_query_variable_info;
> > > + efi.update_capsule = xen_efi_update_capsule;
> > > + efi.query_capsule_caps = xen_efi_query_capsule_caps;
> > > + efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
> > > + efi.reset_system = NULL;
> > > +}
> > > +EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);
> >
> > This looks very similar to struct efi efi_xen previously in
> > drivers/xen/efi.c. Maybe it makes sense to leave struct efi efi_xen in
> > drivers/xen/efi.c, export it in include/xen/xen-ops.h, then here just:
> >
> > efi = efi_xen;
> >
> > Would that improve code readability?
> >
> Ok.
> >
> > Correct me if I am wrong, but on ARM64 (differently from x86) it is not
> > necessary to set efi.systab because it is not used, right? If so, it
> > would be best to add a comment here to remember.
> >
> Not set efi.systab here because it gets the system table through fdt and set
> efi.systab there. See uefi_init() in arch/arm64/kernel.efi.c
>
> efi.systab = early_memremap(efi_system_table,
> sizeof(efi_system_table_t));
I see now. Then it might be still good to add a comment about that.
> > > diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
> > > index 73708ac..27d216a 100644
> > > --- a/drivers/xen/Kconfig
> > > +++ b/drivers/xen/Kconfig
> > > @@ -268,7 +268,7 @@ config XEN_HAVE_PVMMU
> > >
> > > config XEN_EFI
> > > def_bool y
> > > - depends on X86_64 && EFI
> > > + depends on (ARM64 || X86_64) && EFI
> > >
> > > config XEN_AUTO_XLATE
> > > def_bool y
> > > diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
> > > index c83a338..36ff8e4 100644
> > > --- a/include/xen/xen-ops.h
> > > +++ b/include/xen/xen-ops.h
> > > @@ -107,6 +107,7 @@ efi_status_t
> > > xen_efi_update_capsule(efi_capsule_header_t **capsules,
> > > efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
> > > unsigned long count, u64 *max_size,
> > > int *reset_type);
> > > +void xen_efi_runtime_setup(void);
> >
> > xen_efi_runtime_setup is not defined on x86, but this header is not arch
> > specific.
> >
>
> --
> Shannon
>
next prev parent reply other threads:[~2016-01-19 14:25 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 6:55 [PATCH v2 00/16] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 01/16] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-01-15 15:39 ` Stefano Stabellini
2016-01-18 10:32 ` Mark Rutland
2016-01-18 11:38 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 02/16] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-01-15 15:53 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 03/16] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-01-15 17:08 ` [Xen-devel] " Stefano Stabellini
2016-01-18 5:08 ` Shannon Zhao
2016-01-19 14:59 ` Stefano Stabellini
2016-01-19 15:10 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 04/16] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-01-15 17:21 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 05/16] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 06/16] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-01-15 17:39 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 07/16] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-01-18 11:58 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 08/16] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-01-18 12:38 ` [Xen-devel] " Stefano Stabellini
2016-01-18 12:42 ` Andrew Cooper
2016-01-18 12:46 ` Stefano Stabellini
2016-01-18 12:52 ` Andrew Cooper
2016-01-20 6:33 ` Shannon Zhao
2016-01-20 8:39 ` Andrew Cooper
2016-01-20 8:45 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 09/16] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-01-18 14:38 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:21 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 10/16] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-01-18 14:59 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:36 ` Shannon Zhao
2016-01-19 12:14 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 11/16] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-01-18 10:41 ` Mark Rutland
2016-01-18 15:07 ` Stefano Stabellini
2016-01-19 8:41 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 12/16] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-01-17 3:43 ` Rob Herring
2016-01-18 10:51 ` Mark Rutland
2016-01-18 17:34 ` Stefano Stabellini
2016-01-19 10:25 ` Shannon Zhao
2016-01-19 10:47 ` Mark Rutland
2016-01-19 12:23 ` Stefano Stabellini
2016-01-19 13:13 ` Mark Rutland
2016-01-19 13:18 ` Ard Biesheuvel
2016-01-19 13:43 ` Shannon Zhao
2016-01-19 14:11 ` Stefano Stabellini
2016-01-21 11:50 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 13/16] ARM: XEN: Set EFI_PARAVIRT if Xen supports EFI Shannon Zhao
2016-01-18 10:57 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 14/16] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
2016-01-18 11:03 ` Mark Rutland
2016-01-18 15:41 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:19 ` Shannon Zhao
2016-01-19 13:43 ` Mark Rutland
2016-01-19 13:46 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 15/16] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 16/16] ARM64: XEN: Initialize Xen specific UEFI runtime services Shannon Zhao
2016-01-18 11:08 ` Mark Rutland
2016-01-18 17:45 ` Stefano Stabellini
2016-01-18 18:27 ` Mark Rutland
2016-01-19 12:03 ` Stefano Stabellini
2016-01-19 13:03 ` Mark Rutland
2016-01-19 13:31 ` Shannon Zhao
2016-01-19 14:20 ` Stefano Stabellini
2016-01-18 17:03 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:12 ` Shannon Zhao
2016-01-19 14:24 ` Stefano Stabellini [this message]
2016-01-22 3:58 ` Shannon Zhao
2016-01-22 10:57 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1601191424270.9400@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=devicetree@vger.kernel.org \
--cc=julien.grall@citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peter.huangpeng@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=stefano.stabellini@citrix.com \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).