hw/arm/virt: Load bios image to MemoryRegion, not physaddr
If we're loading a BIOS image into the first flash device, load it into the flash's memory region specifically, not into the physical address where the flash resides. This will make a difference when the flash might be in the Secure address space rather than the Nonsecure one. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1455288361-30117-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
76151cacfe
commit
16f4a8dc5c
|
@ -696,13 +696,14 @@ static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void create_one_flash(const char *name, hwaddr flashbase,
|
static void create_one_flash(const char *name, hwaddr flashbase,
|
||||||
hwaddr flashsize)
|
hwaddr flashsize, const char *file)
|
||||||
{
|
{
|
||||||
/* Create and map a single flash device. We use the same
|
/* Create and map a single flash device. We use the same
|
||||||
* parameters as the flash devices on the Versatile Express board.
|
* parameters as the flash devices on the Versatile Express board.
|
||||||
*/
|
*/
|
||||||
DriveInfo *dinfo = drive_get_next(IF_PFLASH);
|
DriveInfo *dinfo = drive_get_next(IF_PFLASH);
|
||||||
DeviceState *dev = qdev_create(NULL, "cfi.pflash01");
|
DeviceState *dev = qdev_create(NULL, "cfi.pflash01");
|
||||||
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||||
const uint64_t sectorlength = 256 * 1024;
|
const uint64_t sectorlength = 256 * 1024;
|
||||||
|
|
||||||
if (dinfo) {
|
if (dinfo) {
|
||||||
|
@ -722,7 +723,30 @@ static void create_one_flash(const char *name, hwaddr flashbase,
|
||||||
qdev_prop_set_string(dev, "name", name);
|
qdev_prop_set_string(dev, "name", name);
|
||||||
qdev_init_nofail(dev);
|
qdev_init_nofail(dev);
|
||||||
|
|
||||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, flashbase);
|
sysbus_mmio_map(sbd, 0, flashbase);
|
||||||
|
|
||||||
|
if (file) {
|
||||||
|
char *fn;
|
||||||
|
int image_size;
|
||||||
|
|
||||||
|
if (drive_get(IF_PFLASH, 0, 0)) {
|
||||||
|
error_report("The contents of the first flash device may be "
|
||||||
|
"specified with -bios or with -drive if=pflash... "
|
||||||
|
"but you cannot use both options at once");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, file);
|
||||||
|
if (!fn) {
|
||||||
|
error_report("Could not find ROM image '%s'", file);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
image_size = load_image_mr(fn, sysbus_mmio_get_region(sbd, 0));
|
||||||
|
g_free(fn);
|
||||||
|
if (image_size < 0) {
|
||||||
|
error_report("Could not load ROM image '%s'", file);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void create_flash(const VirtBoardInfo *vbi)
|
static void create_flash(const VirtBoardInfo *vbi)
|
||||||
|
@ -734,31 +758,8 @@ static void create_flash(const VirtBoardInfo *vbi)
|
||||||
hwaddr flashbase = vbi->memmap[VIRT_FLASH].base;
|
hwaddr flashbase = vbi->memmap[VIRT_FLASH].base;
|
||||||
char *nodename;
|
char *nodename;
|
||||||
|
|
||||||
if (bios_name) {
|
create_one_flash("virt.flash0", flashbase, flashsize, bios_name);
|
||||||
char *fn;
|
create_one_flash("virt.flash1", flashbase + flashsize, flashsize, NULL);
|
||||||
int image_size;
|
|
||||||
|
|
||||||
if (drive_get(IF_PFLASH, 0, 0)) {
|
|
||||||
error_report("The contents of the first flash device may be "
|
|
||||||
"specified with -bios or with -drive if=pflash... "
|
|
||||||
"but you cannot use both options at once");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
||||||
if (!fn) {
|
|
||||||
error_report("Could not find ROM image '%s'", bios_name);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
image_size = load_image_targphys(fn, flashbase, flashsize);
|
|
||||||
g_free(fn);
|
|
||||||
if (image_size < 0) {
|
|
||||||
error_report("Could not load ROM image '%s'", bios_name);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
create_one_flash("virt.flash0", flashbase, flashsize);
|
|
||||||
create_one_flash("virt.flash1", flashbase + flashsize, flashsize);
|
|
||||||
|
|
||||||
nodename = g_strdup_printf("/flash@%" PRIx64, flashbase);
|
nodename = g_strdup_printf("/flash@%" PRIx64, flashbase);
|
||||||
qemu_fdt_add_subnode(vbi->fdt, nodename);
|
qemu_fdt_add_subnode(vbi->fdt, nodename);
|
||||||
|
|
Loading…
Reference in New Issue