|
| From: | BALATON Zoltan |
| Subject: | Re: [PATCH v7 3/7] mac_{old,new}world: Pass MacOS VGA NDRV in card ROM instead of fw_cfg |
| Date: | Sun, 22 Jan 2023 23:16:35 +0100 (CET) |
On Sun, 22 Jan 2023, Mark Cave-Ayland wrote:
On 11/01/2023 00:54, BALATON Zoltan wrote:On Tue, 10 Jan 2023, Mark Cave-Ayland wrote:On 04/01/2023 21:59, BALATON Zoltan wrote:OpenBIOS cannot run FCode ROMs yet but it can detect NDRV in VGA card ROM and add it to the device tree for MacOS. Pass the NDRV this way instead of via fw_cfg. This solves the problem with OpenBIOS also adding the NDRV to ati-vga which it does not work with. This does not need any changes to OpenBIOS as this NDRV ROM handling is already there but this patch also allows simplifying OpenBIOS later to remove the fw_cfg ndrv handling from the vga FCode and also drop the vga-ndrv? option which is not needed any more as users can disable the ndrv with -device VGA,romfile="" (or override it with their own NDRV or ROM). Once FCode support is implemented in OpenBIOS, the proper FCode ROM can be set the same way so this paves the way to remove some hacks. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/ppc/mac_newworld.c | 18 ++++++------------ hw/ppc/mac_oldworld.c | 18 ++++++------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 460c14b5e3..60c9c27986 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -510,18 +510,6 @@ static void ppc_core99_init(MachineState *machine) fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_BUSFREQ, BUSFREQ); fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_NVRAM_ADDR, nvram_addr); - /* MacOS NDRV VGA driver */ - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, NDRV_VGA_FILENAME); - if (filename) { - gchar *ndrv_file; - gsize ndrv_size; -- if (g_file_get_contents(filename, &ndrv_file, &ndrv_size, NULL)) { - fw_cfg_add_file(fw_cfg, "ndrv/qemu_vga.ndrv", ndrv_file, ndrv_size);- } - g_free(filename); - } - qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); }@@ -565,6 +553,11 @@ static int core99_kvm_type(MachineState *machine, const char *arg)return 2; } +static GlobalProperty props[] = { + /* MacOS NDRV VGA driver */ + { "VGA", "romfile", NDRV_VGA_FILENAME }, +}; + static void core99_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc);@@ -585,6 +578,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)#endif mc->default_ram_id = "ppc_core99.ram"; mc->ignore_boot_device_suffixes = true; + compat_props_add(mc->compat_props, props, G_N_ELEMENTS(props)); fwc->get_dev_path = core99_fw_dev_path; } diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 5a7b25a4a8..6a1b1ad47a 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -344,18 +344,6 @@ static void ppc_heathrow_init(MachineState *machine) fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_CLOCKFREQ, CLOCKFREQ); fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_BUSFREQ, BUSFREQ); - /* MacOS NDRV VGA driver */ - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, NDRV_VGA_FILENAME); - if (filename) { - gchar *ndrv_file; - gsize ndrv_size; -- if (g_file_get_contents(filename, &ndrv_file, &ndrv_size, NULL)) { - fw_cfg_add_file(fw_cfg, "ndrv/qemu_vga.ndrv", ndrv_file, ndrv_size);- } - g_free(filename); - } - qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); }@@ -400,6 +388,11 @@ static int heathrow_kvm_type(MachineState *machine, const char *arg)return 2; } +static GlobalProperty props[] = { + /* MacOS NDRV VGA driver */ + { "VGA", "romfile", NDRV_VGA_FILENAME }, +}; + static void heathrow_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc);@@ -420,6 +413,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data)mc->default_display = "std"; mc->ignore_boot_device_suffixes = true; mc->default_ram_id = "ppc_heathrow.ram"; + compat_props_add(mc->compat_props, props, G_N_ELEMENTS(props)); fwc->get_dev_path = heathrow_fw_dev_path; }The qemu_vga.ndrv is deliberately kept separate from the PCI option ROM because it is a binary generated by a separate project: otherwise you'd end up creating a dependency between OpenBIOS and QemuMacDrivers, which is almost impossible to achieve since qemu_vga.ndrv can only (currently) be built in an emulated MacOS 9 guest.I don't get this. The dependency is already there as qemu_vga.ndrv ships with QEMU such as all the vgabios-*.bin and SeaBIOS binaries which are also built from different projects. The qemu_vga.ndrv would also still be part of an FCode ROM together with vga.fs if OpenBIOS could run that so this patch solely changes the way of passing the ROM binary to OpenBIOS from fw_cfg to the card ROM which is closer to how it should be and can direcly be replaced with the FCode ROM later after OpenBIOS will be advanced to that point.Even if OpenBIOS were able to execute PCI option ROMs, the problem is that OpenBIOS cannot generate the qemu_vga.ndrv binary from source and therefore cannot generate the complete ROM by itself. Hence why the existing mechanism exists to inject qemu_vga.ndrv via fw_cfg() so the OpenBIOS ROM is self-contained.
And how does this change by this patch? The ndrv is built separately and included in QEMU currently. This does not change at all. The only thing that changes is that QEMU does not add it to fw_cfg but to the ROM where OpenBIOS adds it to the device tree but it can do it much simpler removing some code to handle downloading the file as it already reads the ROM. The option ROM is not self contained now and it will not be after this patch it's just a different way to solve the same issue simpler. What you don't like about it?
The best way to do this would be to extract the PCI config words from your ATI OpenBIOS patches and the alter drivers/vga.fs so that it only generates the driver,AAPL,MacOS,PowerPC property if the device id and vendor id match that of the QEMU VGA device.This is further down the road and does not block this patch. The config access words should be provided by OpenBIOS not vga.fs. If we want to do it like on the real machine then vga.fs and qemu_vga,ndrv should be together the FCode ROM that the card has and OpenBIOS would run that. This is also how the ATI and NVIDIA ROMs do it which contain some Forth to init the card and add the embedded ndrv to the device tree for MacOS. But that's independent of this patch and needs OpenBIOS changes, while this patch does not need any change in OpenBIOS just moves to that direction to be able to attach a proper FCode ROM sometimes later and simpify fw_cfg handling in OpenBIOS. For now adding the ndrv in the ROM is enough for OpenBIOS as it has additional code to handle it already.The problem you are ultimately trying to solve though is that OpenBIOS is loading the NDRV for all VGA PCI devices, so why not just fix drivers/vga.fs so that the NDRV is loaded only for the QEMU VGA device?So this patch neither adds new dependency to QEMU nor repends on any change in OpenBIOS. It just gets rid of passing files via fw_cfg.Unfortunately that still doesn't solve the problem of building a self-contained OpenBIOS ROM, so this patch isn't the right way forward.
It does take a step to make it possible to eventually add a self contained ROM and remove the vga.fs from OpenBIOS but it's not doing that fully. It just simplifies QEMU and OpenBIOS vga.fs for now and making the ROM also contain the FCode will be a further step but we can't get there if you don't allow to make smaller steps or don't merge my patches for OpenBIOS which would allow it to run FCode ROMs. If you're waiting for all this to be finished I'll give up and it will never be finished. If you allow to progress in smaller steps then maybe we'll get there.
Regards, BALATON Zoltan
| [Prev in Thread] | Current Thread | [Next in Thread] |