Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1315499 > unrolled thread
| Started by | Shannon Zhao <zhaoshenglong@huawei.com> |
|---|---|
| First post | 2016-01-23 04:30 +0100 |
| Last post | 2016-01-27 10:00 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao <zhaoshenglong@huawei.com> - 2016-01-23 04:30 +0100
Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2016-01-25 16:40 +0100
Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Hanjun Guo <hanjun.guo@linaro.org> - 2016-01-27 09:30 +0100
Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao <zhaoshenglong@huawei.com> - 2016-01-27 10:00 +0100
| From | Shannon Zhao <zhaoshenglong@huawei.com> |
|---|---|
| Date | 2016-01-23 04:30 +0100 |
| Subject | [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI |
| Message-ID | <qTX3I-5bz-19@gated-at.bofh.it> |
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.
*/
- 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 ACPI has not been force enabled (acpi=force)
*/
if (param_acpi_off ||
--
2.0.4
[toc] | [next] | [standalone]
| From | Stefano Stabellini <stefano.stabellini@eu.citrix.com> |
|---|---|
| Date | 2016-01-25 16:40 +0100 |
| Subject | Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI |
| Message-ID | <qURph-60C-27@gated-at.bofh.it> |
| In reply to | #1315499 |
On Sat, 23 Jan 2016, 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>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 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.
> */
> - 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 ACPI has not been force enabled (acpi=force)
> */
> if (param_acpi_off ||
> --
> 2.0.4
>
>
[toc] | [prev] | [next] | [standalone]
| From | Hanjun Guo <hanjun.guo@linaro.org> |
|---|---|
| Date | 2016-01-27 09:30 +0100 |
| Subject | Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI |
| Message-ID | <qVtEd-DF-9@gated-at.bofh.it> |
| In reply to | #1315499 |
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.
> */
> - 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
Hanjun
[toc] | [prev] | [next] | [standalone]
| From | Shannon Zhao <zhaoshenglong@huawei.com> |
|---|---|
| Date | 2016-01-27 10:00 +0100 |
| Subject | Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI |
| Message-ID | <qVu7h-TW-17@gated-at.bofh.it> |
| In reply to | #1318746 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web