diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index adf36a5b77..ef0a5a2d39 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -2040,7 +2040,7 @@ CreatePciIoDevice (
                  );
     DEBUG ((EFI_D_INFO, "PCI-IOV B%x.D%x.F%x - SupportedPageSize - 0x%x\n", (UINTN)Bus, (UINTN)Device, (UINTN)Func, PciIoDevice->SystemPageSize));
 
-    PciIoDevice->SystemPageSize = (PcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);
+    PciIoDevice->SystemPageSize = (FixedPcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);
     ASSERT (PciIoDevice->SystemPageSize != 0);
 
     PciIo->Pci.Write (
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index b8a665cff5..d4b5f38e02 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueKeyboardEnable),
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),
     UsbKeyboardDevice->DevicePath
     );
 
@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),
     UsbKeyboardDevice->DevicePath
     );
 
@@ -473,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueKeyboardDisable),
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),
     UsbKeyboardDevice->DevicePath
     );
 
@@ -658,7 +658,7 @@ USBKeyboardReset (
 
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueKeyboardReset),
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),
     UsbKeyboardDevice->DevicePath
     );
 
@@ -669,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_PROGRESS_CODE,
-      PcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),
       UsbKeyboardDevice->DevicePath
       );
     //
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 9636d4f2bc..a231bd6e3e 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -811,7 +811,7 @@ InitUSBKeyboard (
 
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueKeyboardSelfTest),
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardSelfTest),
     UsbKeyboardDevice->DevicePath
     );
 
@@ -846,7 +846,7 @@ InitUSBKeyboard (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),
       UsbKeyboardDevice->DevicePath
       );
 
@@ -1012,7 +1012,7 @@ KeyboardHandler (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueKeyboardInputError),
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardInputError),
       UsbKeyboardDevice->DevicePath
       );
 
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 2e22cfcda2..5c39f49dd2 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -232,7 +232,7 @@ USBMouseAbsolutePointerDriverBindingStart (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueMouseInterfaceError),
+      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),
       UsbMouseAbsolutePointerDevice->DevicePath
       );
 
@@ -275,7 +275,7 @@ USBMouseAbsolutePointerDriverBindingStart (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseEnable),
+    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),
     UsbMouseAbsolutePointerDevice->DevicePath
     );
 
@@ -401,7 +401,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseDisable),
+    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),
     UsbMouseAbsolutePointerDevice->DevicePath
     );
 
@@ -682,7 +682,7 @@ OnMouseInterruptComplete (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueMouseInputError),
+      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),
       UsbMouseAbsolutePointerDevice->DevicePath
       );
 
@@ -833,7 +833,7 @@ UsbMouseAbsolutePointerReset (
 
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseReset),
+    FixedPcdGet32 (PcdStatusCodeValueMouseReset),
     UsbMouseAbsolutePointerDevice->DevicePath
     );
 
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index f1b54084b7..667dd2f902 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -232,7 +232,7 @@ USBMouseDriverBindingStart (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueMouseInterfaceError),
+      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),
       UsbMouseDevice->DevicePath
       );
 
@@ -275,7 +275,7 @@ USBMouseDriverBindingStart (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseEnable),
+    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),
     UsbMouseDevice->DevicePath
     );
 
@@ -401,7 +401,7 @@ USBMouseDriverBindingStop (
   //
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseDisable),
+    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),
     UsbMouseDevice->DevicePath
     );
 
@@ -688,7 +688,7 @@ OnMouseInterruptComplete (
     //
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (
       EFI_ERROR_CODE | EFI_ERROR_MINOR,
-      PcdGet32 (PcdStatusCodeValueMouseInputError),
+      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),
       UsbMouseDevice->DevicePath
       );
 
@@ -838,7 +838,7 @@ UsbMouseReset (
 
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (
     EFI_PROGRESS_CODE,
-    PcdGet32 (PcdStatusCodeValueMouseReset),
+    FixedPcdGet32 (PcdStatusCodeValueMouseReset),
     UsbMouseDevice->DevicePath
     );
 
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 3c9ed7c235..442e4d6cae 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -271,7 +271,7 @@ DxeLoadCore (
   //
   // Report Status Code EFI_SW_PEI_PC_HANDOFF_TO_NEXT
   //
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));
 
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%11p EntryPoint=0x%11p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));
 
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index b746221af4..2f2a3a7602 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -277,7 +277,7 @@ RuntimeDriverSetVirtualAddressMap (
   //
   // ReporstStatusCodeLib will check and make sure this service can be called in runtime mode.
   //
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));
 
   //
   // Signal all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE events.
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index ca6d3445f8..e43acbf221 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -66,7 +66,7 @@ WatchdogTimerDriverExpires (
   IN VOID         *Context
   )
 {
-  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, PcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));
+  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, FixedPcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));
 
   //
   // If a notification function has been registered, then call it