From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<ard.biesheuvel@linaro.org>, <mark.rutland@arm.com>,
<stefano.stabellini@citrix.com>, <david.vrabel@citrix.com>,
<catalin.marinas@arm.com>, <will.deacon@arm.com>,
<julien.grall@citrix.com>, <xen-devel@lists.xen.org>,
<devicetree@vger.kernel.org>, <linux-efi@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <ian.campbell@citrix.com>,
<shannon.zhao@linaro.org>, <peter.huangpeng@huawei.com>
Subject: Re: [PATCH v3 11/17] ARM: XEN: Move xen_early_init() before efi_init()
Date: Mon, 25 Jan 2016 15:25:01 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1601251524470.9687@kaball.uk.xensource.com> (raw)
In-Reply-To: <1453519184-11908-12-git-send-email-zhaoshenglong@huawei.com>
On Sat, 23 Jan 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Move xen_early_init() before efi_init(), then when calling efi_init()
> could initialize Xen specific UEFI.
>
> Check if it runs on Xen hypervisor through the flat dts.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> arch/arm/xen/enlighten.c | 56 ++++++++++++++++++++++++++++++++++-------------
> arch/arm64/kernel/setup.c | 2 +-
> 2 files changed, 42 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
> index 0e010bb..cdc0bd2 100644
> --- a/arch/arm/xen/enlighten.c
> +++ b/arch/arm/xen/enlighten.c
> @@ -19,6 +19,7 @@
> #include <linux/irqreturn.h>
> #include <linux/module.h>
> #include <linux/of.h>
> +#include <linux/of_fdt.h>
> #include <linux/of_irq.h>
> #include <linux/of_address.h>
> #include <linux/cpuidle.h>
> @@ -52,8 +53,6 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;
>
> static __read_mostly unsigned int xen_events_irq;
>
> -static __initdata struct device_node *xen_node;
> -
> int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
> unsigned long addr,
> xen_pfn_t *gfn, int nr,
> @@ -222,6 +221,33 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
> return IRQ_HANDLED;
> }
>
> +static __initdata struct {
> + const char *compat;
> + const char *prefix;
> + const char *version;
> + bool found;
> +} hyper_node = {"xen,xen", "xen,xen-", NULL, false};
> +
> +static int __init fdt_find_hyper_node(unsigned long node, const char *uname,
> + int depth, void *data)
> +{
> + const void *s = NULL;
> + int len;
> +
> + if (depth != 1 || strcmp(uname, "hypervisor") != 0)
> + return 0;
> +
> + if (of_flat_dt_is_compatible(node, hyper_node.compat))
> + hyper_node.found = true;
> +
> + s = of_get_flat_dt_prop(node, "compatible", &len);
> + if (strlen(hyper_node.prefix) + 3 < len &&
> + !strncmp(hyper_node.prefix, s, strlen(hyper_node.prefix)))
> + hyper_node.version = s + strlen(hyper_node.prefix);
> +
> + return 0;
> +}
> +
> /*
> * see Documentation/devicetree/bindings/arm/xen.txt for the
> * documentation of the Xen Device Tree format.
> @@ -229,26 +255,18 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
> #define GRANT_TABLE_PHYSADDR 0
> void __init xen_early_init(void)
> {
> - int len;
> - const char *s = NULL;
> - const char *version = NULL;
> - const char *xen_prefix = "xen,xen-";
> -
> - xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
> - if (!xen_node) {
> + of_scan_flat_dt(fdt_find_hyper_node, NULL);
> + if (!hyper_node.found) {
> pr_debug("No Xen support\n");
> return;
> }
> - s = of_get_property(xen_node, "compatible", &len);
> - if (strlen(xen_prefix) + 3 < len &&
> - !strncmp(xen_prefix, s, strlen(xen_prefix)))
> - version = s + strlen(xen_prefix);
> - if (version == NULL) {
> +
> + if (hyper_node.version == NULL) {
> pr_debug("Xen version not found\n");
> return;
> }
>
> - pr_info("Xen %s support found\n", version);
> + pr_info("Xen %s support found\n", hyper_node.version);
>
> xen_domain_type = XEN_HVM_DOMAIN;
>
> @@ -289,6 +307,14 @@ static void __init xen_acpi_guest_init_events_irq(void)
>
> static void __init xen_dt_guest_init_events_irq(void)
> {
> + struct device_node *xen_node;
> +
> + xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
> + if (!xen_node) {
> + pr_err("Xen support was detected before, but it has disappeared\n");
> + return;
> + }
> +
> xen_events_irq = irq_of_parse_and_map(xen_node, 0);
> }
>
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index 8119479..a4a2878 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -313,6 +313,7 @@ void __init setup_arch(char **cmdline_p)
> */
> local_async_enable();
>
> + xen_early_init();
> efi_init();
> arm64_memblock_init();
>
> @@ -334,7 +335,6 @@ void __init setup_arch(char **cmdline_p)
> } else {
> psci_acpi_init();
> }
> - xen_early_init();
>
> cpu_read_bootcpu_ops();
> smp_init_cpus();
> --
> 2.0.4
>
>
next prev parent reply other threads:[~2016-01-25 15:26 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 3:19 [PATCH v3 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-01-25 12:20 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-01-25 13:55 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-01-25 15:06 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-01-25 15:08 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-01-25 15:19 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-01-25 15:25 ` Stefano Stabellini [this message]
2016-01-23 3:19 ` [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-01-25 15:32 ` Stefano Stabellini
2016-01-27 8:27 ` Hanjun Guo
2016-01-27 8:57 ` Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-01-25 15:50 ` Stefano Stabellini
2016-01-25 15:59 ` Mark Rutland
2016-01-25 16:06 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-01-25 16:44 ` Stefano Stabellini
2016-01-26 8:16 ` Shannon Zhao
2016-01-26 11:31 ` Stefano Stabellini
2016-01-26 12:26 ` Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-01-25 16:47 ` Stefano Stabellini
2016-01-23 3:19 ` [PATCH v3 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-01-26 12:11 ` Stefano Stabellini
2016-01-26 12:27 ` Shannon Zhao
2016-01-23 3:19 ` [PATCH v3 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
2016-01-26 11:41 ` Stefano Stabellini
2016-01-26 12:05 ` Matt Fleming
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.1601251524470.9687@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=ian.campbell@citrix.com \
--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
all inboxes | Powered by JetHome®