Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c

@@ -376 +376 @@
   Status = mInterruptProtocol->RegisterInterruptSource (
                                  mInterruptProtocol,
-                                 FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum),
+                                 PcdGet32 (PcdGenericWatchdogEl2IntrNum),
                                  WatchdogInterruptHandler
                                  );
@@ -385 +385 @@
   Status = mInterruptProtocol->SetTriggerType (
                                  mInterruptProtocol,
-                                 FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum),
+                                 PcdGet32 (PcdGenericWatchdogEl2IntrNum),
                                  EFI_HARDWARE_INTERRUPT2_TRIGGER_EDGE_RISING
                                  );
@@ -391 +391 @@
     goto UnregisterHandler;
   }
+
+  WatchdogDisable ();
 
   // Install the Timer Architectural Protocol onto a new handle
@@ -414 +416 @@
   ASSERT_EFI_ERROR (Status);
 
-  WatchdogDisable ();
-
   return EFI_SUCCESS;
 
@@ -422 +422 @@
   mInterruptProtocol->RegisterInterruptSource (
                         mInterruptProtocol,
-                        FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum),
+                        PcdGet32 (PcdGenericWatchdogEl2IntrNum),
                         NULL
                         );