vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/nubus-device: round Declaration ROM memory region address to qemu_target_page_size() 

Declaration ROM binary images can be any arbitrary size, however if a host ROM
memory region is not aligned to qemu_target_page_size() then we fail the
"assert(!(iotlb & ~TARGET_PAGE_MASK))" check in tlb_set_page_full().

Ensure that the host ROM memory region is aligned to qemu_target_page_size()
and adjust the offset at which the Declaration ROM image is loaded, since Nubus
ROM images are unusual in that they are aligned to the end of the slot address
space.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20240111102954.449462-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
master
Mark Cave-Ayland 2024-01-11 10:29:52 +00:00 committed by Philippe Mathieu-Daudé
parent 491da0af99
commit 9cda31193b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/nubus/nubus-device.c
View File

@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "qemu/datadir.h"
#include "exec/target_page.h"
#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/nubus/nubus.h"
@ -30,7 +31,8 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
NubusDevice *nd = NUBUS_DEVICE(dev);
char *name, *path;
hwaddr slot_offset;
int64_t size;
int64_t size, align_size;
uint8_t *rom_ptr;
int ret;
/* Super */
@ -76,16 +78,24 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
}
name = g_strdup_printf("nubus-slot-%x-declaration-rom", nd->slot);
memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, size,
/*
* Ensure ROM memory region is aligned to target page size regardless
* of the size of the Declaration ROM image
*/
align_size = ROUND_UP(size, qemu_target_page_size());
memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, align_size,
&error_abort);
ret = load_image_mr(path, &nd->decl_rom);
rom_ptr = memory_region_get_ram_ptr(&nd->decl_rom);
ret = load_image_size(path, rom_ptr + (uintptr_t)(align_size - size),
size);
g_free(path);
g_free(name);
if (ret < 0) {
error_setg(errp, "could not load romfile \"%s\"", nd->romfile);
return;
}
memory_region_add_subregion(&nd->slot_mem, NUBUS_SLOT_SIZE - size,
memory_region_add_subregion(&nd->slot_mem, NUBUS_SLOT_SIZE - align_size,
&nd->decl_rom);
}
}