diff options
author | Benjamin Herrenschmidt | 2014-07-21 05:02:04 +0200 |
---|---|---|
committer | Alexander Graf | 2014-09-08 12:50:48 +0200 |
commit | b7d1f77adaab790d20232df261d4e2ff6a77f556 (patch) | |
tree | 8d8dc8e0f5d377f7bc0919665c76e8f47e2ed375 /include | |
parent | loader: Add load_image_size() to replace load_image() (diff) | |
download | qemu-b7d1f77adaab790d20232df261d4e2ff6a77f556.tar.gz qemu-b7d1f77adaab790d20232df261d4e2ff6a77f556.tar.xz qemu-b7d1f77adaab790d20232df261d4e2ff6a77f556.zip |
spapr: Locate RTAS and device-tree based on real RMA
We currently calculate the final RTAS and FDT location based on
the early estimate of the RMA size, cropped to 256M on KVM since
we only know the real RMA size at reset time which happens much
later in the boot process.
This means the FDT and RTAS end up right below 256M while they
could be much higher, using precious RMA space and limiting
what the OS bootloader can put there which has proved to be
a problem with some OSes (such as when using very large initrd's)
Fortunately, we do the actual copy of the device-tree into guest
memory much later, during reset, late enough to be able to do it
using the final RMA value, we just need to move the calculation
to the right place.
However, RTAS is still loaded too early, so we change the code to
load the tiny blob into qemu memory early on, and then copy it into
guest memory at reset time. It's small enough that the memory usage
doesn't matter.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[aik: fixed errors from checkpatch.pl, defined RTAS_MAX_ADDR]
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
[agraf: fix compilation on 32bit hosts]
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/hw/ppc/spapr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 7fff9794f7..36e8e51435 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -24,7 +24,8 @@ typedef struct sPAPREnvironment { hwaddr rma_size; int vrma_adjust; hwaddr fdt_addr, rtas_addr; - long rtas_size; + ssize_t rtas_size; + void *rtas_blob; void *fdt_skel; target_ulong entry_point; uint64_t rtc_offset; |