qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
	"Corvin Köhne" <corvin.koehne@gmail.com>,
	"Corvin Köhne" <c.koehne@beckhoff.com>
Subject: [PULL 8/8] vfio/igd: correctly calculate stolen memory size for gen 9 and later
Date: Tue, 17 Sep 2024 12:32:29 +0200	[thread overview]
Message-ID: <20240917103229.876515-9-clg@redhat.com> (raw)
In-Reply-To: <20240917103229.876515-1-clg@redhat.com>

From: Corvin Köhne <corvin.koehne@gmail.com>

We have to update the calculation of the stolen memory size because
we've seen devices using values of 0xf0 and above for the graphics mode
select field. The new calculation was taken from the linux kernel [1].

[1] https://github.com/torvalds/linux/blob/7c626ce4bae1ac14f60076d00eafe71af30450ba/arch/x86/kernel/early-quirks.c#L455-L460

Signed-off-by: Corvin Köhne <c.koehne@beckhoff.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
---
 hw/vfio/igd.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index 0751c43eae04aac5152c627af648319151ee1e39..a95d441f68661c23eee976be5d74b2da354f9498 100644
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -488,11 +488,18 @@ static int igd_get_stolen_mb(int gen, uint32_t gmch)
         gms = (gmch >> 8) & 0xff;
     }
 
-    if (gms > 0x10) {
-        error_report("Unsupported IGD GMS value 0x%x", gms);
-        return 0;
+    if (gen < 9) {
+        if (gms > 0x10) {
+            error_report("Unsupported IGD GMS value 0x%x", gms);
+            return 0;
+        }
+        return gms * 32;
+    } else {
+        if (gms < 0xf0)
+            return gms * 32;
+        else
+            return gms * 4 + 4;
     }
-    return gms * 32;
 }
 
 void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
-- 
2.46.0



  parent reply	other threads:[~2024-09-17 10:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-17 10:32 [PULL 0/8] vfio queue Cédric Le Goater
2024-09-17 10:32 ` [PULL 1/8] hw/vfio/pci.c: Use correct type in trace_vfio_msix_early_setup() Cédric Le Goater
2024-09-17 10:32 ` [PULL 2/8] vfio/igd: return an invalid generation for unknown devices Cédric Le Goater
2024-09-17 10:32 ` [PULL 3/8] vfio/igd: support legacy mode for all known generations Cédric Le Goater
2024-09-17 10:32 ` [PULL 4/8] vfio/igd: use new BDSM register location and size for gen 11 and later Cédric Le Goater
2024-09-17 10:32 ` [PULL 5/8] vfio/igd: add new bar0 quirk to emulate BDSM mirror Cédric Le Goater
2024-09-17 10:32 ` [PULL 6/8] vfio/igd: add ID's for ElkhartLake and TigerLake Cédric Le Goater
2024-09-17 10:32 ` [PULL 7/8] vfio/igd: don't set stolen memory size to zero Cédric Le Goater
2024-09-17 10:32 ` Cédric Le Goater [this message]
2024-09-17 14:48 ` [PULL 0/8] vfio queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240917103229.876515-9-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=c.koehne@beckhoff.com \
    --cc=corvin.koehne@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).