| Message ID | 20241006214956.24339-24-dpsmith@apertussolutions.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Boot modules for Hyperlaunch | expand |
On 2024-10-06 17:49, Daniel P. Smith wrote: > Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> > --- > xen/arch/x86/setup.c | 2 +- > xen/include/xsm/xsm.h | 9 +++------ > xen/xsm/xsm_core.c | 6 ++---- > xen/xsm/xsm_policy.c | 5 +---- > 4 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c > index 921bb254b9d1..a22367a62e93 100644 > --- a/xen/xsm/xsm_policy.c > +++ b/xen/xsm/xsm_policy.c > @@ -42,7 +41,6 @@ int __init xsm_multiboot_policy_init( > > /* > * Try all modules and see whichever could be the binary policy. > - * Adjust module_map for the module that is the binary policy. > */ You can collapse to a single line comment /* ... */ With that: Reviewed-by: Jason Andryuk <jason.andryuk@amd.com> > for ( i = bi->nr_modules-1; i >= 1; i-- ) > {
On 10/8/24 12:36, Jason Andryuk wrote: > On 2024-10-06 17:49, Daniel P. Smith wrote: >> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> >> --- >> xen/arch/x86/setup.c | 2 +- >> xen/include/xsm/xsm.h | 9 +++------ >> xen/xsm/xsm_core.c | 6 ++---- >> xen/xsm/xsm_policy.c | 5 +---- >> 4 files changed, 7 insertions(+), 15 deletions(-) >> > >> diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c >> index 921bb254b9d1..a22367a62e93 100644 >> --- a/xen/xsm/xsm_policy.c >> +++ b/xen/xsm/xsm_policy.c > >> @@ -42,7 +41,6 @@ int __init xsm_multiboot_policy_init( >> /* >> * Try all modules and see whichever could be the binary policy. >> - * Adjust module_map for the module that is the binary policy. >> */ > > You can collapse to a single line comment /* ... */ Ack. > With that: > Reviewed-by: Jason Andryuk <jason.andryuk@amd.com> Thank you. v/r, dps
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 90acd4180441..b0946216ea3f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1865,7 +1865,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) mmio_ro_ranges = rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); - xsm_multiboot_init(module_map, bi); + xsm_multiboot_init(bi); /* * IOMMU-related ACPI table parsing may require some of the system domains diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 9e511ef8878c..791936e5285b 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -781,11 +781,9 @@ static inline int xsm_argo_send(const struct domain *d, const struct domain *t) #endif /* XSM_NO_WRAPPERS */ #ifdef CONFIG_MULTIBOOT -int xsm_multiboot_init( - unsigned long *module_map, const struct boot_info *bi); +int xsm_multiboot_init(struct boot_info *bi); int xsm_multiboot_policy_init( - unsigned long *module_map, const struct boot_info *bi, - void **policy_buffer, size_t *policy_size); + struct boot_info *bi, void **policy_buffer, size_t *policy_size); #endif #ifdef CONFIG_HAS_DEVICE_TREE @@ -831,8 +829,7 @@ static const inline struct xsm_ops *silo_init(void) #include <xsm/dummy.h> #ifdef CONFIG_MULTIBOOT -static inline int xsm_multiboot_init ( - unsigned long *module_map, const struct boot_info *bi) +static inline int xsm_multiboot_init(struct boot_info *bi) { return 0; } diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 69d3800d4c39..0e74b96a4cc7 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -140,8 +140,7 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) } #ifdef CONFIG_MULTIBOOT -int __init xsm_multiboot_init( - unsigned long *module_map, struct boot_info *bi) +int __init xsm_multiboot_init(struct boot_info *bi) { int ret = 0; void *policy_buffer = NULL; @@ -151,8 +150,7 @@ int __init xsm_multiboot_init( if ( XSM_MAGIC ) { - ret = xsm_multiboot_policy_init(module_map, bi, &policy_buffer, - &policy_size); + ret = xsm_multiboot_policy_init(bi, &policy_buffer, &policy_size); if ( ret ) { bootstrap_map(NULL); diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 921bb254b9d1..a22367a62e93 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -32,8 +32,7 @@ #ifdef CONFIG_MULTIBOOT int __init xsm_multiboot_policy_init( - unsigned long *module_map, struct boot_info *bi, - void **policy_buffer, size_t *policy_size) + struct boot_info *bi, void **policy_buffer, size_t *policy_size) { int i; int rc = 0; @@ -42,7 +41,6 @@ int __init xsm_multiboot_policy_init( /* * Try all modules and see whichever could be the binary policy. - * Adjust module_map for the module that is the binary policy. */ for ( i = bi->nr_modules-1; i >= 1; i-- ) { @@ -60,7 +58,6 @@ int __init xsm_multiboot_policy_init( printk("Policy len %#lx, start at %p.\n", _policy_len,_policy_start); - __clear_bit(i, module_map); bi->mods[i].type = BOOTMOD_XSM_POLICY; break;
Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- xen/arch/x86/setup.c | 2 +- xen/include/xsm/xsm.h | 9 +++------ xen/xsm/xsm_core.c | 6 ++---- xen/xsm/xsm_policy.c | 5 +---- 4 files changed, 7 insertions(+), 15 deletions(-)