Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39216 )
Change subject: arch-arm: dtb_addr is already encoding the loadAddrOffset
..
arch-arm: dtb_addr is already encoding the loadAddrOffset
This fixes a bug in AArch32 where the dtb_address is
adding the loadAddrOffset twice to the dtb base address
after
https://gem5-review.googlesource.com/c/public/gem5/+/35076
Change-Id: Ia8bd35a02d998c54fbc3a889739c9abbeb506d96
Signed-off-by: Giacomo Travaglini
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39216
Reviewed-by: Ciro Santilli
Tested-by: kokoro
---
M src/arch/arm/freebsd/fs_workload.cc
M src/arch/arm/linux/fs_workload.cc
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ciro Santilli: Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/freebsd/fs_workload.cc
b/src/arch/arm/freebsd/fs_workload.cc
index 8eb3c70..cc0151b 100644
--- a/src/arch/arm/freebsd/fs_workload.cc
+++ b/src/arch/arm/freebsd/fs_workload.cc
@@ -95,7 +95,7 @@
// Kernel supports flattened device tree and dtb file specified.
// Using Device Tree Blob to describe system configuration.
inform("Loading DTB file: %s at address %#x\n", params().dtb_filename,
-params().dtb_addr + _loadAddrOffset);
+params().dtb_addr);
auto *dtb_file = new ::Loader::DtbFile(params().dtb_filename);
@@ -108,7 +108,7 @@
bootReleaseAddr = ra & ~ULL(0x7F);
dtb_file->buildImage().
-offset(params().dtb_addr + _loadAddrOffset).
+offset(params().dtb_addr).
write(system->physProxy);
delete dtb_file;
@@ -116,7 +116,7 @@
for (auto *tc: system->threads) {
tc->setIntReg(0, 0);
tc->setIntReg(1, params().machine_type);
-tc->setIntReg(2, params().dtb_addr + _loadAddrOffset);
+tc->setIntReg(2, params().dtb_addr);
}
}
diff --git a/src/arch/arm/linux/fs_workload.cc
b/src/arch/arm/linux/fs_workload.cc
index f05fd6f..b296b68 100644
--- a/src/arch/arm/linux/fs_workload.cc
+++ b/src/arch/arm/linux/fs_workload.cc
@@ -151,7 +151,7 @@
DPRINTF(Loader, "Boot atags was %d bytes in total\n", size << 2);
DDUMP(Loader, boot_data, size << 2);
-system->physProxy.writeBlob(params().dtb_addr + _loadAddrOffset,
+system->physProxy.writeBlob(params().dtb_addr,
boot_data, size << 2);
delete[] boot_data;
@@ -170,7 +170,7 @@
for (auto *tc: system->threads) {
tc->setIntReg(0, 0);
tc->setIntReg(1, params().machine_type);
-tc->setIntReg(2, params().dtb_addr + _loadAddrOffset);
+tc->setIntReg(2, params().dtb_addr);
}
}
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39216
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ia8bd35a02d998c54fbc3a889739c9abbeb506d96
Gerrit-Change-Number: 39216
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
