From nobody Mon May 12 05:05:13 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
ARC-Seal: i=1; a=rsa-sha256; t=1734553388; cv=none;
d=zohomail.com; s=zohoarc;
b=ZqBp2P7KVxcGKJokQ4jnbn3ra6xavwRF0rGF7fZquo6aheDFKDN3R0H8kr5QIgVaChIY4juQX3+5QVo5+9xGU1gjuLdrzGdr+U/F5iMR9w3F3l+apu5d66sshtryFLfTUIuw7uClL8CHlBdQY+DJWQoAyqd5LfH5t26VYpm0wdI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734553388;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=l9CSE0Le6C9EUk9Pa8FAy+M2SSGHzc5sfGAFZk3Ode0=;
b=afkkCB6R8gnVHMYXKDDK9Sq6DRO9zaaalMybudOTW/BwOob5kNX/MLgIMr7FWEP6aTLwL395hUbXqYQVXnKh15QMBsVXtVioqZCNvHiekhQniv+G5rSvXC+/ZtSJ0WKD5wNbYEva+Mrl/hzKIoEtB/Q8OwRwa2/WLFl5DZtqb8c=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734553387977755.4516253298611;
Wed, 18 Dec 2024 12:23:07 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tO0XZ-0001KS-N4; Wed, 18 Dec 2024 15:21:05 -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 <phil@philjordan.eu>)
id 1tO0XV-0001Gq-Nb
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:02 -0500
Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <phil@philjordan.eu>)
id 1tO0XR-0000F1-23
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:00 -0500
Received: by mail-wm1-x32e.google.com with SMTP id
5b1f17b1804b1-4361fe642ddso525995e9.2
for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 12:20:56 -0800 (PST)
Received: from localhost.localdomain (h082218084190.host.wavenet.at.
[82.218.84.190]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-388c80120c7sm14842267f8f.13.2024.12.18.12.20.53
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 18 Dec 2024 12:20:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philjordan-eu.20230601.gappssmtp.com; s=20230601; t=1734553255;
x=1735158055;
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=l9CSE0Le6C9EUk9Pa8FAy+M2SSGHzc5sfGAFZk3Ode0=;
b=zCiqflNpWYKQSLwGd13uHq2h73rRlOQgjZlRl88NG8qTcPFl3hFVnPwRwjQfTL8pNX
0e9IWJLIZSa9CbjD3+4CtDcSVoagwYMRK5oaom5r/vrf46H7X/KI1pPrMzb3AI/rEewC
y4C54OvysiOhWKKlfqCJIOfkzoZi1h0GzVXk613LVBFv49Co9DPqp970raBo0UMYVe2+
pHAa+EXhWZckzI9CaurKETsUvrUhqBVQ2oeYpR8xm+bUoaumpEd9bkFKnSsP7GuyAhrQ
IxPgHva/j4x7cvRaxbRtjbASoe+056f+N/lfSFawC9YYs+U9QxasWfmjbHOFbeuR+hlm
ctxQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734553255; x=1735158055;
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=l9CSE0Le6C9EUk9Pa8FAy+M2SSGHzc5sfGAFZk3Ode0=;
b=oO8CCCLt3rUZydsnJP3jYSK2qnt3h5rXZqkqVWR2l2kBzCPGAX6LFIEq0zZPkKGpK4
HekWUts/OE9QY8ydiju3iKrM6BwSgaOBUhl5Jl1QzWsqUOCVGNYzhFJYUN83WZJiI+IO
/1GGkIkU177dRpZj1Q5UllW3WkuCZKdWir1lNl7SuYD/lV34DqdNveop6YYXFX2ioCjr
BHZQsAqUDa2m/Mfwa8b5Yf2k4WCQQUu5CVRBY8cYiFqQUoiGoWBBGGvKmJQ7MclFsEer
mMU/ukzHCZ81kmDkkjp3/m+p85zLVdWBQdt26Ovwd0bsLPzg4L6p5oSDweouduz99M0c
wHPw==
X-Gm-Message-State: AOJu0Yx49pw+gGxYM/Vkgkm/7+20PA4NC1ZxFyiYwMp2j9c7cIFAOPpX
+tCDcS3B0CclNgG0MGdq0ti6HJfhSaYatdUMVNeN+hYcKIIWuSTuAusPYTBiKQzZMhJQARMTat3
CPQ==
X-Gm-Gg: ASbGncvokBuYrfeoctaR2vH6BRUhQKRaGfZy3/VzjR4jJ1imMkUuScnS18zQ4N2db3T
BQRU9x5YSFeOLK1Xu1nopNb1iyk4Xy8lavQCvBdZrso6m+L9YctukocP5tmnfhHZDz3zxN8r/Ml
JnwTtd513kw6JwzarEd/sFTGzRap6Cj7bMuaFcdrFjqCn3Kgh2eyUAxff4W8jw0Z+rn2SI1hQEK
QkTAdMKv3QXyMh4aRG0sqdjhCaWE554KiLEhNF7a1HDwam/824ciM64xae8emWtOjvjk9obxrUo
e9uo5ITF7iC6dVrko+2WSHeU0yF6dLTx
X-Google-Smtp-Source:
AGHT+IEwXIsq2MRPCkF8V6FyRn2mVffqv5b68cYreeuEpKP80m01hVvjxFmjSGqyGul948eQSFl3Ew==
X-Received: by 2002:a05:600c:1d27:b0:434:f753:600f with SMTP id
5b1f17b1804b1-43655395816mr37858925e9.19.1734553255399;
Wed, 18 Dec 2024 12:20:55 -0800 (PST)
From: Phil Dennis-Jordan <phil@philjordan.eu>
To: qemu-devel@nongnu.org
Cc: agraf@csgraf.de, phil@philjordan.eu, peter.maydell@linaro.org,
pbonzini@redhat.com, rad@semihalf.com, quic_llindhol@quicinc.com,
stefanha@redhat.com, mst@redhat.com, slp@redhat.com,
richard.henderson@linaro.org, eduardo@habkost.net,
marcel.apfelbaum@gmail.com, gaosong@loongson.cn, jiaxun.yang@flygoat.com,
chenhuacai@kernel.org, kwolf@redhat.com, hreitz@redhat.com,
philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com,
alistair.francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
jcmvbkbc@gmail.com, marcandre.lureau@redhat.com, berrange@redhat.com,
akihiko.odaki@daynix.com, qemu-arm@nongnu.org, qemu-block@nongnu.org,
qemu-riscv@nongnu.org, balaton@eik.bme.hu
Subject: [PATCH v15 03/15] hw/display/apple-gfx: Adds PCI implementation
Date: Wed, 18 Dec 2024 21:20:24 +0100
Message-Id: <20241218202036.80064-4-phil@philjordan.eu>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20241218202036.80064-1-phil@philjordan.eu>
References: <20241218202036.80064-1-phil@philjordan.eu>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: neutral client-ip=2a00:1450:4864:20::32e;
envelope-from=phil@philjordan.eu; helo=mail-wm1-x32e.google.com
X-Spam_score_int: -10
X-Spam_score: -1.1
X-Spam_bar: -
X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_NEUTRAL=0.779 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @philjordan-eu.20230601.gappssmtp.com)
X-ZM-MESSAGEID: 1734553390519116600
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 <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
v4:
* Threading improvements analogous to those in common apple-gfx code
and mmio device variant.
* Smaller code review issues addressed.
v5:
* Minor error handling improvement.
v6:
* Removed an unused function parameter.
v9:
* Fixup of changed common call.
* Whitespace and comment formatting tweaks.
v11:
* Comment formatting fix.
hw/display/Kconfig | 4 +
hw/display/apple-gfx-pci.m | 150 +++++++++++++++++++++++++++++++++++++
hw/display/meson.build | 1 +
3 files changed, 155 insertions(+)
create mode 100644 hw/display/apple-gfx-pci.m
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
=20
+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..5ff6a487cfc
--- /dev/null
+++ b/hw/display/apple-gfx-pci.m
@@ -0,0 +1,150 @@
+/*
+ * QEMU Apple ParavirtualizedGraphics.framework device, PCI variant
+ *
+ * Copyright =C2=A9 2023-2024 Phil Dennis-Jordan
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * ParavirtualizedGraphics.framework is a set of libraries that macOS prov=
ides
+ * 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 devi=
ce
+ * aimed primarily at x86-64 macOS VMs.
+ */
+
+#include "apple-gfx.h"
+#include "hw/pci/pci_device.h"
+#include "hw/pci/msi.h"
+#include "qapi/error.h"
+#include "trace.h"
+#import <ParavirtualizedGraphics/ParavirtualizedGraphics.h>
+
+OBJECT_DECLARE_SIMPLE_TYPE(AppleGFXPCIState, APPLE_GFX_PCI)
+
+struct AppleGFXPCIState {
+ PCIDevice parent_obj;
+
+ AppleGFXState common;
+};
+
+static const char* apple_gfx_pci_option_rom_path =3D NULL;
+
+static void apple_gfx_init_option_rom_path(void)
+{
+ NSURL *option_rom_url =3D PGCopyOptionROMURL();
+ const char *option_rom_path =3D option_rom_url.fileSystemRepresentatio=
n;
+ apple_gfx_pci_option_rom_path =3D g_strdup(option_rom_path);
+ [option_rom_url release];
+}
+
+static void apple_gfx_pci_init(Object *obj)
+{
+ AppleGFXPCIState *s =3D 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 =3D PCI_DEVICE_CLASS(object_get_class(obj));
+ apple_gfx_init_option_rom_path();
+ pci->romfile =3D 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 =3D 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 =3D g_malloc0(sizeof(*job));
+ job->device =3D dev;
+ job->vector =3D 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 =3D APPLE_GFX_PCI(dev);
+ int ret;
+
+ pci_register_bar(dev, PG_PCI_BAR_MMIO,
+ PCI_BASE_ADDRESS_SPACE_MEMORY, &s->common.iomem_gfx);
+
+ ret =3D msi_init(dev, 0x0 /* config offset; 0 =3D find space */,
+ PG_PCI_MAX_MSI_VECTORS, true /* msi64bit */,
+ false /* msi_per_vector_mask */, errp);
+ if (ret !=3D 0) {
+ return;
+ }
+
+ @autoreleasepool {
+ PGDeviceDescriptor *desc =3D [PGDeviceDescriptor new];
+ desc.raiseInterrupt =3D ^(uint32_t vector) {
+ apple_gfx_pci_interrupt(dev, vector);
+ };
+
+ apple_gfx_common_realize(&s->common, DEVICE(dev), desc, errp);
+ [desc release];
+ desc =3D nil;
+ }
+}
+
+static void apple_gfx_pci_reset(Object *obj, ResetType type)
+{
+ AppleGFXPCIState *s =3D APPLE_GFX_PCI(obj);
+ [s->common.pgdev reset];
+}
+
+static void apple_gfx_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc =3D DEVICE_CLASS(klass);
+ PCIDeviceClass *pci =3D PCI_DEVICE_CLASS(klass);
+ ResettableClass *rc =3D RESETTABLE_CLASS(klass);
+
+ rc->phases.hold =3D apple_gfx_pci_reset;
+ dc->desc =3D "macOS Paravirtualized Graphics PCI Display Controller";
+ dc->hotpluggable =3D false;
+ set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+
+ pci->vendor_id =3D PG_PCI_VENDOR_ID;
+ pci->device_id =3D PG_PCI_DEVICE_ID;
+ pci->class_id =3D PCI_CLASS_DISPLAY_OTHER;
+ pci->realize =3D apple_gfx_pci_realize;
+
+ /* TODO: Property for setting mode list */
+}
+
+static TypeInfo apple_gfx_pci_types[] =3D {
+ {
+ .name =3D TYPE_APPLE_GFX_PCI,
+ .parent =3D TYPE_PCI_DEVICE,
+ .instance_size =3D sizeof(AppleGFXPCIState),
+ .class_init =3D apple_gfx_pci_class_init,
+ .instance_init =3D apple_gfx_pci_init,
+ .interfaces =3D (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('at=
i.c', 'ati_2d.c', 'ati_
=20
if host_os =3D=3D '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 =3D=3D 'aarch64'
system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx=
-mmio.m'), pvg, metal])
endif
--=20
2.39.5 (Apple Git-154)