From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68])
 by mx.groups.io with SMTP id smtpd.web11.1697.1582564880590113847
 for <devel@edk2.groups.io>;
 Mon, 24 Feb 2020 09:21:21 -0800
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@linaro.org header.s=google header.b=w/srJhup;
 spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: ard.biesheuvel@linaro.org)
Received: by mail-wm1-f68.google.com with SMTP id s10so112029wmh.3
        for <devel@edk2.groups.io>; Mon, 24 Feb 2020 09:21:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linaro.org; s=google;
        h=mime-version:references:in-reply-to:from:date:message-id:subject:to
         :cc:content-transfer-encoding;
        bh=I+cHIWAcOxUfXK2IBscAtkjy8RauUvl/Nl3M/pHarjg=;
        b=w/srJhupRoJXdHsENNoEDuluozDyihQiJT8n6ZydMMgtTxBPEKS1LsxAoNlq88q1aL
         yQfU03atD6+MP182MeetOuIF2kGDzmFNL6fQcFDvOF0VRxhZBxSUPKWrSZc+Drt+1trg
         55WAUeIdtI6VdBCALPjH7Sy78qvKrSSeoXd147Fabpsi5W85cUQf8SfmoFKwIVBgDkRk
         OrgsijSRsxFOlSVnp5xRg/HJ76xcoo9tViipxtYUX98nc+VIpbq/bTIa16DddIAv8gJT
         RVhOgveXssu+EvXna/MQf/Ur3glGbd1Kz9R9TBFPmU/9jT/De2NWw9ZhIS5LNJuhuZz/
         okWw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc:content-transfer-encoding;
        bh=I+cHIWAcOxUfXK2IBscAtkjy8RauUvl/Nl3M/pHarjg=;
        b=ZawPu8hZmUf0T7lEDWseWujOc7F0KPKaFOn6ycj3Lc7NrOo1Lx713JAy8rWFA8FcDj
         7IASdcfAjGMng62U8BYsAxzaTs0U+6Lj0/GtRuBe92FEjWpNLhgtxXag/d4pS0KW+t7j
         64knEZrlI8sXgviwROj7oScQiH1HJGN1hA6jWtmOr/iqfo1rLRDOwyqC2qPrkzP9kqa3
         tPq3gUcsEr2XAzjGu354X95Z5KH4tLEHYd4NTmPmd89pTHkYDkQ6KGWYkK1NN3bha/cV
         sf2aF2FDwqplALODcZ4LixUXErYijNu4IUxCezd81nZLKgTfnvGiQ+RDj4gPcL5TvRWc
         4WmA==
X-Gm-Message-State: APjAAAUhbmqw2C7FnNow1d0u8nmT0zZeeiL1SpAzR9FVsv1eLFOw0Bz8
	iRKkE6/CZg+fFXQUb5PutJj37VNP1mWln388U6AUeg==
X-Google-Smtp-Source: APXvYqwLyWYuaQFjyM1hF/4tIbG0KLzyOLXlIcVZ0mwmeIKefXOldrAZFODOeFh9iy6jywYkGyFAY1E3rsx64D0LcHM=
X-Received: by 2002:a1c:282:: with SMTP id 124mr105242wmc.62.1582564878980;
 Mon, 24 Feb 2020 09:21:18 -0800 (PST)
MIME-Version: 1.0
References: <20200224171741.7494-1-lersek@redhat.com>
In-Reply-To: <20200224171741.7494-1-lersek@redhat.com>
From: "Ard Biesheuvel" <ard.biesheuvel@linaro.org>
Date: Mon, 24 Feb 2020 18:21:07 +0100
Message-ID: <CAKv+Gu82_QF452BTq9OCM2LZKQ7fsQC_Bj9NroE-6obzaoeFgQ@mail.gmail.com>
Subject: Re: [PATCH edk2-stable202002] OvmfPkg/QemuVideoDxe: unbreak "secondary-vga" and "bochs-display" support
To: Laszlo Ersek <lersek@redhat.com>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>, Gerd Hoffmann <kraxel@redhat.com>, 
	Jordan Justen <jordan.l.justen@intel.com>, Marc W Chen <marc.w.chen@intel.com>, 
	=?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= <philmd@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, 24 Feb 2020 at 18:17, Laszlo Ersek <lersek@redhat.com> wrote:
>
> 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 <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Marc W Chen <marc.w.chen@intel.com>
> Cc: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
> Fixes: 662bd0da7fd77e4d2cf9ef4a78015af5cad7d9db
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2555
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>
> 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 (
>    }
>
>    SupportedVgaIo &=3D (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_=
ATTRIBUTE_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
> --
> 2.19.1.3.g30247aa5d201
>