arch-arm: inform bootloader of kernel position with a register
Before the commit, the bootloader had a hardcoded entry point that it would jump to. However, the Linux kernel arm64 v5.8 forced us to change the kernel entry point because the required memory alignment has changed at: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ commit/?h=v5.8&id=cfa7ede20f133cc81cef01dc3a516dda3a9721ee Therefore the only way to have a single bootloader that boots both pre-v5.8 and post-v5.8 kernels is to pass that information from gem5 to the bootloader, which we do in this patch via registers. This approach was already used by the 32-bit bootloader, which passed that value via r3, and we try to use the same register x3 in 64-bit. Since we are now passing this information, the this patch also removes the hardcoding of DTB and cpu-release-addr, and also passes those values via registers. We store the cpu-release-addr in x5 as that value appears to have a function similar to flags_addr, which is used only in 32-bit arm and gets stored in r5. This commit renames atags_addr to dtb_addr, since both are mutually exclusive, and serve a similar purpose, DTB being the newer recommended approach. Similarly, flags_addr is renamed to cpu_release_addr, and it is moved from ArmSystem into ArmFsWorkload, since it is not an intrinsic system property, and should be together with dtb_addr instead. Before this commit, flags_addr was being set from FSConfig.py and configs/example/arm/devices.py to self.realview.realview_io.pio_addr + 0x30. This commit moves that logic into RealView.py instead, and sets the flags address 8 bytes before the start of the DTB address. JIRA: https://gem5.atlassian.net/browse/GEM5-787 Change-Id: If70bea9690be04b84e6040e256a9b03e46710e10 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35076 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
@@ -713,10 +713,11 @@ class RealView(Platform):
|
||||
self._attach_mem(self._off_chip_memory(), bus, mem_ports)
|
||||
self._attach_io(self._off_chip_devices(), bus, dma_ports)
|
||||
|
||||
def setupBootLoader(self, cur_sys, boot_loader, atags_addr, load_offset):
|
||||
def setupBootLoader(self, cur_sys, boot_loader, dtb_addr, load_offset):
|
||||
cur_sys.workload.boot_loader = boot_loader
|
||||
cur_sys.workload.atags_addr = atags_addr
|
||||
cur_sys.workload.load_addr_offset = load_offset
|
||||
cur_sys.workload.dtb_addr = load_offset + dtb_addr
|
||||
cur_sys.workload.cpu_release_addr = cur_sys.workload.dtb_addr - 8
|
||||
|
||||
def generateDeviceTree(self, state):
|
||||
node = FdtNode("/") # Things in this module need to end up in the root
|
||||
@@ -734,8 +735,11 @@ class RealView(Platform):
|
||||
cpu.append(FdtPropertyStrings('enable-method', 'psci'))
|
||||
else:
|
||||
cpu.append(FdtPropertyStrings("enable-method", "spin-table"))
|
||||
# The kernel writes the entry addres of secondary CPUs to this
|
||||
# address before waking up secondary CPUs.
|
||||
# The gem5 bootloader then makes secondary CPUs jump to it.
|
||||
cpu.append(FdtPropertyWords("cpu-release-addr", \
|
||||
state.addrCells(0x8000fff8)))
|
||||
state.addrCells(system.workload.cpu_release_addr)))
|
||||
|
||||
class VExpress_EMM(RealView):
|
||||
_mem_regions = [ AddrRange('2GB', size='2GB') ]
|
||||
|
||||
Reference in New Issue
Block a user