From: konrad.wilk@oracle•com (Konrad Rzeszutek Wilk)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 12/24] xen/arm: Introduce xen_guest_init
Date: Wed, 1 Aug 2012 10:38:22 -0400 [thread overview]
Message-ID: <20120801143822.GJ7227@phenom.dumpdata.com> (raw)
In-Reply-To: <1343316846-25860-12-git-send-email-stefano.stabellini@eu.citrix.com>
On Thu, Jul 26, 2012 at 04:33:54PM +0100, Stefano Stabellini wrote:
> We used to rely on a core_initcall to initialize Xen on ARM, however
> core_initcalls are actually called after early consoles are initialized.
> That means that hvc_xen.c is going to be initialized before Xen.
>
> Given the lack of a better alternative, just call a new Xen
> initialization function (xen_guest_init) from xen_cons_init.
>
> xen_guest_init has to be arch independent, so write both an ARM and an
> x86 implementation. The x86 implementation is currently empty because we
> can be sure that xen_hvm_guest_init is called early enough.
Should the arm version then not be anymore on the core_initcall then?
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu•citrix.com>
> ---
> arch/arm/xen/enlighten.c | 7 ++++++-
> arch/x86/xen/enlighten.c | 8 ++++++++
> drivers/tty/hvc/hvc_xen.c | 7 ++++++-
> include/xen/xen.h | 2 ++
> 4 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
> index 8c923af..dc68074 100644
> --- a/arch/arm/xen/enlighten.c
> +++ b/arch/arm/xen/enlighten.c
> @@ -44,7 +44,7 @@ EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
> * - one interrupt for Xen event notifications;
> * - one memory region to map the grant_table.
> */
> -static int __init xen_guest_init(void)
> +int __init xen_guest_init(void)
> {
> int cpu;
> struct xen_add_to_physmap xatp;
> @@ -58,6 +58,10 @@ static int __init xen_guest_init(void)
> }
> xen_domain_type = XEN_HVM_DOMAIN;
>
> + /* already setup */
> + if (shared_info_page != 0 && HYPERVISOR_shared_info == shared_info_page)
> + return 0;
> +
> if (!shared_info_page)
> shared_info_page = (struct shared_info *)
> get_zeroed_page(GFP_KERNEL);
> @@ -88,4 +92,5 @@ static int __init xen_guest_init(void)
> }
> return 0;
> }
> +EXPORT_SYMBOL_GPL(xen_guest_init);
Why the export symbols?
> core_initcall(xen_guest_init);
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index ff962d4..6131d43 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1567,4 +1567,12 @@ const struct hypervisor_x86 x86_hyper_xen_hvm __refconst = {
> .init_platform = xen_hvm_guest_init,
> };
> EXPORT_SYMBOL(x86_hyper_xen_hvm);
> +
> +int __init xen_guest_init(void)
> +{
> + /* do nothing: rely on x86_hyper_xen_hvm for the initialization */
> + return 0;
> +
> +}
> +EXPORT_SYMBOL_GPL(xen_guest_init);
> #endif
> diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
> index dc07f56..3c04fb8 100644
> --- a/drivers/tty/hvc/hvc_xen.c
> +++ b/drivers/tty/hvc/hvc_xen.c
> @@ -577,6 +577,12 @@ static void __exit xen_hvc_fini(void)
> static int xen_cons_init(void)
> {
> const struct hv_ops *ops;
> + int r;
> +
> + /* retrieve xen infos */
> + r = xen_guest_init();
> + if (r < 0)
> + return r;
>
> if (!xen_domain())
> return 0;
> @@ -584,7 +590,6 @@ static int xen_cons_init(void)
> if (xen_initial_domain())
> ops = &dom0_hvc_ops;
> else {
> - int r;
> ops = &domU_hvc_ops;
>
> if (xen_hvm_domain())
> diff --git a/include/xen/xen.h b/include/xen/xen.h
> index 2c0d3a5..792a4d2 100644
> --- a/include/xen/xen.h
> +++ b/include/xen/xen.h
> @@ -9,8 +9,10 @@ enum xen_domain_type {
>
> #ifdef CONFIG_XEN
> extern enum xen_domain_type xen_domain_type;
> +int xen_guest_init(void);
> #else
> #define xen_domain_type XEN_NATIVE
> +static inline int xen_guest_init(void) { return 0; }
> #endif
>
> #define xen_domain() (xen_domain_type != XEN_NATIVE)
> --
> 1.7.2.5
next prev parent reply other threads:[~2012-08-01 14:38 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 15:33 [PATCH 00/24] Introduce Xen support on ARM Stefano Stabellini
2012-07-26 15:33 ` [PATCH 01/24] arm: initial Xen support Stefano Stabellini
2012-07-26 16:30 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 11:56 ` Stefano Stabellini
2012-08-01 10:42 ` Konrad Rzeszutek Wilk
2012-08-06 10:55 ` Stefano Stabellini
2012-08-01 18:27 ` Rob Herring
2012-08-02 7:35 ` Ian Campbell
2012-08-02 14:13 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-08-06 10:46 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 02/24] xen/arm: hypercalls Stefano Stabellini
2012-07-26 16:33 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 9:17 ` Ian Campbell
2012-07-27 13:02 ` Stefano Stabellini
2012-07-27 13:18 ` Ian Campbell
2012-07-27 13:41 ` Stefano Stabellini
2012-07-27 14:21 ` Russell King - ARM Linux
2012-07-27 14:36 ` Stefano Stabellini
2012-07-27 14:39 ` Ian Campbell
2012-07-27 14:59 ` Russell King - ARM Linux
2012-07-26 16:56 ` David Vrabel
2012-07-26 17:19 ` Stefano Stabellini
2012-07-27 9:00 ` Ian Campbell
2012-07-26 19:19 ` Christopher Covington
2012-07-27 9:19 ` Ian Campbell
2012-07-27 12:56 ` Christopher Covington
2012-07-27 13:57 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 03/24] xen/arm: page.h definitions Stefano Stabellini
2012-07-26 16:36 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 13:47 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 04/24] xen/arm: sync_bitops Stefano Stabellini
2012-07-26 16:37 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 9:28 ` Ian Campbell
2012-08-01 14:35 ` Konrad Rzeszutek Wilk
2012-08-01 16:07 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 05/24] xen/arm: empty implementation of grant_table arch specific functions Stefano Stabellini
2012-08-01 14:16 ` Konrad Rzeszutek Wilk
2012-08-01 15:46 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 06/24] xen: missing includes Stefano Stabellini
2012-07-27 6:57 ` [Xen-devel] " Jan Beulich
2012-07-27 16:47 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 07/24] xen/arm: Xen detection and shared_info page mapping Stefano Stabellini
2012-07-27 9:36 ` Ian Campbell
2012-07-27 14:48 ` Stefano Stabellini
2012-07-27 14:51 ` Ian Campbell
2012-08-01 14:19 ` Konrad Rzeszutek Wilk
2012-08-01 15:45 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 08/24] xen/arm: Introduce xen_pfn_t for pfn and mfn types Stefano Stabellini
2012-08-01 14:22 ` Konrad Rzeszutek Wilk
2012-08-01 15:50 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 09/24] xen/arm: compile and run xenbus Stefano Stabellini
2012-08-01 14:28 ` Konrad Rzeszutek Wilk
2012-08-06 11:17 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 10/24] xen: do not compile manage, balloon, pci, acpi and cpu_hotplug on ARM Stefano Stabellini
2012-07-27 7:01 ` [Xen-devel] " Jan Beulich
2012-07-27 16:51 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 11/24] xen/arm: introduce CONFIG_XEN " Stefano Stabellini
2012-08-01 14:34 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-26 15:33 ` [PATCH 12/24] xen/arm: Introduce xen_guest_init Stefano Stabellini
2012-07-27 9:42 ` Ian Campbell
2012-07-27 15:54 ` Stefano Stabellini
2012-07-27 16:11 ` Ian Campbell
2012-08-01 14:38 ` Konrad Rzeszutek Wilk [this message]
2012-07-26 15:33 ` [PATCH 13/24] xen/arm: get privilege status Stefano Stabellini
2012-07-27 9:44 ` Ian Campbell
2012-07-27 14:25 ` Stefano Stabellini
2012-07-27 14:33 ` Ian Campbell
2012-08-01 14:39 ` Konrad Rzeszutek Wilk
2012-08-01 16:21 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 14/24] xen/arm: initialize grant_table on ARM Stefano Stabellini
2012-08-01 14:40 ` Konrad Rzeszutek Wilk
2012-08-01 17:08 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 15/24] xen/arm: receive Xen events " Stefano Stabellini
2012-08-01 14:44 ` Konrad Rzeszutek Wilk
2012-08-06 10:31 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 16/24] xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree Stefano Stabellini
2012-07-26 15:33 ` [PATCH 17/24] xen: allow privcmd for HVM guests Stefano Stabellini
2012-07-27 7:04 ` [Xen-devel] " Jan Beulich
2012-07-27 14:10 ` Stefano Stabellini
2012-08-01 14:47 ` Konrad Rzeszutek Wilk
2012-07-26 15:34 ` [PATCH 18/24] xen/arm: compile blkfront and blkback Stefano Stabellini
2012-07-27 9:48 ` Ian Campbell
2012-07-27 16:25 ` Stefano Stabellini
2012-08-01 14:48 ` Konrad Rzeszutek Wilk
2012-08-01 16:19 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 19/24] xen/arm: compile netback Stefano Stabellini
2012-07-26 15:34 ` [PATCH 20/24] xen: update xen_add_to_physmap interface Stefano Stabellini
2012-08-01 14:52 ` Konrad Rzeszutek Wilk
2012-08-01 16:18 ` Stefano Stabellini
2012-08-01 18:19 ` Mukesh Rathor
2012-07-26 15:34 ` [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Stefano Stabellini
2012-08-01 14:52 ` Konrad Rzeszutek Wilk
2012-08-01 16:06 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 22/24] ARM: enable earlyprintk=xen Stefano Stabellini
2012-07-26 15:34 ` [PATCH 23/24] hvc_xen: allow dom0_write_console for HVM guests Stefano Stabellini
2012-08-01 14:54 ` Konrad Rzeszutek Wilk
2012-08-01 16:04 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 24/24] [HACK] xen/arm: implement xen_remap_domain_mfn_range Stefano Stabellini
2012-08-01 14:56 ` Konrad Rzeszutek Wilk
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=20120801143822.GJ7227@phenom.dumpdata.com \
--to=konrad.wilk@oracle$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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