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)
111 lines
4.8 KiB
Diff
111 lines
4.8 KiB
Diff
From f136d4895b1477a56b916a76448ba76e67b08163 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 16 Jan 2024 18:11:01 +0100
|
|
Subject: [PATCH 12/18] OvmfPkg/VirtNorFlashDxe: clarify block write logic &
|
|
fix shadowbuffer reads
|
|
|
|
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: [14/20] 38009625e5f189166f7a93e236576140a7ccb393
|
|
|
|
Introduce 'Start' and 'End' variables to make it easier to follow the
|
|
logic and code flow. Also add a ascii art diagram (based on a
|
|
suggestion by Laszlo).
|
|
|
|
This also fixes the 'Size' calculation for the NorFlashRead() call.
|
|
Without this patch the code will read only one instead of two
|
|
P30_MAX_BUFFER_SIZE_IN_BYTES blocks in case '*NumBytes' is smaller than
|
|
P30_MAX_BUFFER_SIZE_IN_BYTES but 'Offset + *NumBytes' is not, i.e. the
|
|
update range crosses a P30_MAX_BUFFER_SIZE_IN_BYTES boundary.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20240116171105.37831-3-kraxel@redhat.com>
|
|
(cherry picked from commit 35d8ea8097794b522149688b5cfaf8364bc44d54)
|
|
---
|
|
OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c | 36 ++++++++++++++++++++------
|
|
1 file changed, 28 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
index 7f4743b003..88a4d2c23f 100644
|
|
--- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
+++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c
|
|
@@ -520,6 +520,7 @@ NorFlashWriteSingleBlock (
|
|
UINTN BlockSize;
|
|
UINTN BlockAddress;
|
|
UINT8 *OrigData;
|
|
+ UINTN Start, End;
|
|
|
|
DEBUG ((DEBUG_BLKIO, "NorFlashWriteSingleBlock(Parameters: Lba=%ld, Offset=0x%x, *NumBytes=0x%x, Buffer @ 0x%08x)\n", Lba, Offset, *NumBytes, Buffer));
|
|
|
|
@@ -555,7 +556,28 @@ NorFlashWriteSingleBlock (
|
|
// To avoid pathological cases were a 2 byte write is disregarded because it
|
|
// occurs right at a 128 byte buffered write alignment boundary, permit up to
|
|
// twice the max buffer size, and perform two writes if needed.
|
|
- if ((*NumBytes + (Offset & BOUNDARY_OF_32_WORDS)) <= (2 * P30_MAX_BUFFER_SIZE_IN_BYTES)) {
|
|
+ //
|
|
+ // 0 128 256
|
|
+ // [----------------|----------------]
|
|
+ // ^ ^ ^ ^
|
|
+ // | | | |
|
|
+ // | | | End, the next "word" boundary beyond
|
|
+ // | | | the (logical) update
|
|
+ // | | |
|
|
+ // | | (Offset & BOUNDARY_OF_32_WORDS) + NumBytes;
|
|
+ // | | i.e., the relative offset inside (or just past)
|
|
+ // | | the *double-word* such that it is the
|
|
+ // | | *exclusive* end of the (logical) update.
|
|
+ // | |
|
|
+ // | Offset & BOUNDARY_OF_32_WORDS; i.e., Offset within the "word";
|
|
+ // | this is where the (logical) update is supposed to start
|
|
+ // |
|
|
+ // Start = Offset & ~BOUNDARY_OF_32_WORDS; i.e., Offset truncated to "word" boundary
|
|
+
|
|
+ Start = Offset & ~BOUNDARY_OF_32_WORDS;
|
|
+ End = ALIGN_VALUE (Offset + *NumBytes, P30_MAX_BUFFER_SIZE_IN_BYTES);
|
|
+
|
|
+ if ((End - Start) <= (2 * P30_MAX_BUFFER_SIZE_IN_BYTES)) {
|
|
// Check to see if we need to erase before programming the data into NOR.
|
|
// If the destination bits are only changing from 1s to 0s we can just write.
|
|
// After a block is erased all bits in the block is set to 1.
|
|
@@ -565,8 +587,8 @@ NorFlashWriteSingleBlock (
|
|
Status = NorFlashRead (
|
|
Instance,
|
|
Lba,
|
|
- Offset & ~BOUNDARY_OF_32_WORDS,
|
|
- (*NumBytes | BOUNDARY_OF_32_WORDS) + 1,
|
|
+ Start,
|
|
+ End - Start,
|
|
Instance->ShadowBuffer
|
|
);
|
|
if (EFI_ERROR (Status)) {
|
|
@@ -601,7 +623,7 @@ NorFlashWriteSingleBlock (
|
|
|
|
Status = NorFlashWriteBuffer (
|
|
Instance,
|
|
- BlockAddress + (Offset & ~BOUNDARY_OF_32_WORDS),
|
|
+ BlockAddress + Start,
|
|
P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
Instance->ShadowBuffer
|
|
);
|
|
@@ -609,12 +631,10 @@ NorFlashWriteSingleBlock (
|
|
goto Exit;
|
|
}
|
|
|
|
- if ((*NumBytes + (Offset & BOUNDARY_OF_32_WORDS)) > P30_MAX_BUFFER_SIZE_IN_BYTES) {
|
|
- BlockAddress += P30_MAX_BUFFER_SIZE_IN_BYTES;
|
|
-
|
|
+ if ((End - Start) > P30_MAX_BUFFER_SIZE_IN_BYTES) {
|
|
Status = NorFlashWriteBuffer (
|
|
Instance,
|
|
- BlockAddress + (Offset & ~BOUNDARY_OF_32_WORDS),
|
|
+ BlockAddress + Start + P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
P30_MAX_BUFFER_SIZE_IN_BYTES,
|
|
Instance->ShadowBuffer + P30_MAX_BUFFER_SIZE_IN_BYTES
|
|
);
|
|
--
|
|
2.41.0
|
|
|