Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 148A2C54EBC for ; Wed, 11 Jan 2023 00:57:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFPQ8-0001Ra-Mf; Tue, 10 Jan 2023 19:56:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFPQ7-0001RO-4b; Tue, 10 Jan 2023 19:56:47 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFPQ4-0004Zc-R1; Tue, 10 Jan 2023 19:56:46 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 1C833745712; Wed, 11 Jan 2023 01:54:22 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id BE6EB745706; Wed, 11 Jan 2023 01:54:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id BCA0F7456E3; Wed, 11 Jan 2023 01:54:21 +0100 (CET) Date: Wed, 11 Jan 2023 01:54:21 +0100 (CET) From: BALATON Zoltan To: Mark Cave-Ayland cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Subject: Re: [PATCH v7 3/7] mac_{old,new}world: Pass MacOS VGA NDRV in card ROM instead of fw_cfg In-Reply-To: <8e775600-f394-0e9c-9ee9-15dd635275e9@ilande.co.uk> Message-ID: References: <8e775600-f394-0e9c-9ee9-15dd635275e9@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 >> --- >> 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. > 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. 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. Regards, BALATON Zoltan