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)
74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
From 00d9e2d6cb03afeef5a1110d6f1fae1389a06f7a Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 16 Jan 2024 18:11:02 +0100
|
|
Subject: [PATCH 13/18] OvmfPkg/VirtNorFlashDxe: add a loop for
|
|
NorFlashWriteBuffer calls.
|
|
|
|
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: [15/20] 72004a196ea61d627ab528573db657dd7db16de2
|
|
|
|
Replace the two NorFlashWriteBuffer() calls with a loop containing a
|
|
single NorFlashWriteBuffer() call.
|
|
|
|
With the changes in place the code is able to handle updates larger
|
|
than two P30_MAX_BUFFER_SIZE_IN_BYTES blocks, even though the patch
|
|
does not actually change the size limit.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20240116171105.37831-4-kraxel@redhat.com>
|
|
(cherry picked from commit 28ffd726894f11a587a6ac7f71a4c4af341e24d2)
|
|
---
|
|
OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c | 21 ++++++++-------------
|
|
1 file changed, 8 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
index 88a4d2c23f..3d1343b381 100644
|
|
--- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
+++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
@@ -521,6 +521,7 @@ NorFlashWriteSingleBlock (
|
|
UINTN BlockAddress;
|
|
UINT8 *OrigData;
|
|
UINTN Start, End;
|
|
+ UINT32 Index, Count;
|
|
|
|
DEBUG ((DEBUG_BLKIO, "NorFlashWriteSingleBlock(Parameters: Lba=%ld, Offset=0x%x, *NumBytes=0x%x, Buffer @ 0x%08x)\n", Lba, Offset, *NumBytes, Buffer));
|
|
|
|
@@ -621,23 +622,17 @@ NorFlashWriteSingleBlock (
|
|
goto Exit;
|
|
}
|
|
|
|
- Status = NorFlashWriteBuffer (
|
|
- Instance,
|
|
- BlockAddress + Start,
|
|
- P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
- Instance->ShadowBuffer
|
|
- );
|
|
- if (EFI_ERROR (Status)) {
|
|
- goto Exit;
|
|
- }
|
|
-
|
|
- if ((End - Start) > P30_MAX_BUFFER_SIZE_IN_BYTES) {
|
|
+ Count = (End - Start) / P30_MAX_BUFFER_SIZE_IN_BYTES;
|
|
+ for (Index = 0; Index < Count; Index++) {
|
|
Status = NorFlashWriteBuffer (
|
|
Instance,
|
|
- BlockAddress + Start + P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
+ BlockAddress + Start + Index * P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
- Instance->ShadowBuffer + P30_MAX_BUFFER_SIZE_IN_BYTES
|
|
+ Instance->ShadowBuffer + Index * P30_MAX_BUFFER_SIZE_IN_BYTES
|
|
);
|
|
+ if (EFI_ERROR (Status)) {
|
|
+ goto Exit;
|
|
+ }
|
|
}
|
|
|
|
Exit:
|
|
--
|
|
2.41.0
|
|
|