From: zhaoshenglong@huawei•com (Shannon Zhao)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI
Date: Wed, 27 Jan 2016 16:57:19 +0800 [thread overview]
Message-ID: <56A8866F.5060302@huawei.com> (raw)
In-Reply-To: <56A87F77.8070506@linaro.org>
On 2016/1/27 16:27, Hanjun Guo wrote:
> Hi Shannon,
>
> On 2016/1/23 11:19, Shannon Zhao wrote:
>> From: Shannon Zhao <shannon.zhao@linaro•org>
>>
>> When it's a Xen domain0 booting with ACPI, it will supply a /chosen and
>> a /hypervisor node in DT. So check if it needs to enable ACPI.
>>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro•org>
>> ---
>> CC: Hanjun Guo <hanjun.guo@linaro•org>
>> ---
>> arch/arm64/kernel/acpi.c | 12 ++++++++----
>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>> index d1ce8e2..4e92be0 100644
>> --- a/arch/arm64/kernel/acpi.c
>> +++ b/arch/arm64/kernel/acpi.c
>> @@ -67,10 +67,13 @@ static int __init dt_scan_depth1_nodes(unsigned
>> long node,
>> {
>> /*
>> * Return 1 as soon as we encounter a node at depth 1 that is
>> - * not the /chosen node.
>> + * not the /chosen node, or /hypervisor node when running on Xen.
>
> The comment is bit misleading, we need to specify two mode, running on
> Xen or not, if not on xen, then /chosen node is enough.
>
Ok, will rephrase it.
>> */
>> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
>> - return 1;
>> + if (depth == 1 && (strcmp(uname, "chosen") != 0)) {
>> + if (!xen_initial_domain() || (strcmp(uname, "hypervisor") != 0))
>> + return 1;
>> + }
>> +
>> return 0;
>> }
>>
>> @@ -184,7 +187,8 @@ void __init acpi_boot_table_init(void)
>> /*
>> * Enable ACPI instead of device tree unless
>> * - ACPI has been disabled explicitly (acpi=off), or
>> - * - the device tree is not empty (it has more than just a
>> /chosen node)
>> + * - the device tree is not empty (it has more than just a
>> /chosen node,
>> + * and a /hypervisor node when running on Xen)
>
> and here too.
>
> if that is addressed,
>
> Acked-by: Hanjun Guo <hanjun.guo@linaro•org>
Thanks!
--
Shannon
next prev parent reply other threads:[~2016-01-27 8:57 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
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 [this message]
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=56A8866F.5060302@huawei.com \
--to=zhaoshenglong@huawei$(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