commit 819cfc6b42a68790a23509e4fcc58ceb70e1965e
author Qingyu Shang <2931013282@sjtu.edu.cn> Fri Aug 11 19:04:43 2023 +0800
committer mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Fri Aug 25 01:54:50 2023 +0000
tree 31b3a187d69e49d5ebd23c2ec8c24b39020c9170
parent 00b51e0d78a547dd78119ec44fcc74a01b6f79c8

OvmfPkg/RiscVVirt: Fix issues in VarStore Blockmap config

The block size configuration of Blockmap does not match that in Qemu
VirtNorFlash, which causes variable data to be written into FtwWorkBlock
by mistake, resulting in data loss during reboot. Fix it and update
new checksum value.

Signed-off-by: Qingyu Shang <2931013282@sjtu.edu.cn>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

OvmfPkg/RiscVVirt/VarStore.fdf.inc

diff --git a/OvmfPkg/RiscVVirt/VarStore.fdf.inc b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
index 6bc619e..aba3231 100644
--- a/OvmfPkg/RiscVVirt/VarStore.fdf.inc
+++ b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
@@ -30,9 +30,9 @@
   # Signature "_FVH"       # Attributes

   0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,

   # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision

-  0x48, 0x00, 0x2F, 0xF1, 0x00, 0x00, 0x00, 0x02,

-  # Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block

-  0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,

+  0x48, 0x00, 0x28, 0x09, 0x00, 0x00, 0x00, 0x02,

+  # Blockmap[0]: 0x3 Blocks * 0x40000 Bytes / Block

+  0x3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,

   # Blockmap[1]: End

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

   ## This is the VARIABLE_STORE_HEADER