From nobody Wed Mar 5 18:35:23 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1741024466; cv=none; d=zohomail.com; s=zohoarc; b=IVJ08ldjOCHJuRYlBr/hCSqW4Up8ZJZ/qbthm6euMtqDpXkiZdM4kCLukiodT5aUfX/sajtWQx2tCSJY/euTTHsBG7sq7bLeYT1ehpOZ/A4mW/jUkDSK/8YtPJQEVt78QgRxSBhSO3yCNYXb0E/PKyevitmVS3ixEzGAk/CmvtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741024466; h=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=vFnj8MBzKLQ8mFbTFO8nM18EwA6rKViM/nHJPBpmhqc=; b=XZr6mgEGIMENTWZwNl9ykpDIjt/ybEt5jpc1R6csLeYQeldH3RqjnWqgCPXyJ/Z4aIvDYLkBSu50KrFpJmGgJDI9eoB2q7MFe4lC/DtgwVhmFjkCkGIxP8IUC3WetTJeWX5Rjs6UUd3eCpRJwTPfbQb24U6nx63BEf1EFX6gNsY= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741024466946980.4148244230696; Mon, 3 Mar 2025 09:54:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tp9yn-0001rB-0O; Mon, 03 Mar 2025 12:53:30 -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 1tp9y7-0001Yw-Ml for qemu-devel@nongnu.org; Mon, 03 Mar 2025 12:52:45 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tp9y5-0000Je-IA for qemu-devel@nongnu.org; Mon, 03 Mar 2025 12:52:43 -0500 Received: by mail-pl1-x644.google.com with SMTP id d9443c01a7336-219f8263ae0so88091815ad.0 for ; Mon, 03 Mar 2025 09:52:40 -0800 (PST) Received: from localhost.localdomain ([58.37.175.138]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2235052beaasm80625535ad.233.2025.03.03.09.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 09:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741024360; x=1741629160; 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=vFnj8MBzKLQ8mFbTFO8nM18EwA6rKViM/nHJPBpmhqc=; b=HuEeNi1ZSZ9Faz2M+RD74ZdW6TPZngZEA7uoKEvwk9mModyA80jKkzRSPOxo5Wm44S iKDr78kFCP1vylrOnHEIXXLCemhnRntXbbAA3T262Qkm1uAwjcVi+axmUlO9Qr/TACP+ tQMGz1+qT6azM7CBSjuhHizC/tC2SAwVzxOcLT2B5qkU9cygBTzcAXVfv83BusQ0ZSHg Otc2byusev7IG6H2DBIxfdjge3vhScp1dxlqwoc+ZN+e26u8PkhWzCZjtOcCYXa2FG/w AI56DTLH91BgQoFUwoK97fvxz0p7YyoP88iwqJ+iXG2AvtJvdkYGqAwazdqNR9O1Qk/5 9sZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741024360; x=1741629160; 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=vFnj8MBzKLQ8mFbTFO8nM18EwA6rKViM/nHJPBpmhqc=; b=UJjmlyUsFPpkzbrLcAwqtJBes5lA/vcF9qJXWJ9LOu8rfbsg97kSFUvJiRMFiea60A 4BqEiDUr0cdDOKkwv1ge0l7cxCzhkvk+3tJ3m42O5WGAUlORfu6yumCvjhUJJa0usveB Of9P7VOd+6KNpGi+n7VVkjtUbAtDaQRAy1QBMDkSlAuBPxZ8qFdRtCooxjs9vMO0vtjK miW24APE4xXlMFhWQyJdHG38yKENC6udW72kYx4nRTfv9Ofzaz9DC1kFzFqS2xlsISUl gGkh5BMWAdz2vx0xfC8/qkuBJ2g+jINSonRSAYoVlyW1U0ZEtU/wBkr5D0eWPSB0S/Nl EOIw== X-Gm-Message-State: AOJu0Yy1MOkiSF4kISNLoYI2u1ueMQCa6VI1h00U++Ih8Om9V3ZSgVjK Qm9yX1mkIxvYt1d6HmN2b9vmG6MJqTezw9u3dI/D82VzJgMZm78j16RSmUdHXg== X-Gm-Gg: ASbGnctEO5xj8cX2OhpyeZMVWwzg3X1ExMTo5+3OhPhYVAgvlntFwh+N/vdN+GnZvRs BSydpNjyGEsvJ85tizzAQNrahZ39+Gx545J7NNLfG4yx/CAmdzzDzXfgHvrf6CRTxS9Xt4AMb2a GjLuj89sgsYkTJwAje8M8Ct2Y1sIEGyG6TgHva8nXZ/DNyVJv6MuTsZFBo1EfitUrpg8u5trSkD ofdCboAFPOC5dKc391MeeNERrJ9nLDPx3e0nSrFdy4j7M5zjLCZFP9eP0Qy6n23ZP72yhPFsSvt lxIvvZoPOk9HnGJUNWXb7Jbc22yd+jxZfjLmHJslryWOejvxEAeOhaZ5UQ== X-Google-Smtp-Source: AGHT+IEq3+gQX8xDaHuG0rjLnBsDZnZW99VU+sJe2NR5Jl85DurYY+iQxfdUaOT/uUkQds+sHHjXiA== X-Received: by 2002:a17:902:ecd0:b0:223:3396:15e8 with SMTP id d9443c01a7336-22368f95a5cmr242810205ad.22.1741024359871; Mon, 03 Mar 2025 09:52:39 -0800 (PST) From: Tomita Moeko To: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Cc: qemu-devel@nongnu.org, =?UTF-8?q?Corvin=20K=C3=B6hne?= , Tomita Moeko Subject: [PATCH v2 6/9] vfio/igd: Refactor vfio_probe_igd_bar4_quirk into pci config quirk Date: Tue, 4 Mar 2025 01:52:16 +0800 Message-ID: <20250303175220.74917-7-tomitamoeko@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250303175220.74917-1-tomitamoeko@gmail.com> References: <20250303175220.74917-1-tomitamoeko@gmail.com> MIME-Version: 1.0 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: pass client-ip=2607:f8b0:4864:20::644; envelope-from=tomitamoeko@gmail.com; helo=mail-pl1-x644.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, FREEMAIL_FROM=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1741024470267019100 Content-Type: text/plain; charset="utf-8" The actual IO BAR4 write quirk in vfio_probe_igd_bar4_quirk was removed in previous change, leaving the function not matching its name, so move it into the newly introduced vfio_config_quirk_setup. There is no functional change in this commit. For now, to align with current legacy mode behavior, it returns and proceeds on error. Later it will fail on error after decoupling the quirks from legacy mode. Signed-off-by: Tomita Moeko --- hw/vfio/igd.c | 21 ++++++++++++--------- hw/vfio/pci-quirks.c | 6 +++++- hw/vfio/pci.h | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index 9d2b761d1d..f5e19f1241 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -482,7 +482,8 @@ void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int= nr) QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, bdsm_quirk, next); } =20 -void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) +bool vfio_probe_igd_config_quirk(VFIOPCIDevice *vdev, + Error **errp G_GNUC_UNUSED) { g_autofree struct vfio_region_info *rom =3D NULL; int ret, gen; @@ -497,10 +498,10 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, i= nt nr) * PCI bus address. */ if (!vfio_pci_is(vdev, PCI_VENDOR_ID_INTEL, PCI_ANY_ID) || - !vfio_is_vga(vdev) || nr !=3D 4 || + !vfio_is_vga(vdev) || &vdev->pdev !=3D pci_find_device(pci_device_root_bus(&vdev->pdev), 0, PCI_DEVFN(0x2, 0))) { - return; + return true; } =20 /* @@ -512,7 +513,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int= nr) if (gen =3D=3D -1) { error_report("IGD device %s is unsupported in legacy mode, " "try SandyBridge or newer", vdev->vbasedev.name); - return; + return true; } =20 /* @@ -525,7 +526,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int= nr) if ((ret || !rom->size) && !vdev->pdev.romfile) { error_report("IGD device %s has no ROM, legacy mode disabled", vdev->vbasedev.name); - return; + return true; } =20 /* @@ -536,7 +537,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int= nr) error_report("IGD device %s hotplugged, ROM disabled, " "legacy mode disabled", vdev->vbasedev.name); vdev->rom_read_failed =3D true; - return; + return true; } =20 gmch =3D vfio_pci_read_config(&vdev->pdev, IGD_GMCH, 4); @@ -550,21 +551,21 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, i= nt nr) error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); error_report("IGD device %s failed to enable VGA access, " "legacy mode disabled", vdev->vbasedev.name); - return; + return true; } =20 /* Setup OpRegion access */ if (!vfio_pci_igd_setup_opregion(vdev, &err)) { error_append_hint(&err, "IGD legacy mode disabled\n"); error_report_err(err); - return; + return true; } =20 /* Setup LPC bridge / Host bridge PCI IDs */ if (!vfio_pci_igd_setup_lpc_bridge(vdev, &err)) { error_append_hint(&err, "IGD legacy mode disabled\n"); error_report_err(err); - return; + return true; } =20 /* @@ -624,4 +625,6 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int= nr) } =20 trace_vfio_pci_igd_bdsm_enabled(vdev->vbasedev.name, (gms_size / MiB)); + + return true; } diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 8a81c60400..f2b37910f0 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1119,6 +1119,11 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDev= ice *vdev, int nr) */ bool vfio_config_quirk_setup(VFIOPCIDevice *vdev, Error **errp) { +#ifdef CONFIG_VFIO_IGD + if (!vfio_probe_igd_config_quirk(vdev, errp)) { + return false; + } +#endif return true; } =20 @@ -1170,7 +1175,6 @@ void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr) vfio_probe_rtl8168_bar2_quirk(vdev, nr); #ifdef CONFIG_VFIO_IGD vfio_probe_igd_bar0_quirk(vdev, nr); - vfio_probe_igd_bar4_quirk(vdev, nr); #endif } =20 diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index d54e43764b..2e81f9eb19 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -217,7 +217,7 @@ bool vfio_add_virt_caps(VFIOPCIDevice *vdev, Error **er= rp); void vfio_quirk_reset(VFIOPCIDevice *vdev); VFIOQuirk *vfio_quirk_alloc(int nr_mem); void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr); -void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr); +bool vfio_probe_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp); =20 extern const PropertyInfo qdev_prop_nv_gpudirect_clique; =20 --=20 2.47.2