Skip to content

Dynamically configure VirtIO node of Device Tree #586

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

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Dynamically configure VirtIO node of Device Tree #586

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
18 changes: 16 additions & 2 deletions src/riscv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,11 @@ static char *realloc_property(char *fdt,
return fdt;
}

static void load_dtb(char **ram_loc, char *bootargs)
static void load_dtb(char **ram_loc, vm_attr_t *attr)
{
#include "minimal_dtb.h"
char *bootargs = attr->data.system.bootargs;
char *vblk = attr->data.system.vblk_device;
char *blob = *ram_loc;
char *buf;
size_t len;
Expand All @@ -314,6 +316,18 @@ static void load_dtb(char **ram_loc, char *bootargs)
assert(!err);
}

/* remove the vblk node from soc if it is not specified */
if (!vblk) {
int subnode;
node = fdt_path_offset(blob, "/soc@F0000000");
assert(node >= 0);

subnode = fdt_subnode_offset(blob, node, "virtio@4200000");
assert(subnode >= 0);

assert(fdt_del_node(blob, subnode) == 0);
}

totalsize = fdt_totalsize(blob);
*ram_loc += totalsize;
return;
Expand Down Expand Up @@ -499,7 +513,7 @@ riscv_t *rv_create(riscv_user_t rv_attr)

uint32_t dtb_addr = attr->mem->mem_size - DTB_SIZE;
ram_loc = ((char *) attr->mem->mem_base) + dtb_addr;
load_dtb(&ram_loc, attr->data.system.bootargs);
load_dtb(&ram_loc, attr);
rv_log_info("DTB loaded");
/*
* Load optional initrd image at last 8 MiB before the dtb region to
Expand Down
Loading