* [PATCH v6 1/3] Kconfig: import kconfig.h from Linux 4.3
2016-01-30 9:47 [PATCH v6 0/3] Refactor DT specific codes preparing for ACPI support on ARM64 Shannon Zhao
@ 2016-01-30 9:47 ` Shannon Zhao
2016-01-31 4:08 ` Doug Goldstein
2016-01-30 9:47 ` [PATCH v6 2/3] ACPI: add config for BIOS table scan Shannon Zhao
2016-01-30 9:47 ` [PATCH v6 3/3] acpi: Refactor acpi_os_map_memory to be architecturally independent Shannon Zhao
2 siblings, 1 reply; 8+ messages in thread
From: Shannon Zhao @ 2016-01-30 9:47 UTC (permalink / raw)
To: xen-devel; +Cc: Doug Goldstein, shannon.zhao, jbeulich, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
To support using CONFIG_ options in C/CPP expressions, import kconfig.h
from the Linux v4.3 tag (commit id
6a13feb9c82803e2b815eca72fa7a9f5561d7861).
Only import IS_ENABLED for Xen since Xen doesn't support loadable
modules.
CC: Doug Goldstein <cardoe@cardoe.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
xen/include/xen/kconfig.h | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 xen/include/xen/kconfig.h
diff --git a/xen/include/xen/kconfig.h b/xen/include/xen/kconfig.h
new file mode 100644
index 0000000..4d58c5b
--- /dev/null
+++ b/xen/include/xen/kconfig.h
@@ -0,0 +1,31 @@
+#ifndef __XEN_KCONFIG_H
+#define __XEN_KCONFIG_H
+
+#include <generated/autoconf.h>
+
+/*
+ * Helper macros to use CONFIG_ options in C/CPP expressions. Note that
+ * these only work with boolean option.
+ */
+
+/*
+ * Getting something that works in C and CPP for an arg that may or may
+ * not be defined is tricky. Here, if we have "#define CONFIG_BOOGER 1"
+ * we match on the placeholder define, insert the "0," for arg1 and generate
+ * the triplet (0, 1, 0). Then the last step cherry picks the 2nd arg (a one).
+ * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
+ * the last step cherry picks the 2nd arg, we get a zero.
+ */
+#define __ARG_PLACEHOLDER_1 0,
+#define config_enabled(cfg) _config_enabled(cfg)
+#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value)
+#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
+#define ___config_enabled(__ignored, val, ...) val
+
+/*
+ * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
+ * otherwise.
+ */
+#define IS_ENABLED(option) config_enabled(option)
+
+#endif /* __XEN_KCONFIG_H */
--
2.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/3] Kconfig: import kconfig.h from Linux 4.3
2016-01-30 9:47 ` [PATCH v6 1/3] Kconfig: import kconfig.h from Linux 4.3 Shannon Zhao
@ 2016-01-31 4:08 ` Doug Goldstein
0 siblings, 0 replies; 8+ messages in thread
From: Doug Goldstein @ 2016-01-31 4:08 UTC (permalink / raw)
To: Shannon Zhao, xen-devel; +Cc: shannon.zhao, jbeulich, peter.huangpeng
[-- Attachment #1.1: Type: text/plain, Size: 2103 bytes --]
On 1/30/16 3:47 AM, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> To support using CONFIG_ options in C/CPP expressions, import kconfig.h
> from the Linux v4.3 tag (commit id
> 6a13feb9c82803e2b815eca72fa7a9f5561d7861).
> Only import IS_ENABLED for Xen since Xen doesn't support loadable
> modules.
>
> CC: Doug Goldstein <cardoe@cardoe.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
> ---
> xen/include/xen/kconfig.h | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
> create mode 100644 xen/include/xen/kconfig.h
>
> diff --git a/xen/include/xen/kconfig.h b/xen/include/xen/kconfig.h
> new file mode 100644
> index 0000000..4d58c5b
> --- /dev/null
> +++ b/xen/include/xen/kconfig.h
> @@ -0,0 +1,31 @@
> +#ifndef __XEN_KCONFIG_H
> +#define __XEN_KCONFIG_H
> +
> +#include <generated/autoconf.h>
> +
> +/*
> + * Helper macros to use CONFIG_ options in C/CPP expressions. Note that
> + * these only work with boolean option.
> + */
> +
> +/*
> + * Getting something that works in C and CPP for an arg that may or may
> + * not be defined is tricky. Here, if we have "#define CONFIG_BOOGER 1"
> + * we match on the placeholder define, insert the "0," for arg1 and generate
> + * the triplet (0, 1, 0). Then the last step cherry picks the 2nd arg (a one).
> + * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
> + * the last step cherry picks the 2nd arg, we get a zero.
> + */
> +#define __ARG_PLACEHOLDER_1 0,
> +#define config_enabled(cfg) _config_enabled(cfg)
> +#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value)
> +#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
> +#define ___config_enabled(__ignored, val, ...) val
> +
> +/*
> + * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
> + * otherwise.
> + */
> +#define IS_ENABLED(option) config_enabled(option)
> +
> +#endif /* __XEN_KCONFIG_H */
>
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 2/3] ACPI: add config for BIOS table scan
2016-01-30 9:47 [PATCH v6 0/3] Refactor DT specific codes preparing for ACPI support on ARM64 Shannon Zhao
2016-01-30 9:47 ` [PATCH v6 1/3] Kconfig: import kconfig.h from Linux 4.3 Shannon Zhao
@ 2016-01-30 9:47 ` Shannon Zhao
2016-01-31 4:10 ` Doug Goldstein
2016-02-04 17:16 ` Stefano Stabellini
2016-01-30 9:47 ` [PATCH v6 3/3] acpi: Refactor acpi_os_map_memory to be architecturally independent Shannon Zhao
2 siblings, 2 replies; 8+ messages in thread
From: Shannon Zhao @ 2016-01-30 9:47 UTC (permalink / raw)
To: xen-devel; +Cc: shannon.zhao, jbeulich, peter.huangpeng
From: Graeme Gregory <graeme.gregory@linaro.org>
With the addition of ARM64 that does not have a traditional BIOS to
scan, add a config option which is selected on x86 (ia64 doesn't need
it either, it is EFI/UEFI based system) to do the traditional BIOS
scanning for tables.
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40]
[Include <xen/kconfig.h> in osl.c so that it could use IS_ENABLED]
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
xen/arch/x86/Kconfig | 1 +
xen/drivers/acpi/Kconfig | 3 +++
xen/drivers/acpi/osl.c | 5 ++++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 7d2ed96..9fdd3b1 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,6 +3,7 @@ config X86_64
config X86
def_bool y
+ select ACPI_LEGACY_TABLES_LOOKUP
select COMPAT
select HAS_ACPI
select HAS_CPUFREQ
diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
index 11ab5e4..82d73ca 100644
--- a/xen/drivers/acpi/Kconfig
+++ b/xen/drivers/acpi/Kconfig
@@ -2,3 +2,6 @@
# Select HAS_ACPI if ACPI is supported
config HAS_ACPI
bool
+
+config ACPI_LEGACY_TABLES_LOOKUP
+ bool
diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index ce15470..2f1d723 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -38,6 +38,7 @@
#include <xen/domain_page.h>
#include <xen/efi.h>
#include <xen/vmap.h>
+#include <xen/kconfig.h>
#define _COMPONENT ACPI_OS_SERVICES
ACPI_MODULE_NAME("osl")
@@ -75,12 +76,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
"System description tables not found\n");
return 0;
}
- } else {
+ } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
acpi_physical_address pa = 0;
acpi_find_root_pointer(&pa);
return pa;
}
+
+ return 0;
}
void __iomem *
--
2.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v6 2/3] ACPI: add config for BIOS table scan
2016-01-30 9:47 ` [PATCH v6 2/3] ACPI: add config for BIOS table scan Shannon Zhao
@ 2016-01-31 4:10 ` Doug Goldstein
2016-02-04 17:16 ` Stefano Stabellini
1 sibling, 0 replies; 8+ messages in thread
From: Doug Goldstein @ 2016-01-31 4:10 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 2415 bytes --]
On 1/30/16 3:47 AM, Shannon Zhao wrote:
> From: Graeme Gregory <graeme.gregory@linaro.org>
>
> With the addition of ARM64 that does not have a traditional BIOS to
> scan, add a config option which is selected on x86 (ia64 doesn't need
> it either, it is EFI/UEFI based system) to do the traditional BIOS
> scanning for tables.
>
> Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> [Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40]
> [Include <xen/kconfig.h> in osl.c so that it could use IS_ENABLED]
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
[for Kconfig bits]
> ---
> xen/arch/x86/Kconfig | 1 +
> xen/drivers/acpi/Kconfig | 3 +++
> xen/drivers/acpi/osl.c | 5 ++++-
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
> index 7d2ed96..9fdd3b1 100644
> --- a/xen/arch/x86/Kconfig
> +++ b/xen/arch/x86/Kconfig
> @@ -3,6 +3,7 @@ config X86_64
>
> config X86
> def_bool y
> + select ACPI_LEGACY_TABLES_LOOKUP
> select COMPAT
> select HAS_ACPI
> select HAS_CPUFREQ
> diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
> index 11ab5e4..82d73ca 100644
> --- a/xen/drivers/acpi/Kconfig
> +++ b/xen/drivers/acpi/Kconfig
> @@ -2,3 +2,6 @@
> # Select HAS_ACPI if ACPI is supported
> config HAS_ACPI
> bool
> +
> +config ACPI_LEGACY_TABLES_LOOKUP
> + bool
> diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
> index ce15470..2f1d723 100644
> --- a/xen/drivers/acpi/osl.c
> +++ b/xen/drivers/acpi/osl.c
> @@ -38,6 +38,7 @@
> #include <xen/domain_page.h>
> #include <xen/efi.h>
> #include <xen/vmap.h>
> +#include <xen/kconfig.h>
Committer should alphabetize.
>
> #define _COMPONENT ACPI_OS_SERVICES
> ACPI_MODULE_NAME("osl")
> @@ -75,12 +76,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
> "System description tables not found\n");
> return 0;
> }
> - } else {
> + } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
> acpi_physical_address pa = 0;
>
> acpi_find_root_pointer(&pa);
> return pa;
> }
> +
> + return 0;
> }
>
> void __iomem *
>
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v6 2/3] ACPI: add config for BIOS table scan
2016-01-30 9:47 ` [PATCH v6 2/3] ACPI: add config for BIOS table scan Shannon Zhao
2016-01-31 4:10 ` Doug Goldstein
@ 2016-02-04 17:16 ` Stefano Stabellini
1 sibling, 0 replies; 8+ messages in thread
From: Stefano Stabellini @ 2016-02-04 17:16 UTC (permalink / raw)
To: Shannon Zhao; +Cc: peter.huangpeng, shannon.zhao, jbeulich, xen-devel
On Sat, 30 Jan 2016, Shannon Zhao wrote:
> From: Graeme Gregory <graeme.gregory@linaro.org>
>
> With the addition of ARM64 that does not have a traditional BIOS to
> scan, add a config option which is selected on x86 (ia64 doesn't need
> it either, it is EFI/UEFI based system) to do the traditional BIOS
> scanning for tables.
>
> Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> [Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40]
> [Include <xen/kconfig.h> in osl.c so that it could use IS_ENABLED]
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> xen/arch/x86/Kconfig | 1 +
> xen/drivers/acpi/Kconfig | 3 +++
> xen/drivers/acpi/osl.c | 5 ++++-
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
> index 7d2ed96..9fdd3b1 100644
> --- a/xen/arch/x86/Kconfig
> +++ b/xen/arch/x86/Kconfig
> @@ -3,6 +3,7 @@ config X86_64
>
> config X86
> def_bool y
> + select ACPI_LEGACY_TABLES_LOOKUP
> select COMPAT
> select HAS_ACPI
> select HAS_CPUFREQ
> diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
> index 11ab5e4..82d73ca 100644
> --- a/xen/drivers/acpi/Kconfig
> +++ b/xen/drivers/acpi/Kconfig
> @@ -2,3 +2,6 @@
> # Select HAS_ACPI if ACPI is supported
> config HAS_ACPI
> bool
> +
> +config ACPI_LEGACY_TABLES_LOOKUP
> + bool
> diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
> index ce15470..2f1d723 100644
> --- a/xen/drivers/acpi/osl.c
> +++ b/xen/drivers/acpi/osl.c
> @@ -38,6 +38,7 @@
> #include <xen/domain_page.h>
> #include <xen/efi.h>
> #include <xen/vmap.h>
> +#include <xen/kconfig.h>
>
> #define _COMPONENT ACPI_OS_SERVICES
> ACPI_MODULE_NAME("osl")
> @@ -75,12 +76,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
> "System description tables not found\n");
> return 0;
> }
> - } else {
> + } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
> acpi_physical_address pa = 0;
>
> acpi_find_root_pointer(&pa);
> return pa;
> }
> +
> + return 0;
> }
>
> void __iomem *
> --
> 2.0.4
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 3/3] acpi: Refactor acpi_os_map_memory to be architecturally independent
2016-01-30 9:47 [PATCH v6 0/3] Refactor DT specific codes preparing for ACPI support on ARM64 Shannon Zhao
2016-01-30 9:47 ` [PATCH v6 1/3] Kconfig: import kconfig.h from Linux 4.3 Shannon Zhao
2016-01-30 9:47 ` [PATCH v6 2/3] ACPI: add config for BIOS table scan Shannon Zhao
@ 2016-01-30 9:47 ` Shannon Zhao
2016-02-04 17:14 ` Stefano Stabellini
2 siblings, 1 reply; 8+ messages in thread
From: Shannon Zhao @ 2016-01-30 9:47 UTC (permalink / raw)
To: xen-devel; +Cc: shannon.zhao, jbeulich, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
The first Mb handling is not necessary and the attribute of __vmap() is
different for ARM. Factor the first Mb handling only for x86 and define
a mapping attribute for each architecture.
Cc: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
xen/drivers/acpi/osl.c | 6 +++---
xen/include/asm-x86/acpi.h | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index 2f1d723..8a28d87 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -93,11 +93,11 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
mfn_t mfn = _mfn(PFN_DOWN(phys));
unsigned int offs = phys & (PAGE_SIZE - 1);
- /* The low first Mb is always mapped. */
- if ( !((phys + size - 1) >> 20) )
+ /* The low first Mb is always mapped on x86. */
+ if (IS_ENABLED(CONFIG_X86) && !((phys + size - 1) >> 20))
return __va(phys);
return __vmap(&mfn, PFN_UP(offs + size), 1, 1,
- PAGE_HYPERVISOR_NOCACHE) + offs;
+ ACPI_MAP_MEM_ATTR) + offs;
}
return __acpi_map_table(phys, size);
}
diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h
index d3bde78..d532e3d 100644
--- a/xen/include/asm-x86/acpi.h
+++ b/xen/include/asm-x86/acpi.h
@@ -163,4 +163,6 @@ void hvm_acpi_sleep_button(struct domain *d);
void save_rest_processor_state(void);
void restore_rest_processor_state(void);
+#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR_NOCACHE
+
#endif /*__X86_ASM_ACPI_H*/
--
2.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 3/3] acpi: Refactor acpi_os_map_memory to be architecturally independent
2016-01-30 9:47 ` [PATCH v6 3/3] acpi: Refactor acpi_os_map_memory to be architecturally independent Shannon Zhao
@ 2016-02-04 17:14 ` Stefano Stabellini
0 siblings, 0 replies; 8+ messages in thread
From: Stefano Stabellini @ 2016-02-04 17:14 UTC (permalink / raw)
To: Shannon Zhao; +Cc: peter.huangpeng, shannon.zhao, jbeulich, xen-devel
On Sat, 30 Jan 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> The first Mb handling is not necessary and the attribute of __vmap() is
> different for ARM. Factor the first Mb handling only for x86 and define
> a mapping attribute for each architecture.
>
> Cc: Jan Beulich <jbeulich@suse.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> xen/drivers/acpi/osl.c | 6 +++---
> xen/include/asm-x86/acpi.h | 2 ++
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
> index 2f1d723..8a28d87 100644
> --- a/xen/drivers/acpi/osl.c
> +++ b/xen/drivers/acpi/osl.c
> @@ -93,11 +93,11 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
> mfn_t mfn = _mfn(PFN_DOWN(phys));
> unsigned int offs = phys & (PAGE_SIZE - 1);
>
> - /* The low first Mb is always mapped. */
> - if ( !((phys + size - 1) >> 20) )
> + /* The low first Mb is always mapped on x86. */
> + if (IS_ENABLED(CONFIG_X86) && !((phys + size - 1) >> 20))
> return __va(phys);
> return __vmap(&mfn, PFN_UP(offs + size), 1, 1,
> - PAGE_HYPERVISOR_NOCACHE) + offs;
> + ACPI_MAP_MEM_ATTR) + offs;
> }
> return __acpi_map_table(phys, size);
> }
> diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h
> index d3bde78..d532e3d 100644
> --- a/xen/include/asm-x86/acpi.h
> +++ b/xen/include/asm-x86/acpi.h
> @@ -163,4 +163,6 @@ void hvm_acpi_sleep_button(struct domain *d);
> void save_rest_processor_state(void);
> void restore_rest_processor_state(void);
>
> +#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR_NOCACHE
> +
> #endif /*__X86_ASM_ACPI_H*/
> --
> 2.0.4
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>
^ permalink raw reply [flat|nested] 8+ messages in thread