d6671b1ccc
- edk2-OvmfPkg-VirtNorFlashDxe-clone-ArmPlatformPkg-s-NOR-f.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-remove-CheckBlockLocked-feat.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-remove-disk-I-O-protocol-imp.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-drop-block-I-O-protocol-impl.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-avoid-array-mode-switch-afte.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-avoid-switching-between-mode.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-use-EFI_MEMORY_WC-and-drop-A.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-map-flash-memory-as-uncachea.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-stop-accepting-gEfiVariable2.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-sanity-check-variable2.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-add-casts-to-UINTN-and-UINT3.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-clarify-block-write-logic-fi.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-add-a-loop-for-NorFlashWrite.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-allow-larger-writes-without-.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-ValidateFvHeader-unwritten-s.patch [RHEL-17587] - edk2-OvmfPkg-VirtNorFlashDxe-move-DoErase-code-block-into.patch [RHEL-17587] - edk2-ArmVirtPkg-ArmVirtQemu-migrate-to-OVMF-s-VirtNorFlas.patch [RHEL-17587] - edk2-OvmfPkg-clone-NorFlashPlatformLib-into-VirtNorFlashP.patch [RHEL-17587] - Resolves: RHEL-17587 ([rhel8] guest fails to boot due to ASSERT error)
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
From 15415de9a228e74ff1847777a29f1531754b03b0 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 11 Jan 2023 19:00:23 +0100
|
|
Subject: [PATCH 08/18] OvmfPkg/VirtNorFlashDxe: map flash memory as
|
|
uncacheable
|
|
|
|
RH-Author: Gerd Hoffmann <None>
|
|
RH-MergeRequest: 43: OvmfPkg/VirtNorFlashDxe backport
|
|
RH-Jira: RHEL-17587
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
RH-Commit: [10/20] 40ca967bead9ec5c98c528bfe0757f75f3d3352f
|
|
|
|
Switching from the ArmPlatformPkg/NorFlashDxe driver to the
|
|
OvmfPkg/VirtNorFlashDxe driver had the side effect that flash address
|
|
space got registered as EFI_MEMORY_WC instead of EFI_MEMORY_UC.
|
|
|
|
That confuses the linux kernel's numa code, seems this makes kernel
|
|
consider the flash being node memory. "lsmem" changes from ...
|
|
|
|
RANGE SIZE STATE REMOVABLE BLOCK
|
|
0x0000000040000000-0x000000013fffffff 4G online yes 8-39
|
|
|
|
... to ...
|
|
|
|
RANGE SIZE STATE REMOVABLE BLOCK
|
|
0x0000000000000000-0x0000000007ffffff 128M online yes 0
|
|
0x0000000040000000-0x000000013fffffff 4G online yes 8-39
|
|
|
|
... and in the kernel log got new error lines:
|
|
|
|
NUMA: Warning: invalid memblk node 512 [mem 0x0000000004000000-0x0000000007ffffff]
|
|
NUMA: Faking a node at [mem 0x0000000004000000-0x000000013fffffff]
|
|
|
|
Changing the attributes back to EFI_MEMORY_UC fixes this.
|
|
|
|
Fixes: b92298af8218 ("ArmVirtPkg/ArmVirtQemu: migrate to OVMF's VirtNorFlashDxe")
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
|
|
(cherry picked from commit e5ec3ba409b5baa9cf429cc25fdf3c8d1b8dcef0)
|
|
---
|
|
OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c
|
|
index ff3121af2a..f9a41f6aab 100644
|
|
--- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c
|
|
+++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c
|
|
@@ -394,14 +394,14 @@ NorFlashFvbInitialize (
|
|
EfiGcdMemoryTypeMemoryMappedIo,
|
|
Instance->DeviceBaseAddress,
|
|
RuntimeMmioRegionSize,
|
|
- EFI_MEMORY_WC | EFI_MEMORY_RUNTIME
|
|
+ EFI_MEMORY_UC | EFI_MEMORY_RUNTIME
|
|
);
|
|
ASSERT_EFI_ERROR (Status);
|
|
|
|
Status = gDS->SetMemorySpaceAttributes (
|
|
Instance->DeviceBaseAddress,
|
|
RuntimeMmioRegionSize,
|
|
- EFI_MEMORY_WC | EFI_MEMORY_RUNTIME
|
|
+ EFI_MEMORY_UC | EFI_MEMORY_RUNTIME
|
|
);
|
|
ASSERT_EFI_ERROR (Status);
|
|
|
|
--
|
|
2.41.0
|
|
|