Skip to content
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

Only generate a dtb and bus devices if dtb_enabled #1244

Merged
merged 6 commits into from
Feb 7, 2023
Merged

Only generate a dtb and bus devices if dtb_enabled #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5f9165
Pass dtb_file directly to make_dtb
jerryz123 Feb 5, 2023
736a915
Don't reset sim_t if there is no dts for get_dts
jerryz123 Feb 5, 2023
0f79462
Set cfg-provided processor_t.pmp_num before parsing the dtb
jerryz123 Feb 5, 2023
d417d53
Use sv57 paging for rv64 configurations
jerryz123 Feb 5, 2023
85cb2d9
Skip all dts/dtb-related steps if !dtb_enabled
jerryz123 Feb 5, 2023
79d5b9a
Avoid magic number in dts generation's default pmpgranularity
jerryz123 Feb 5, 2023
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
2 changes: 1 addition & 1 deletion riscv/dts.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ std::string make_dts(size_t insns_per_rtc_tick, size_t cpu_hz,
" riscv,isa = \"" << procs[i]->get_isa().get_isa_string() << "\";\n"
" mmu-type = \"riscv," << (procs[i]->get_isa().get_max_xlen() <= 32 ? "sv32" : "sv57") << "\";\n"
" riscv,pmpregions = <" << pmpregions << ">;\n"
" riscv,pmpgranularity = <4>;\n"
" riscv,pmpgranularity = <" << (1 << PMP_SHIFT) << ">;\n"
" clock-frequency = <" << cpu_hz << ">;\n"
" CPU" << i << "_intc: interrupt-controller {\n"
" #address-cells = <2>;\n"
Expand Down
4 changes: 2 additions & 2 deletions riscv/processor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ processor_t::processor_t(const isa_parser_t *isa, const cfg_t *cfg,
register_extension(e.second);

set_pmp_granularity(1 << PMP_SHIFT);
set_pmp_num(state.max_pmp);
set_pmp_num(cfg->pmpregions);

if (isa->get_max_xlen() == 32)
set_mmu_capability(IMPL_MMU_SV32);
else if (isa->get_max_xlen() == 64)
set_mmu_capability(IMPL_MMU_SV48);
set_mmu_capability(IMPL_MMU_SV57);

set_impl(IMPL_MMU_ASID, true);
set_impl(IMPL_MMU_VMID, true);
Expand Down
15 changes: 9 additions & 6 deletions riscv/sim.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ sim_t::sim_t(const cfg_t *cfg, bool halted,
mems(mems),
plugin_devices(plugin_devices),
procs(std::max(cfg->nprocs(), size_t(1))),
dtb_file(dtb_file ? dtb_file : ""),
dtb_enabled(dtb_enabled),
log_file(log_path),
cmd_file(cmd_file),
Expand Down Expand Up @@ -102,7 +101,11 @@ sim_t::sim_t(const cfg_t *cfg, bool halted,
log_file.get(), sout_);
}

make_dtb();
// When running without using a dtb, skip the fdt-based configuration steps
if (!dtb_enabled) return;

// Load dtb_file if provided, otherwise self-generate a dts/dtb
make_dtb(dtb_file);

void *fdt = (void *)dtb.c_str();
scottj97 marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -293,10 +296,10 @@ bool sim_t::mmio_store(reg_t paddr, size_t len, const uint8_t* bytes)
return bus.store(paddr, len, bytes);
}

void sim_t::make_dtb()
void sim_t::make_dtb(const char* dtb_file)
{
if (!dtb_file.empty()) {
std::ifstream fin(dtb_file.c_str(), std::ios::binary);
if (dtb_file) {
std::ifstream fin(dtb_file, std::ios::binary);
if (!fin.good()) {
std::cerr << "can't find dtb file: " << dtb_file << std::endl;
exit(-1);
Expand All @@ -317,7 +320,7 @@ void sim_t::make_dtb()
int fdt_code = fdt_check_header(dtb.c_str());
if (fdt_code) {
std::cerr << "Failed to read DTB from ";
if (dtb_file.empty()) {
if (!dtb_file) {
std::cerr << "auto-generated DTS string";
} else {
std::cerr << "`" << dtb_file << "'";
Expand Down
5 changes: 2 additions & 3 deletions riscv/sim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class sim_t : public htif_t, public simif_t
void set_remote_bitbang(remote_bitbang_t* remote_bitbang) {
this->remote_bitbang = remote_bitbang;
}
const char* get_dts() { if (dts.empty()) reset(); return dts.c_str(); }
const char* get_dts() { return dts.c_str(); }
scottj97 marked this conversation as resolved.
Show resolved Hide resolved
processor_t* get_core(size_t i) { return procs.at(i); }
unsigned nprocs() const { return procs.size(); }

Expand All @@ -66,7 +66,6 @@ class sim_t : public htif_t, public simif_t
std::pair<reg_t, reg_t> initrd_range;
std::string dts;
std::string dtb;
std::string dtb_file;
bool dtb_enabled;
std::unique_ptr<rom_device_t> boot_rom;
std::unique_ptr<clint_t> clint;
Expand Down Expand Up @@ -96,7 +95,7 @@ class sim_t : public htif_t, public simif_t
char* addr_to_mem(reg_t paddr);
bool mmio_load(reg_t paddr, size_t len, uint8_t* bytes);
bool mmio_store(reg_t paddr, size_t len, const uint8_t* bytes);
void make_dtb();
void make_dtb(const char* dtb_file);
void set_rom();

const char* get_symbol(uint64_t paddr);
Expand Down