Skip to content

vm_arm: set fdt pointer and gic name #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chrisguikema wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Draft

vm_arm: set fdt pointer and gic name #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion components/VM_Arm/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,8 @@ static int vmm_init(void)
assert(t_id >= 0);
}

camkes_io_fdt(&(_io_ops.io_fdt));

return 0;
}

Expand Down Expand Up @@ -882,7 +884,6 @@ static int load_linux(vm_t *vm, const char *kernel_name, const char *dtb_name, c
close(dtb_fd);
fdt_ori = (void *)linux_gen_dtb_base_buf;
} else {
camkes_io_fdt(&(_io_ops.io_fdt));
fdt_ori = (void *)ps_io_fdt_get(&_io_ops.io_fdt);
}

Expand Down Expand Up @@ -1156,6 +1157,9 @@ int main_continued(void)
ZF_LOGF_IF(err, "Failed to bind CB to SID");
#endif /* CONFIG_ARM_SMMU */

vm.fdt_ori = (void *)ps_io_fdt_get(&_io_ops.io_fdt);
Copy link
Member

@axel-h axel-h Oct 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will we replace all places where ps_io_fdt_get() is called by vm->fdt_ori then also? E.g. in load_linux() above?

vm.gic_path = GIC_NODE_PATH;
Copy link
Member

@axel-h axel-h Oct 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for splitting the PRs up. Please add the usage of vm->gic_path in generate_fdt() also, so this is the only place where the path's default is set up from the plat constants.


err = vm_create_default_irq_controller(&vm);
assert(!err);

Expand Down