UefiCpuPkg/MpInitLib: return early in GetBspNumber()

After finding the BSP Number return the result instead of continuing to loop over the remaining processors. Suggested-by: Laszlo Ersek <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]> Message-Id: <[email protected]> Reviewed-by: Ray Ni <[email protected]> Reviewed-by: Laszlo Ersek <[email protected]> [[email protected]: s/ASSERT (FALSE)/ASSERT_EFI_ERROR (EFI_NOT_FOUND)/ [Ray]]
lersek · Feb 26, 2024 · d25421d · d25421d
1 parent 5e09b5d
commit d25421d
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1903,30 +1903,27 @@ GetBspNumber (
   )
 {
   UINT32             ApicId;
-  UINT32             BspNumber;
   UINT32             Index;
   CONST MP_HAND_OFF  *MpHandOff;
 
   //
   // Get the processor number for the BSP
   //
-  BspNumber = MAX_UINT32;
-  ApicId    = GetInitialApicId ();
+  ApicId = GetInitialApicId ();
 
   for (MpHandOff = FirstMpHandOff;
        MpHandOff != NULL;
        MpHandOff = GetNextMpHandOffHob (MpHandOff))
   {
     for (Index = 0; Index < MpHandOff->CpuCount; Index++) {
       if (MpHandOff->Info[Index].ApicId == ApicId) {
-        BspNumber = MpHandOff->ProcessorIndex + Index;
+        return MpHandOff->ProcessorIndex + Index;
       }
     }
   }
 
-  ASSERT (BspNumber != MAX_UINT32);
-
-  return BspNumber;
+  ASSERT_EFI_ERROR (EFI_NOT_FOUND);
+  return 0;
 }
 
 /**