| Message ID | 1394640969-25583-13-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
>>> On 12.03.14 at 17:16, Julien Grall <julien.grall@linaro.org> wrote: > Multiboot protocol is only used by x86. When XSM support for ARM will be > introduced, another way will be used to retrieve the policy blob. > > Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and > rename xsm_init into xsm_multiboot_init to avoid confusion. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: Keir Fraser <keir@xen.org> Acked-by: Jan Beulich <jbeulich@suse.com> > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> > --- > xen/arch/x86/setup.c | 2 +- > xen/include/asm-x86/config.h | 2 ++ > xen/include/xsm/xsm.h | 23 +++++++++++++++-------- > xen/xsm/xsm_core.c | 9 ++++++--- > xen/xsm/xsm_policy.c | 10 +++++++--- > 5 files changed, 31 insertions(+), 15 deletions(-) > > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > index 4dbf2b7..e9c2c51 100644 > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -1251,7 +1251,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) > bitmap_fill(module_map, mbi->mods_count); > __clear_bit(0, module_map); /* Dom0 kernel is always first */ > > - xsm_init(module_map, mbi, bootstrap_map); > + xsm_multiboot_init(module_map, mbi, bootstrap_map); > > microcode_grab_module(module_map, mbi, bootstrap_map); > > diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h > index 99d0e2c..24f95a3 100644 > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -52,6 +52,8 @@ > #define CONFIG_KEXEC 1 > #define CONFIG_WATCHDOG 1 > > +#define CONFIG_MULTIBOOT 1 > + > #define HZ 100 > > #define OPT_CONSOLE_STR "vga" > diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h > index 15acb3b..4863e41 100644 > --- a/xen/include/xsm/xsm.h > +++ b/xen/include/xsm/xsm.h > @@ -643,11 +643,15 @@ static inline int xsm_map_gmfn_foreign (xsm_default_t > def, struct domain *d, str > > #endif /* XSM_NO_WRAPPERS */ > > -extern int xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)); > -extern int xsm_policy_init(unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)); > +#ifdef CONFIG_MULTIBOOT > +extern int xsm_multiboot_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)); > +extern int xsm_multiboot_policy_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t > *)); > +#endif > + > extern int register_xsm(struct xsm_operations *ops); > extern int unregister_xsm(struct xsm_operations *ops); > > @@ -658,12 +662,15 @@ extern void xsm_fixup_ops(struct xsm_operations *ops); > > #include <xsm/dummy.h> > > -static inline int xsm_init (unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +static inline int xsm_multiboot_init (unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t > *)) > { > return 0; > } > +#endif > + > #endif /* XSM_ENABLE */ > > #endif /* __XSM_H */ > diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c > index b16c071..11a9ca7 100644 > --- a/xen/xsm/xsm_core.c > +++ b/xen/xsm/xsm_core.c > @@ -43,8 +43,10 @@ static void __init do_xsm_initcalls(void) > } > } > > -int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +int __init xsm_multiboot_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)) > { > int ret = 0; > > @@ -52,7 +54,7 @@ int __init xsm_init(unsigned long *module_map, const > multiboot_info_t *mbi, > > if ( XSM_MAGIC ) > { > - ret = xsm_policy_init(module_map, mbi, bootstrap_map); > + ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); > if ( ret ) > { > bootstrap_map(NULL); > @@ -75,6 +77,7 @@ int __init xsm_init(unsigned long *module_map, const > multiboot_info_t *mbi, > > return 0; > } > +#endif > > int register_xsm(struct xsm_operations *ops) > { > diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c > index 0186f30..3d5f66a 100644 > --- a/xen/xsm/xsm_policy.c > +++ b/xen/xsm/xsm_policy.c > @@ -19,15 +19,18 @@ > */ > > #include <xsm/xsm.h> > +#ifdef CONFIG_MULTIBOOT > #include <xen/multiboot.h> > +#endif > #include <xen/bitops.h> > > char *__initdata policy_buffer = NULL; > u32 __initdata policy_size = 0; > > -int __init xsm_policy_init(unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +int __init xsm_multiboot_policy_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t > *)) > { > int i; > module_t *mod = (module_t *)__va(mbi->mods_addr); > @@ -65,3 +68,4 @@ int __init xsm_policy_init(unsigned long *module_map, > > return rc; > } > +#endif > -- > 1.7.10.4
On 03/12/2014 12:16 PM, Julien Grall wrote: > Multiboot protocol is only used by x86. When XSM support for ARM will be > introduced, another way will be used to retrieve the policy blob. > > Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and > rename xsm_init into xsm_multiboot_init to avoid confusion. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: Keir Fraser <keir@xen.org> > Cc: Jan Beulich <jbeulich@suse.com> > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> > --- > xen/arch/x86/setup.c | 2 +- > xen/include/asm-x86/config.h | 2 ++ > xen/include/xsm/xsm.h | 23 +++++++++++++++-------- > xen/xsm/xsm_core.c | 9 ++++++--- > xen/xsm/xsm_policy.c | 10 +++++++--- > 5 files changed, 31 insertions(+), 15 deletions(-) > > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > index 4dbf2b7..e9c2c51 100644 > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -1251,7 +1251,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) > bitmap_fill(module_map, mbi->mods_count); > __clear_bit(0, module_map); /* Dom0 kernel is always first */ > > - xsm_init(module_map, mbi, bootstrap_map); > + xsm_multiboot_init(module_map, mbi, bootstrap_map); > > microcode_grab_module(module_map, mbi, bootstrap_map); > > diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h > index 99d0e2c..24f95a3 100644 > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -52,6 +52,8 @@ > #define CONFIG_KEXEC 1 > #define CONFIG_WATCHDOG 1 > > +#define CONFIG_MULTIBOOT 1 > + > #define HZ 100 > > #define OPT_CONSOLE_STR "vga" > diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h > index 15acb3b..4863e41 100644 > --- a/xen/include/xsm/xsm.h > +++ b/xen/include/xsm/xsm.h > @@ -643,11 +643,15 @@ static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, str > > #endif /* XSM_NO_WRAPPERS */ > > -extern int xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)); > -extern int xsm_policy_init(unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)); > +#ifdef CONFIG_MULTIBOOT > +extern int xsm_multiboot_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)); > +extern int xsm_multiboot_policy_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)); > +#endif > + > extern int register_xsm(struct xsm_operations *ops); > extern int unregister_xsm(struct xsm_operations *ops); > > @@ -658,12 +662,15 @@ extern void xsm_fixup_ops(struct xsm_operations *ops); > > #include <xsm/dummy.h> > > -static inline int xsm_init (unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +static inline int xsm_multiboot_init (unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)) > { > return 0; > } > +#endif > + > #endif /* XSM_ENABLE */ > > #endif /* __XSM_H */ > diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c > index b16c071..11a9ca7 100644 > --- a/xen/xsm/xsm_core.c > +++ b/xen/xsm/xsm_core.c > @@ -43,8 +43,10 @@ static void __init do_xsm_initcalls(void) > } > } > > -int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +int __init xsm_multiboot_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)) > { > int ret = 0; > > @@ -52,7 +54,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > > if ( XSM_MAGIC ) > { > - ret = xsm_policy_init(module_map, mbi, bootstrap_map); > + ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); > if ( ret ) > { > bootstrap_map(NULL); > @@ -75,6 +77,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, > > return 0; > } > +#endif > > int register_xsm(struct xsm_operations *ops) > { > diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c > index 0186f30..3d5f66a 100644 > --- a/xen/xsm/xsm_policy.c > +++ b/xen/xsm/xsm_policy.c > @@ -19,15 +19,18 @@ > */ > > #include <xsm/xsm.h> > +#ifdef CONFIG_MULTIBOOT > #include <xen/multiboot.h> > +#endif > #include <xen/bitops.h> > > char *__initdata policy_buffer = NULL; > u32 __initdata policy_size = 0; > > -int __init xsm_policy_init(unsigned long *module_map, > - const multiboot_info_t *mbi, > - void *(*bootstrap_map)(const module_t *)) > +#ifdef CONFIG_MULTIBOOT > +int __init xsm_multiboot_policy_init(unsigned long *module_map, > + const multiboot_info_t *mbi, > + void *(*bootstrap_map)(const module_t *)) > { > int i; > module_t *mod = (module_t *)__va(mbi->mods_addr); > @@ -65,3 +68,4 @@ int __init xsm_policy_init(unsigned long *module_map, > > return rc; > } > +#endif >
On Thu, 2014-03-13 at 10:36 -0400, Daniel De Graaf wrote: > On 03/12/2014 12:16 PM, Julien Grall wrote: > > Multiboot protocol is only used by x86. When XSM support for ARM will be > > introduced, another way will be used to retrieve the policy blob. > > > > Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and > > rename xsm_init into xsm_multiboot_init to avoid confusion. > > > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Cc: Keir Fraser <keir@xen.org> > > Cc: Jan Beulich <jbeulich@suse.com> > > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> > > Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> FWIW: Acked-by: Ian Campbell <ian.campbell@citrix.com>
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4dbf2b7..e9c2c51 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1251,7 +1251,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) bitmap_fill(module_map, mbi->mods_count); __clear_bit(0, module_map); /* Dom0 kernel is always first */ - xsm_init(module_map, mbi, bootstrap_map); + xsm_multiboot_init(module_map, mbi, bootstrap_map); microcode_grab_module(module_map, mbi, bootstrap_map); diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 99d0e2c..24f95a3 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -52,6 +52,8 @@ #define CONFIG_KEXEC 1 #define CONFIG_WATCHDOG 1 +#define CONFIG_MULTIBOOT 1 + #define HZ 100 #define OPT_CONSOLE_STR "vga" diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 15acb3b..4863e41 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -643,11 +643,15 @@ static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, str #endif /* XSM_NO_WRAPPERS */ -extern int xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); -extern int xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); +#ifdef CONFIG_MULTIBOOT +extern int xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +extern int xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +#endif + extern int register_xsm(struct xsm_operations *ops); extern int unregister_xsm(struct xsm_operations *ops); @@ -658,12 +662,15 @@ extern void xsm_fixup_ops(struct xsm_operations *ops); #include <xsm/dummy.h> -static inline int xsm_init (unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +static inline int xsm_multiboot_init (unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { return 0; } +#endif + #endif /* XSM_ENABLE */ #endif /* __XSM_H */ diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index b16c071..11a9ca7 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -43,8 +43,10 @@ static void __init do_xsm_initcalls(void) } } -int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int ret = 0; @@ -52,7 +54,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, if ( XSM_MAGIC ) { - ret = xsm_policy_init(module_map, mbi, bootstrap_map); + ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); if ( ret ) { bootstrap_map(NULL); @@ -75,6 +77,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, return 0; } +#endif int register_xsm(struct xsm_operations *ops) { diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 0186f30..3d5f66a 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -19,15 +19,18 @@ */ #include <xsm/xsm.h> +#ifdef CONFIG_MULTIBOOT #include <xen/multiboot.h> +#endif #include <xen/bitops.h> char *__initdata policy_buffer = NULL; u32 __initdata policy_size = 0; -int __init xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int i; module_t *mod = (module_t *)__va(mbi->mods_addr); @@ -65,3 +68,4 @@ int __init xsm_policy_init(unsigned long *module_map, return rc; } +#endif
Multiboot protocol is only used by x86. When XSM support for ARM will be introduced, another way will be used to retrieve the policy blob. Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and rename xsm_init into xsm_multiboot_init to avoid confusion. Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: Keir Fraser <keir@xen.org> Cc: Jan Beulich <jbeulich@suse.com> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> --- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/config.h | 2 ++ xen/include/xsm/xsm.h | 23 +++++++++++++++-------- xen/xsm/xsm_core.c | 9 ++++++--- xen/xsm/xsm_policy.c | 10 +++++++--- 5 files changed, 31 insertions(+), 15 deletions(-)