address review

Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>

Author: filipleple

DasharoPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.c

@@ -804,7 +804,8 @@ CountDifferingBlocks (
   IN CONST UINT8  *Image1,
   IN CONST UINT8  *Image2,
   IN UINTN        Size,
-  IN UINTN        BlockSize
+  IN UINTN        BlockSize,
+  IN BOOLEAN      DescriptorLocked
   )
 {
   UINTN  BlockCount;
@@ -821,10 +822,16 @@ CountDifferingBlocks (
   Offset = 0;
 
   for (Block = 0; Block < BlockCount; Block++, Offset += BlockSize) {
-    if (CompareMem (Image1 + Offset, Image2 + Offset, BlockSize) != 0) {
-      DifferingCount++;
+    if (CompareMem (Image1 + Offset, Image2 + Offset, BlockSize) == 0) {
+      continue;
     }
-  }
+
+    if (!IsRangeWriteable (Offset, BlockSize, DescriptorLocked)) {
+      continue;
+    }
+
+    DifferingCount++;
+  }  
 
   return DifferingCount;
 }
@@ -1337,7 +1344,13 @@ FmpDeviceSetImageWithStatus (
     //
     // Count how many blocks actually differ to get accurate progress.
     //
-    DifferingBlocks = CountDifferingBlocks (CurrentImage, UpdatedImage, ImageSize, BlockSize);
+    DifferingBlocks = CountDifferingBlocks (
+                        CurrentImage,
+                        UpdatedImage,
+                        ImageSize,
+                        BlockSize,
+                        DescriptorLocked
+                      );
     DEBUG ((DEBUG_INFO, "%a(): %d blocks differ out of %d total\n",
             __FUNCTION__, DifferingBlocks, BlockCount));
 
@@ -1346,7 +1359,6 @@ FmpDeviceSetImageWithStatus (
     // CurrentUnits already has the read progress (BlockCount * READ_BLOCK_WEIGHT).
     //
     ProgressCtx.TotalUnits = BlockCount * READ_BLOCK_WEIGHT + DifferingBlocks * UPDATE_BLOCK_WEIGHT;
-    ReportProgress (&ProgressCtx);
   }
 
   Offset = 0;