SecurityPkg OpalPasswordPei: Go next when AhciModeInitialize is failed

Go to next loop instead of going to unlock OPAL password when
AhciModeInitialize is failed.

It is just error handling.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.c
index 7f9e14fa81a7ab70daafba05edf1d4dd7ca62c53..b4b2d4b3f0c8fe790d355466b928681bbc9a9336 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.c
@@ -717,17 +717,16 @@ UnlockOpalPasswordAta (
       ASSERT_EFI_ERROR (Status);\r
       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_ERROR, "%a() AhciModeInitialize() error, Status: %r\n", __FUNCTION__, Status));\r
       ASSERT_EFI_ERROR (Status);\r
       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_ERROR, "%a() AhciModeInitialize() error, Status: %r\n", __FUNCTION__, Status));\r

+      } else {\r
+        OpalDev.Signature = OPAL_PEI_DEVICE_SIGNATURE;\r
+        OpalDev.Sscp.ReceiveData = SecurityReceiveData;\r
+        OpalDev.Sscp.SendData = SecuritySendData;\r
+        OpalDev.DeviceType = OPAL_DEVICE_TYPE_ATA;\r
+        OpalDev.Device = (OPAL_DEVICE_COMMON *) DevInfoAta;\r
+        OpalDev.Context = &AhciContext;\r
+\r
+        UnlockOpalPassword (&OpalDev);\r

       }\r
       }\r

-\r
-      OpalDev.Signature = OPAL_PEI_DEVICE_SIGNATURE;\r
-      OpalDev.Sscp.ReceiveData = SecurityReceiveData;\r
-      OpalDev.Sscp.SendData = SecuritySendData;\r
-      OpalDev.DeviceType = OPAL_DEVICE_TYPE_ATA;\r
-      OpalDev.Device = (OPAL_DEVICE_COMMON *) DevInfoAta;\r
-      OpalDev.Context = &AhciContext;\r
-\r
-      UnlockOpalPassword (&OpalDev);\r
-\r

       AhciFreeResource (&AhciContext);\r
       PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x24), AhciBar);\r
     }\r
       AhciFreeResource (&AhciContext);\r
       PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x24), AhciBar);\r
     }\r