From patchwork Tue Dec 31 20:22:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 854421 Delivered-To: patch@linaro.org Received: by 2002:a5d:4888:0:b0:385:e875:8a9e with SMTP id g8csp7090120wrq; Tue, 31 Dec 2024 12:25:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUzgJxdMolQpHZgXvZ0mdFN+qDN2A6AvaVr0doGsXRBDRoCdgi4rsNYMr04zmd0YCf8mQF58A==@linaro.org X-Google-Smtp-Source: AGHT+IE5R7R3yRbhi8FAyF/LPgzPDyUM1oc6QZ+n/gaA7jX7rhYnn4in6NGbf2UUZf1iYuX73rMZ X-Received: by 2002:a05:620a:459f:b0:7b6:dc74:82ac with SMTP id af79cd13be357-7b9ba6efademr6700940485a.1.1735676758051; Tue, 31 Dec 2024 12:25:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1735676758; cv=none; d=google.com; s=arc-20240605; b=U4Qdlyya4oA+3a0ctRWA4wzUkTfqhuSI4alhVxfps85PRapItxwmhsZz/jcPEKXNyx 4iGHvk6YofOe9K1wLxId96GLyNEv4bkoDu0Jtxq+dJTOwKvF6rgJWSANwmfLXwsTUUO6 3pDy6tVVpAxYxc448e9S129OqCd7+7MHYSaZl0ZAe15pa5in8YXBeg4M2YMhKHuu0Oyd pC+Wx8K+Bi3fT0l5ndoUCB5tfPog7WSD41n/Uj2hE/acIBvIC16oGwMDLkttTnFbPHWK NnZbxccWceDWVXV23ARy5HnPuKaUK++YwEPHVSbtnOGXgYaA3aPbqRDAYHN7GgZvQEJT Ao+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Z03rwhPNrlyAf9OxibhkB1UzMsuJ/4hpuze5g8H61yY=; fh=tyn3H0ySGZ/3GeTr+63AnxEBt54onnjIpRgEvvPl10Q=; b=SknRsJV1gIAH0NoFmWo6GmE43YJ2g/snBSQAXcsveZFA7ZDbD0zXOu0j8CJXsfX6vh BKmKAmzX2k4rLuMDOnz6uHIip/EeSqj7lM/iikNk8hqFjkMVeBsbwEmJKLBYzF5Z7zRi Ek10gzc0DHAiGjT8QBm1kAhmmcFVIYMimWbND5YFuhPn99kafwPOPZGlNB/3X5aXyxTy 2/0wack+y37YTsBCXU7VYhJp5SEeDnOybh9BA95HAJ378hIrzNlweUQBD3KsZlnWbQHi GyOml/paieWJGTfCYIv/atrI+tSXCSKPNgy2oddbwi1c7JJ0EJ4JnZUcEYRCWt/ds7G9 4DNQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="S9R9z30/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b9ac5303d0si3074203985a.637.2024.12.31.12.25.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Dec 2024 12:25:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="S9R9z30/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSinE-0000VH-R5; Tue, 31 Dec 2024 15:24:45 -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 1tSinB-0008PT-Bx for qemu-devel@nongnu.org; Tue, 31 Dec 2024 15:24:41 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tSin6-00010p-4b for qemu-devel@nongnu.org; Tue, 31 Dec 2024 15:24:41 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4368a293339so63312925e9.3 for ; Tue, 31 Dec 2024 12:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1735676674; x=1736281474; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z03rwhPNrlyAf9OxibhkB1UzMsuJ/4hpuze5g8H61yY=; b=S9R9z30/LCGtmkhyiMk3NruXJTkOZUD6QrUIwhLP08XoIbKb1n1rjcwBQ+IiQtNUo6 2BTj2h6/XzJqWN6VKHvTHHhVVrmPfyiHdIhznOiMfzks1cvyn/+Ja0WwDc3WFjTQucOj 6EcinhLl9JvnjMzOPoi/CuE2Pt4yXc0aEpkJCmawyMN0CmfD4I4CBdpOMBoKOjhTLbFK UW19eVvzCCq35HIMdCHnWJrk5boMOMBGjK7ESv9mrF0NXGlmQc1GnfLwchHripXFNlpN 53y2vh/RZ7hld+TlB98F1LbuolO/vAprUw6oJfZgC2TkzCrCMNg/AXtuGYYBNwsejJx7 9pxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735676674; x=1736281474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z03rwhPNrlyAf9OxibhkB1UzMsuJ/4hpuze5g8H61yY=; b=kiafVyI5ou7X4wjagBikg+TfLnFxUXVqN/Flxm1oWvRL/ajNp9pOzQL9pXuA1Nm688 WJlJgqD6nS1x3SEUvtVss4yRlXvBVaIwCwwg7owQUiARJL8v4w/fIRBdwZagHnZC2wF0 9bXkWN/UCykFPXMJYBF0bvtk+bCElZI/VApUbIYO8/fbauXLyWuQ0UxZvAxUT9c0I5Cv dcV1eB5d0/ZjMwgnycGXhsxuqyU84I3hkrEpxv/3Qk71qowH65+GZ2t2h7LYIrpKf8IO emIAP7bSUSt/PEItmzEvALYW+WhMMm6MJjMGlpGySZEv0eFC05BQbxT4V9DUS34LbE8M qB8A== X-Gm-Message-State: AOJu0Yz6kBOfMwdZrzV5T8L+P99NjtsfC4luFwKNlnQfg4QfmvtkX5cl 6zmfcRDnYlqVuQf9kzCPxmWYu3rCFS5AnCIWw7w2BMhlLuF1zAYY6+RTIDrMEXhMBDZE6dM0zhV L9bA= X-Gm-Gg: ASbGncs24yKfOBOCKg3Q47ZnV3ZpIClkIv0fnhZsKIvrAPTuqXrodWUh4N2Y1Jefrfh TwLdG4gr3h2GkXOmlnFZyBS3d946pW4O1+ukZ/nmet7ZB+/y8xF94Q2O/2CQYup6UcKOBP4Gl4n OtgcGPwbfXEtU/g6ie5okt7RcfYtIRZHh1NcKnVXD+J5P3EfxmObg0lOWcyWxm5sMxalke3neBH +4PnUPeceQj78/wBB1qCOJ4re9ouLg8SdDOxgFyopN8uHlcqlbWAnOymZW1+bbM+uEPFMceVzev 3m/7qh6YzHfIzeGPluKINwQGV3uhQHk= X-Received: by 2002:a05:600c:1d07:b0:435:192:63fb with SMTP id 5b1f17b1804b1-4366854bf0cmr364112245e9.3.1735676674275; Tue, 31 Dec 2024 12:24:34 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4367086e40esm363320485e9.30.2024.12.31.12.24.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 31 Dec 2024 12:24:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Phil Dennis-Jordan , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 25/29] hw/display/apple-gfx: Adds PCI implementation Date: Tue, 31 Dec 2024 21:22:24 +0100 Message-ID: <20241231202228.28819-26-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241231202228.28819-1-philmd@linaro.org> References: <20241231202228.28819-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Phil Dennis-Jordan This change wires up the PCI variant of the paravirtualised graphics device, mainly useful for x86-64 macOS guests, implemented by macOS's ParavirtualizedGraphics.framework. It builds on code shared with the vmapple/mmio variant of the PVG device. Signed-off-by: Phil Dennis-Jordan Reviewed-by: Akihiko Odaki Message-ID: <20241223221645.29911-4-phil@philjordan.eu> Signed-off-by: Philippe Mathieu-Daudé --- hw/display/apple-gfx.h | 1 + hw/display/Kconfig | 4 + hw/display/apple-gfx-pci.m | 151 +++++++++++++++++++++++++++++++++++++ hw/display/meson.build | 1 + 4 files changed, 157 insertions(+) create mode 100644 hw/display/apple-gfx-pci.m diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h index 4cd4163f223..6c74209b361 100644 --- a/hw/display/apple-gfx.h +++ b/hw/display/apple-gfx.h @@ -14,6 +14,7 @@ #include "ui/surface.h" #define TYPE_APPLE_GFX_MMIO "apple-gfx-mmio" +#define TYPE_APPLE_GFX_PCI "apple-gfx-pci" @class PGDeviceDescriptor; @protocol PGDevice; diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 6a9b7b19ada..2b53dfd7d26 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -149,3 +149,7 @@ config MAC_PVG_MMIO bool depends on MAC_PVG && AARCH64 +config MAC_PVG_PCI + bool + depends on MAC_PVG && PCI + default y if PCI_DEVICES diff --git a/hw/display/apple-gfx-pci.m b/hw/display/apple-gfx-pci.m new file mode 100644 index 00000000000..35a3c7a7ce6 --- /dev/null +++ b/hw/display/apple-gfx-pci.m @@ -0,0 +1,151 @@ +/* + * QEMU Apple ParavirtualizedGraphics.framework device, PCI variant + * + * Copyright © 2023-2024 Phil Dennis-Jordan + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * ParavirtualizedGraphics.framework is a set of libraries that macOS provides + * which implements 3d graphics passthrough to the host as well as a + * proprietary guest communication channel to drive it. This device model + * implements support to drive that library from within QEMU as a PCI device + * aimed primarily at x86-64 macOS VMs. + */ + +#include "qemu/osdep.h" +#include "hw/pci/pci_device.h" +#include "hw/pci/msi.h" +#include "apple-gfx.h" +#include "trace.h" + +#import + +OBJECT_DECLARE_SIMPLE_TYPE(AppleGFXPCIState, APPLE_GFX_PCI) + +struct AppleGFXPCIState { + PCIDevice parent_obj; + + AppleGFXState common; +}; + +static const char *apple_gfx_pci_option_rom_path = NULL; + +static void apple_gfx_init_option_rom_path(void) +{ + NSURL *option_rom_url = PGCopyOptionROMURL(); + const char *option_rom_path = option_rom_url.fileSystemRepresentation; + apple_gfx_pci_option_rom_path = g_strdup(option_rom_path); + [option_rom_url release]; +} + +static void apple_gfx_pci_init(Object *obj) +{ + AppleGFXPCIState *s = APPLE_GFX_PCI(obj); + + if (!apple_gfx_pci_option_rom_path) { + /* + * The following is done on device not class init to avoid running + * ObjC code before fork() in -daemonize mode. + */ + PCIDeviceClass *pci = PCI_DEVICE_CLASS(object_get_class(obj)); + apple_gfx_init_option_rom_path(); + pci->romfile = apple_gfx_pci_option_rom_path; + } + + apple_gfx_common_init(obj, &s->common, TYPE_APPLE_GFX_PCI); +} + +typedef struct AppleGFXPCIInterruptJob { + PCIDevice *device; + uint32_t vector; +} AppleGFXPCIInterruptJob; + +static void apple_gfx_pci_raise_interrupt(void *opaque) +{ + AppleGFXPCIInterruptJob *job = opaque; + + if (msi_enabled(job->device)) { + msi_notify(job->device, job->vector); + } + g_free(job); +} + +static void apple_gfx_pci_interrupt(PCIDevice *dev, uint32_t vector) +{ + AppleGFXPCIInterruptJob *job; + + trace_apple_gfx_raise_irq(vector); + job = g_malloc0(sizeof(*job)); + job->device = dev; + job->vector = vector; + aio_bh_schedule_oneshot(qemu_get_aio_context(), + apple_gfx_pci_raise_interrupt, job); +} + +static void apple_gfx_pci_realize(PCIDevice *dev, Error **errp) +{ + AppleGFXPCIState *s = APPLE_GFX_PCI(dev); + int ret; + + pci_register_bar(dev, PG_PCI_BAR_MMIO, + PCI_BASE_ADDRESS_SPACE_MEMORY, &s->common.iomem_gfx); + + ret = msi_init(dev, 0x0 /* config offset; 0 = find space */, + PG_PCI_MAX_MSI_VECTORS, true /* msi64bit */, + false /* msi_per_vector_mask */, errp); + if (ret != 0) { + return; + } + + @autoreleasepool { + PGDeviceDescriptor *desc = [PGDeviceDescriptor new]; + desc.raiseInterrupt = ^(uint32_t vector) { + apple_gfx_pci_interrupt(dev, vector); + }; + + apple_gfx_common_realize(&s->common, DEVICE(dev), desc, errp); + [desc release]; + desc = nil; + } +} + +static void apple_gfx_pci_reset(Object *obj, ResetType type) +{ + AppleGFXPCIState *s = APPLE_GFX_PCI(obj); + [s->common.pgdev reset]; +} + +static void apple_gfx_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *pci = PCI_DEVICE_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); + + rc->phases.hold = apple_gfx_pci_reset; + dc->desc = "macOS Paravirtualized Graphics PCI Display Controller"; + dc->hotpluggable = false; + set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); + + pci->vendor_id = PG_PCI_VENDOR_ID; + pci->device_id = PG_PCI_DEVICE_ID; + pci->class_id = PCI_CLASS_DISPLAY_OTHER; + pci->realize = apple_gfx_pci_realize; + + /* TODO: Property for setting mode list */ +} + +static const TypeInfo apple_gfx_pci_types[] = { + { + .name = TYPE_APPLE_GFX_PCI, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(AppleGFXPCIState), + .class_init = apple_gfx_pci_class_init, + .instance_init = apple_gfx_pci_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { }, + }, + } +}; +DEFINE_TYPES(apple_gfx_pci_types) + diff --git a/hw/display/meson.build b/hw/display/meson.build index cf9e6dd35d2..94f4f05d36f 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -63,6 +63,7 @@ system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c', 'ati_ if host_os == 'darwin' system_ss.add(when: 'CONFIG_MAC_PVG', if_true: [files('apple-gfx.m'), pvg, metal]) + system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx-pci.m'), pvg, metal]) if cpu == 'aarch64' system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx-mmio.m'), pvg, metal]) endif