From 987cc09c7cf38d628063062483e2341fba679b0e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 16 Jan 2023 10:46:39 +0100 Subject: ArmVirt: don't use unaligned CopyMem () on NOR flash Commit 789a72328553 reclassified the NOR flash region as EFI_MEMORY_WC in the OS visible EFI memory map, and dropped the explicit aligned CopyMem() implementation, in the assumption that EFI_MEMORY_WC will be honored by the OS, and that the region will be mapped in a way that tolerates misaligned accesseses. However, Linux today uses device attributes for all EFI MMIO regions, in spite of the memory type attributes, and so using misaligned accesses is never safe. So instead, switch to the generic CopyMem() implementation entirely, just like we already did for VariableRuntimeDxe. Fixes: 789a72328553 ("OvmfPkg/VirtNorFlashDxe: use EFI_MEMORY_WC and drop AlignedCopyMem()") Signed-off-by: Gerd Hoffmann Reviewed-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ArmVirtPkg/ArmVirtQemuKernel.dsc') diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index f5db3ac432..807c85d482 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -331,7 +331,11 @@ NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf } - OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf + OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf { + + # don't use unaligned CopyMem () on the UEFI varstore NOR flash region + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf + } MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # -- cgit v1.2.3