mac_oldworld: Allow loading binary ROM image
PATCH v9 1/1 mac_oldworld: Allow loading binary ROM image
The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of the rom region and fall back to loading a binary image with -bios if loading ELF image failed. This allows testing emulation with a ROM image from real hardware as well as using an ELF OpenBIOS image.
---
v9: Revert change from v8, back to the same as v7 rebased on latest
hw/ppc/mac_oldworld.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
hw/ppc/mac_oldworld.c +20 -9
@@ -59,6 +59,8 @@#define NDRV_VGA_FILENAME "qemu_vga.ndrv"#define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB)static void fw_cfg_boot_set (void *opaque,const char *boot_device,Error **errp)
@@ -100,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine)SysBusDevice *s;DeviceState *dev, *pic_dev;BusState *adb_bus; +uint64_t bios_addr;int bios_size;unsigned int smp_cpus = machine->smp.cpus;uint16_t ppc_boot_device;
@@ -128,24 +131,32 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , machine->ram); -/* allocate and load BIOS */ -memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , +/* allocate and load firmware ROM */ +memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,PROM_SIZE , &error_fatal); +memory_region_add_subregion (sysmem,PROM_BASE , bios); -if (bios_name ==NULL ) +if (!bios_name) { bios_name =PROM_FILENAME ; + } filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_add_subregion (sysmem,PROM_ADDR , bios); - -/* Load OpenBIOS (ELF) */ if (filename) { - bios_size =load_elf (filename,NULL ,0 ,NULL ,NULL ,NULL ,NULL ,NULL , -1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Load OpenBIOS (ELF) */ + bios_size =load_elf (filename,NULL ,NULL ,NULL ,NULL , &bios_addr, +NULL ,NULL ,1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Unfortunately, load_elf sign-extends reading elf32 */ + bios_addr = (uint32_t )bios_addr; + +if (bios_size <=0 ) { +/* or load binary ROM image */ + bios_size =load_image_targphys (filename,PROM_BASE ,PROM_SIZE ); + bios_addr =PROM_BASE ; + }g_free (filename); }else { bios_size =-1 ; } -if (bios_size <0 || bios_size >BIOS_SIZE ) { +if (bios_size <0 || bios_addr -PROM_BASE + bios_size >PROM_SIZE ) {error_report ("could not load PowerPC bios '%s'" , bios_name);exit (1 ); }
Signature · 1 line
2.21.3
+Alistair for loader
Quoted 50 lines · BALATON Zoltan via
The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of the rom region and fall back to loading a binary image with -bios if loading ELF image failed. This allows testing emulation with a ROM image from real hardware as well as using an ELF OpenBIOS image.
Signed-off-by BALATON Zoltan <[email protected]>Reviewed-by Mark Cave-Ayland <[email protected]>---
v9: Revert change from v8, back to the same as v7 rebased on latesthw/ppc/mac_oldworld.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)hw/ppc/mac_oldworld.c +8
-3@@ -59,6 +59,8 @@#define NDRV_VGA_FILENAME "qemu_vga.ndrv"#define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB)static void fw_cfg_boot_set (void *opaque,const char *boot_device,Error **errp)@@ -100,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine)SysBusDevice *s;DeviceState *dev, *pic_dev;BusState *adb_bus; +uint64_t bios_addr;int bios_size;unsigned int smp_cpus = machine->smp.cpus;uint16_t ppc_boot_device;@@ -128,24 +131,32 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , machine->ram); -/* allocate and load BIOS */ -memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , +/* allocate and load firmware ROM */ +memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,PROM_SIZE , &error_fatal); +memory_region_add_subregion (sysmem,PROM_BASE , bios); -if (bios_name ==NULL ) +if (!bios_name) { bios_name =PROM_FILENAME ; + } filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);
hw/ppc/mac_oldworld.c static void ppc_heathrow_init(MachineState *machine) · line 147
Quoted 10 lines
hw/ppc/mac_oldworld.c +4
-5-memory_region_add_subregion (sysmem,PROM_ADDR , bios); - -/* Load OpenBIOS (ELF) */ if (filename) { - bios_size =load_elf (filename,NULL ,0 ,NULL ,NULL ,NULL ,NULL ,NULL , -1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Load OpenBIOS (ELF) */ + bios_size =load_elf (filename,NULL ,NULL ,NULL ,NULL , &bios_addr, +NULL ,NULL ,1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Unfortunately, load_elf sign-extends reading elf32 */
Maybe this is what translate_fn() is for?
uint64_t oldworld_phys(void *opaque, uint64_t addr)
{
return addr & UINT32_MAX;
}Using as (untested):
bios_size = load_elf(filename, NULL, oldworld_phys, NULL,
NULL, &bios_addr, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
Quoted 17 lines
hw/ppc/mac_oldworld.c +8
-1+ bios_addr = (uint32_t )bios_addr; + +if (bios_size <=0 ) { +/* or load binary ROM image */ + bios_size =load_image_targphys (filename,PROM_BASE ,PROM_SIZE ); + bios_addr =PROM_BASE ; + }g_free (filename); }else { bios_size =-1 ; } -if (bios_size <0 || bios_size >BIOS_SIZE ) { +if (bios_size <0 || bios_addr -PROM_BASE + bios_size >PROM_SIZE ) {error_report ("could not load PowerPC bios '%s'" , bios_name);exit (1 ); }
Quoted 67 lines · Philippe Mathieu-Daudé
+Alistair for loader
Quoted 46 lines · BALATON Zoltan via
The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of the rom region and fall back to loading a binary image with -bios if loading ELF image failed. This allows testing emulation with a ROM image from real hardware as well as using an ELF OpenBIOS image.
Signed-off-by BALATON Zoltan <[email protected]>Reviewed-by Mark Cave-Ayland <[email protected]>---
v9: Revert change from v8, back to the same as v7 rebased on latesthw/ppc/mac_oldworld.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)hw/ppc/mac_oldworld.c +8
-2@@ -59,6 +59,8 @@#define NDRV_VGA_FILENAME "qemu_vga.ndrv"#define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB)static void fw_cfg_boot_set (void *opaque,const char *boot_device,Error **errp)@@ -100,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine)SysBusDevice *s;DeviceState *dev, *pic_dev;BusState *adb_bus; +uint64_t bios_addr;int bios_size;unsigned int smp_cpus = machine->smp.cpus;uint16_t ppc_boot_device;@@ -128,24 +131,32 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , machine->ram); -/* allocate and load BIOS */ -memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , +/* allocate and load firmware ROM */ +memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,PROM_SIZE , &error_fatal); +memory_region_add_subregion (sysmem,PROM_BASE , bios); - if (bios_name == NULL) +if (!bios_name) { bios_name =PROM_FILENAME ; + } filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_add_subregion (sysmem,PROM_ADDR , bios);hw/ppc/mac_oldworld.c static void ppc_heathrow_init(MachineState *machine) · line 147
Quoted 10 lines
hw/ppc/mac_oldworld.c +4
-4- -/* Load OpenBIOS (ELF) */ if (filename) { - bios_size =load_elf (filename,NULL ,0 ,NULL ,NULL ,NULL ,NULL ,NULL , -1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Load OpenBIOS (ELF) */ + bios_size =load_elf (filename,NULL ,NULL ,NULL ,NULL , &bios_addr, +NULL ,NULL ,1 ,PPC_ELF_MACHINE ,0 ,0 ); +/* Unfortunately, load_elf sign-extends reading elf32 */ Maybe this is what
translate_fn()is for?
uint64_toldworld_phys(void *opaque, uint64_t addr){ return addr & UINT32_MAX; }
Quoted 5 lines
Using as (untested):
bios_size= load_elf(filename, NULL,oldworld_phys, NULL,
NULL,&bios_addr, NULL, NULL, 1,PPC_ELF_MACHINE, 0, 0);
Please don't come up with any more great ideas for this patch unless you also propose a replacement and test it. This one works and we could just get this in as it is until the real problem with load_elf is fixed at which point all this can be removed so no need to be more sophisticated as the simple cast I have. As you can see in the original discussion:
problem is really in include/hw/elf_ops.h this is just a work around for that as I did not want to break anything I can't test so I'd rather fix it up here and let you fix load_elf then drop this cast. But unless you can do that before the freeze please don't hold up this patch any more.
Regards,
BALATON Zoltan
Quoted 21 lines
Quoted 18 lines
hw/ppc/mac_oldworld.c +8
-1+ bios_addr = (uint32_t )bios_addr; + +if (bios_size <=0 ) { +/* or load binary ROM image */ + bios_size =load_image_targphys (filename,PROM_BASE ,PROM_SIZE ); + bios_addr =PROM_BASE ; + }g_free (filename); }else { bios_size =-1 ; } -if (bios_size <0 || bios_size >BIOS_SIZE ) { +if (bios_size <0 || bios_addr -PROM_BASE + bios_size >PROM_SIZE ) {error_report ("could not load PowerPC bios '%s'" , bios_name);exit (1 ); }
Quoted 70 lines · BALATON Zoltan via
Quoted 69 lines · Philippe Mathieu-Daudé
+Alistair for loader
Quoted 50 lines · BALATON Zoltan via
The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of the rom region and fall back to loading a binary image with -bios if loading ELF image failed. This allows testing emulation with a ROM image from real hardware as well as using an ELF OpenBIOS image.
Signed-off-by BALATON Zoltan <[email protected]>Reviewed-by Mark Cave-Ayland <[email protected]>---
v9: Revert change from v8, back to the same as v7 rebased on latest
hw/ppc/mac_oldworld.c| 29 ++++++++++++++++++++---------1 file changed, 20 insertions(+), 9 deletions(-)hw/ppc/mac_oldworld.c +3
-0@@ -59,6 +59,8 @@ #define NDRV_VGA_FILENAME "qemu_vga.ndrv" #define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB) static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp)@@ -100,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine) SysBusDevice *s; DeviceState *dev, *pic_dev; BusState *adb_bus; + uint64_t bios_addr; int bios_size; unsigned int smp_cpus = machine->smp.cpus; uint16_t ppc_boot_device;@@ -128,24 +131,32 @@ static void ppc_heathrow_init(MachineState *machine) memory_region_add_subregion(sysmem, 0, machine->ram);- /* allocate and load BIOS */
- memory_region_init_rom(bios, NULL, "ppc_heathrow.bios",BIOS_SIZE, + /* allocate and load firmware ROM */
+memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE, &error_fatal);
+memory_region_add_subregion(sysmem, PROM_BASE, bios);
- if (bios_name== NULL)
+ if (!bios_name) {
bios_name=PROM_FILENAME;
+ }
filename =qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); -memory_region_add_subregion(sysmem, PROM_ADDR, bios);
-
- /* Load OpenBIOS (ELF) */
if (filename) {Quoted 8 lines
-
bios_size= load_elf(filename, NULL, 0, NULL, NULL, NULL, NULL, NULL,
- 1,PPC_ELF_MACHINE, 0, 0); + /* Load OpenBIOS (ELF) */
+bios_size= load_elf(filename, NULL, NULL, NULL, NULL,&bios_addr,
+ NULL, NULL, 1,PPC_ELF_MACHINE, 0, 0); + /* Unfortunately,load_elfsign-extends reading elf32 */Maybe this is what
translate_fn()is for?
uint64_toldworld_phys(void *opaque, uint64_t addr){
return addr &UINT32_MAX;
}
Quoted 7 lines
Quoted 5 lines
Using as (untested):
bios_size=load_elf(filename, NULL, oldworld_phys, NULL, NULL, &bios_addr, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);Please don't come up with any more great ideas for this patch unless you also propose a replacement and test it. This one works and we could just get this in as it is until the real problem with
load_elfis fixed at which point all this can be removed so no need to be more sophisticated as the simple cast I have.
Zoltan, I'm not trying to block your patch to get merged, I'm asking because I'm trying to understand how this API is expected to be used.
Quoted 32 lines
As you can see in the original discussion:
problem is really in
include/hw/elf_ops.hthis is just a work around for that as I did not want to break anything I can't test so I'd rather fix it up here and let you fixload_elfthen drop this cast. But unless you can do that before the freeze please don't hold up this patch any more.Regards,
BALATON ZoltanQuoted 22 lines
Quoted 19 lines
+
bios_addr= (uint32_t)bios_addr;
+
+ if (bios_size<= 0) {
+ /* or load binary ROM image */
+bios_size=load_image_targphys(filename, PROM_BASE, PROM_SIZE);
+bios_addr=PROM_BASE;
+ }
g_free(filename);
} else {
bios_size= -1;
}- if (bios_size < 0 || bios_size > BIOS_SIZE) { + if (bios_size < 0 || bios_addr - PROM_BASE + bios_size >
PROM_SIZE) {
error_report("could not load PowerPC bios '%s'", bios_name); exit(1);
}
Quoted 73 lines · Philippe Mathieu-Daudé
Quoted 72 lines · BALATON Zoltan via
Quoted 71 lines · Philippe Mathieu-Daudé
+Alistair for loader
Quoted 50 lines · BALATON Zoltan via
The beige G3 Power Macintosh has a 4MB firmware ROM. Fix the size of the rom region and fall back to loading a binary image with -bios if loading ELF image failed. This allows testing emulation with a ROM image from real hardware as well as using an ELF OpenBIOS image.
Signed-off-by BALATON Zoltan <[email protected]>Reviewed-by Mark Cave-Ayland <[email protected]>---
v9: Revert change from v8, back to the same as v7 rebased on latest
hw/ppc/mac_oldworld.c| 29 ++++++++++++++++++++---------1 file changed, 20 insertions(+), 9 deletions(-)hw/ppc/mac_oldworld.c +3
-0@@ -59,6 +59,8 @@ #define NDRV_VGA_FILENAME "qemu_vga.ndrv" #define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB) static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp)@@ -100,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine) SysBusDevice *s; DeviceState *dev, *pic_dev; BusState *adb_bus; + uint64_t bios_addr; int bios_size; unsigned int smp_cpus = machine->smp.cpus; uint16_t ppc_boot_device;@@ -128,24 +131,32 @@ static void ppc_heathrow_init(MachineState *machine) memory_region_add_subregion(sysmem, 0, machine->ram);- /* allocate and load BIOS */
- memory_region_init_rom(bios, NULL, "ppc_heathrow.bios",BIOS_SIZE, + /* allocate and load firmware ROM */
+memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE, &error_fatal);
+memory_region_add_subregion(sysmem, PROM_BASE, bios);
- if (bios_name== NULL)
+ if (!bios_name) {
bios_name=PROM_FILENAME;
+ }
filename =qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); -memory_region_add_subregion(sysmem, PROM_ADDR, bios);
-
- /* Load OpenBIOS (ELF) */
if (filename) {Quoted 8 lines
-
bios_size= load_elf(filename, NULL, 0, NULL, NULL, NULL, NULL, NULL,
- 1,PPC_ELF_MACHINE, 0, 0);
+ /* Load OpenBIOS (ELF) */
+bios_size= load_elf(filename, NULL, NULL, NULL, NULL,&bios_addr,
+ NULL, NULL, 1,PPC_ELF_MACHINE, 0, 0); + /* Unfortunately,load_elfsign-extends reading elf32 */Maybe this is what
translate_fn()is for?
uint64_toldworld_phys(void *opaque, uint64_t addr){
return addr &UINT32_MAX;
}Using as (untested):
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
bios_size=load_elf(filename, NULL, oldworld_phys, NULL, NULL, &bios_addr, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);Please don't come up with any more great ideas for this patch unless you also propose a replacement and test it. This one works and we could just get this in as it is until the real problem with
load_elfis fixed at which point all this can be removed so no need to be more sophisticated as the simple cast I have.Zoltan, I'm not trying to block your patch to get merged,
I didn't say you're trying to do that but based on my past experience any slightest doubt could result in that so I did not want it to miss another freeze now that it's almost got in.
Quoted 2 lines
I'm asking because I'm trying to understand how this API is expected to be used.
Likely nobody knows, this seems to have been evolved into this mess which could be cleaned up but unrelated to this series. Probably nobody dared to touch it so far as it's used by almost every board so breling something is easy and testing it is difficult.
Regards,
BALATON Zoltan
Quoted 33 lines
Quoted 31 lines
As you can see in the original discussion:
problem is really in
include/hw/elf_ops.hthis is just a work around for that as I did not want to break anything I can't test so I'd rather fix it up here and let you fixload_elfthen drop this cast. But unless you can do that before the freeze please don't hold up this patch any more.Regards,
BALATON ZoltanQuoted 22 lines
Quoted 19 lines
+
bios_addr= (uint32_t)bios_addr;
+
+ if (bios_size<= 0) {
+ /* or load binary ROM image */
+bios_size=load_image_targphys(filename, PROM_BASE, PROM_SIZE);
+bios_addr=PROM_BASE;
+ }
g_free(filename);
} else {
bios_size= -1;
}- if (bios_size < 0 || bios_size > BIOS_SIZE) { + if (bios_size < 0 || bios_addr - PROM_BASE + bios_size > PROM_SIZE){
error_report("could not load PowerPC bios '%s'", bios_name); exit(1);
}