Add missing status code in several modules.

Signed-off-by: Li Elvin <elvin.li@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by: Ni Ruiyu <ruiyu.ni@intel.com>
Reviewed-by: Gao Liming <liming.gao@intel.com>
Reviewed-by: Tian Feng <feng.tian@intel.com>
Reviewed-by: Fan Jeff <jeff.fan@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13889 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 99 insertions, 35 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 4f87990876..c020202349 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -3,7 +3,7 @@
   PS/2 Keyboard driver. Routines that interacts with callers,

   conforming to EFI driver model

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -348,6 +348,12 @@ KbdControllerDriverStart (
     goto ErrorExit;

   }

 

+  REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+    EFI_PROGRESS_CODE,

+    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DETECTED,

+    ParentDevicePath

+    );

+

   ConsoleIn->ControllerNameTable = NULL;

   AddUnicodeString2 (

     "eng",

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
index 664d7409b1..7af35bcd11 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
@@ -2,7 +2,7 @@
   A faked PS/2 Absolute Pointer driver. Routines that interacts with callers,

   conforming to EFI driver model

   

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -268,6 +268,13 @@ PS2MouseAbsolutePointerDriverStart (
     StatusCode  = EFI_PERIPHERAL_MOUSE | EFI_P_EC_NOT_DETECTED;

     goto ErrorExit;

   }

+

+  REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+    EFI_PROGRESS_CODE,

+    EFI_PERIPHERAL_MOUSE | EFI_P_PC_DETECTED,

+    ParentDevicePath

+    );

+

   //

   // Setup the WaitForKey event

   //

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index 273bbd6293..1623201876 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
@@ -2,7 +2,7 @@
   PS/2 Mouse driver. Routines that interacts with callers,

   conforming to EFI driver model.

   

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -278,6 +278,13 @@ PS2MouseDriverStart (
     StatusCode  = EFI_PERIPHERAL_MOUSE | EFI_P_EC_NOT_DETECTED;

     goto ErrorExit;

   }

+

+  REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+    EFI_PROGRESS_CODE,

+    EFI_PERIPHERAL_MOUSE | EFI_P_PC_DETECTED,

+    ParentDevicePath

+    );

+

   //

   // Setup the WaitForKey event

   //

diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
index 4e16880bd6..dfdac356cf 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
@@ -1200,6 +1200,14 @@ GenericLegacyBoot (
   EnableAllControllers (Private);

   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {

     //

+    // Report Status Code to indicate legacy boot event will be signalled

+    //

+    REPORT_STATUS_CODE (

+      EFI_PROGRESS_CODE,

+      (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT)

+      );

+

+    //

     // Signal all the events that are waiting on EVT_SIGNAL_LEGACY_BOOT

     //

     EfiSignalEventLegacyBoot ();

diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
index 5e155f0705..e32ebacd94 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
@@ -2304,6 +2304,13 @@ LegacyBiosInstallRom (
         

     if (EFI_ERROR (Status)) {

       DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));

+      //

+      // Report Status Code to indicate that there is no enough space for OpROM

+      //

+      REPORT_STATUS_CODE (

+        EFI_ERROR_CODE | EFI_ERROR_MINOR,

+        (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_LEGACY_OPROM_NO_SPACE)

+        );

       return EFI_OUT_OF_RESOURCES;

     }

     InitAddress = (UINTN) PhysicalAddress;

@@ -2314,6 +2321,13 @@ LegacyBiosInstallRom (
     if (RuntimeAddress + *RuntimeImageLength > PcdGet32 (PcdEndOpromShadowAddress)) {

       DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));

       gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize));

+      //

+      // Report Status Code to indicate that there is no enough space for OpROM

+      //

+      REPORT_STATUS_CODE (

+        EFI_ERROR_CODE | EFI_ERROR_MINOR,

+        (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_LEGACY_OPROM_NO_SPACE)

+        );

       return EFI_OUT_OF_RESOURCES;

     }

   } else {

@@ -2324,6 +2338,13 @@ LegacyBiosInstallRom (
     InitAddress    = PCI_START_ADDRESS (Private->OptionRom);

     if (InitAddress + ImageSize > PcdGet32 (PcdEndOpromShadowAddress)) {

       DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));

+      //

+      // Report Status Code to indicate that there is no enough space for OpROM

+      //

+      REPORT_STATUS_CODE (

+        EFI_ERROR_CODE | EFI_ERROR_MINOR,

+        (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_LEGACY_OPROM_NO_SPACE)

+        );

       return EFI_OUT_OF_RESOURCES;

     }

 

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 4b4333bd88..c04c586f50 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -2279,6 +2279,11 @@ BdsLibBootViaBootOption (
   }

 

   //

+  // Report Status Code to indicate ReadyToBoot event will be signalled

+  //

+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));

+

+  //

   // Signal the EVT_SIGNAL_READY_TO_BOOT event

   //

   EfiSignalEventReadyToBoot();

@@ -2368,47 +2373,40 @@ BdsLibBootViaBootOption (
       // and get the bootable media handle

       //

       Handle = BdsLibGetBootableHandle(DevicePath);

-      if (Handle == NULL) {

-        goto Done;

-      }

-      //

-      // Load the default boot file \EFI\BOOT\boot{machinename}.EFI from removable Media

-      //  machinename is ia32, ia64, x64, ...

-      //

-      FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);

-      if (FilePath != NULL) {

-        REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));

-        Status = gBS->LoadImage (

-                        TRUE,

-                        gImageHandle,

-                        FilePath,

-                        NULL,

-                        0,

-                        &ImageHandle

-                        );

-       if (EFI_ERROR (Status)) {

-          //

-          // The DevicePath failed, and it's not a valid

-          // removable media device.

-          //

-          goto Done;

+      if (Handle != NULL) {

+        //

+        // Load the default boot file \EFI\BOOT\boot{machinename}.EFI from removable Media

+        //  machinename is ia32, ia64, x64, ...

+        //

+        FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);

+        if (FilePath != NULL) {

+          REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));

+          Status = gBS->LoadImage (

+                          TRUE,

+                          gImageHandle,

+                          FilePath,

+                          NULL,

+                          0,

+                          &ImageHandle

+                          );

         }

       }

     }

-

-    if (EFI_ERROR (Status)) {

-      //

-      // It there is any error from the Boot attempt exit now.

-      //

-      goto Done;

-    }

   }

   //

   // Provide the image with it's load options

   //

-  if (ImageHandle == NULL) {

+  if ((ImageHandle == NULL) || (EFI_ERROR(Status))) {

+    //

+    // Report Status Code to indicate that the failure to load boot option

+    //

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR)

+      );    

     goto Done;

   }

+

   Status = gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &ImageInfo);

   ASSERT_EFI_ERROR (Status);

 

@@ -2442,6 +2440,15 @@ BdsLibBootViaBootOption (
 

   Status = gBS->StartImage (ImageHandle, ExitDataSize, ExitData);

   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));

+  if (EFI_ERROR (Status)) {

+    //

+    // Report Status Code to indicate that boot failure

+    //

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED)

+      );

+  }

 

   //

   // Clear the Watchdog Timer after the image returns

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index a919625379..5486a5c530 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -494,6 +494,14 @@ BdsEntry (
   BdsFormalizeEfiGlobalVariable();

 

   //

+  // Report Status Code to indicate connecting drivers will happen

+  //

+  REPORT_STATUS_CODE (

+    EFI_PROGRESS_CODE,

+    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS)

+    );

+

+  //

   // Do the platform init, can be customized by OEM/IBV

   //

   PERF_START (NULL, "PlatformBds", "BDS", 0);