From nobody Sun Apr 28 11:43:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+54760+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54760+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582564679; cv=none; d=zohomail.com; s=zohoarc; b=cH9B0cLpIl+rK92p+suCER97+mowfhbnvJu8OQ8vnhAicMvJMOuxICOy7ST3GoRVOYwnska6jUVoim4SArfbmEWND6L2PoGGylAaO4giGmSFnYvj6uUe7bigdDp/ibiPCkOMQPIqaLI1y607k/cBramv3VJEPseWyfowLRPku44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582564679; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=dm5OdWBgMMj46K9jXbsfVtkUc4Fb0tFK2i9KjrUbHOc=; b=cp3gR4iGYNFcQaDM82/DDGn5nWmvDGqPoSfZR8uFDsJlo1AVi7nMqsSKcZtlhchvnP8IjQhDNcGi+zcpVsqK4WKmCI5IN1rcL8hWPlS5PGWbsKlOY5Qp2Mt5eA4py4PCY01Aq1R/ISiNCBWUbsvjrpnP5SB2M+um30lyYc9PATw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54760+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1582564679791508.71937889930166; Mon, 24 Feb 2020 09:17:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id BJWuYY1788612xhsF2p34qQB; Mon, 24 Feb 2020 09:17:58 -0800 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web10.1552.1582564678054625755 for ; Mon, 24 Feb 2020 09:17:58 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-bYga2PIVNKW12RBcU1s8-Q-1; Mon, 24 Feb 2020 12:17:48 -0500 X-MC-Unique: bYga2PIVNKW12RBcU1s8-Q-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57F40800D6C; Mon, 24 Feb 2020 17:17:47 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CB4219C7F; Mon, 24 Feb 2020 17:17:43 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Gerd Hoffmann , Jordan Justen , Marc W Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH edk2-stable202002] OvmfPkg/QemuVideoDxe: unbreak "secondary-vga" and "bochs-display" support Date: Mon, 24 Feb 2020 18:17:41 +0100 Message-Id: <20200224171741.7494-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: HaLA26Mov9aWpbVVO7CpwTf2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1582564678; bh=dm5OdWBgMMj46K9jXbsfVtkUc4Fb0tFK2i9KjrUbHOc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=E8y4tEwuaMCiP0CSNmv9yM13rHBojR5VMTG6bX62kqhW4thLwidNYRFc0Ft2V54dHw8 lWnntjwXV7bdFdPOuXypMm+YSu5BDIWfbqWC/YgdQwuKdPsHC0MSzow106/G7v3bpRpBS CY1BCL9xFaZrKgDymFcdDa+WQ5m/FMmChb4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In edk2 commit 333f32ec23dd, QemuVideoDxe gained support for QEMU's "secondary-vga" device model (originally introduced in QEMU commit 63e3e24db2e9). In QEMU commit 765c94290863, the "bochs-display" device was introduced, which would work with QemuVideoDxe out of the box, reusing the "secondary-vga" logic. Support for both models has been broken since edk2 commit 662bd0da7fd7. Said patch ended up requiring VGA IO Ports -- i.e., at least one of EFI_PCI_IO_ATTRIBUTE_VGA_IO and EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 -- even if the device wasn't actually VGA compatible. Restrict the IO Ports requirement to VGA compatible devices. Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Jordan Justen Cc: Marc W Chen Cc: Philippe Mathieu-Daud=C3=A9 Fixes: 662bd0da7fd77e4d2cf9ef4a78015af5cad7d9db Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2555 Signed-off-by: Laszlo Ersek Acked-by: Ard Biesheuvel Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daude --- Notes: Repo: https://github.com/lersek/edk2.git Branch: vga_io_bz_2555 OvmfPkg/QemuVideoDxe/Driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 6a4a860b3c25..37bbbbe843c9 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -292,7 +292,7 @@ QemuVideoControllerDriverStart ( } =20 SupportedVgaIo &=3D (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_AT= TRIBUTE_VGA_IO_16); - if (SupportedVgaIo =3D=3D 0) { + if (SupportedVgaIo =3D=3D 0 && IS_PCI_VGA (&Pci)) { Status =3D EFI_UNSUPPORTED; goto ClosePciIo; } base-commit: 1d3215fd24f47eaa4877542a59b4bbf5afc0cfe8 --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54760): https://edk2.groups.io/g/devel/message/54760 Mute This Topic: https://groups.io/mt/71515873/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-