]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/vmwgfx: Fix guests running with TDX/SEV
authorMarko Kiiskila <marko.kiiskila@broadcom.com>
Wed, 18 Jun 2025 19:29:26 +0000 (15:29 -0400)
committerZack Rusin <zack.rusin@broadcom.com>
Tue, 1 Jul 2025 03:10:11 +0000 (23:10 -0400)
Commit 81256a50aa0f ("x86/mm: Make memremap(MEMREMAP_WB) map memory as
encrypted by default") changed the default behavior of
memremap(MEMREMAP_WB) and started mapping memory as encrypted.
The driver requires the fifo memory to be decrypted to communicate with
the host but was relaying on the old default behavior of
memremap(MEMREMAP_WB) and thus broke.

Fix it by explicitly specifying the desired behavior and passing
MEMREMAP_DEC to memremap.

Fixes: 81256a50aa0f ("x86/mm: Make memremap(MEMREMAP_WB) map memory as encrypted by default")
Signed-off-by: Marko Kiiskila <marko.kiiskila@broadcom.com>
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: https://lore.kernel.org/r/20250618192926.1092450-1-zack.rusin@broadcom.com
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

index 0695a342b1ef2694094a255a46354201180d0ffa..5205552b1970c5cc97be7bd29babe8696e78c183 100644 (file)
@@ -749,7 +749,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
                dev->fifo_mem = devm_memremap(dev->drm.dev,
                                              fifo_start,
                                              fifo_size,
-                                             MEMREMAP_WB);
+                                             MEMREMAP_WB | MEMREMAP_DEC);
 
                if (IS_ERR(dev->fifo_mem)) {
                        drm_err(&dev->drm,