From 2ca8548911013db4211172e8546fcff3db27f302 Mon Sep 17 00:00:00 2001
From: qianouyang <qianouyang@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 19 Sep 2012 02:14:51 +0000
Subject: [PATCH] Add TperReset Logic By using MOR bit - Remove the unnecessary
 parameter.

Signed-off-by: Ouyang, Qian <Qian.Ouyang@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13734 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 17e2614b87..625ba1b5b1 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -19,7 +19,6 @@
 #include "AtaBus.h"
 
 UINT8   mMorControl;
-BOOLEAN mHasMor;
 
 //
 // ATA Bus Driver Binding Protocol Instance
@@ -370,16 +369,15 @@ RegisterAtaDevice (
     DEBUG ((EFI_D_INFO, "Successfully Install Storage Security Protocol on the ATA device\n"));
   }
 
-  if (mHasMor) {
-    if (((mMorControl & 0x01) == 0x01) && ((AtaDevice->IdentifyData->trusted_computing_support & BIT0) != 0)) {
-      DEBUG ((EFI_D_INFO,
-              "mMorControl = %x, AtaDevice->IdentifyData->trusted_computing_support & BIT0 = %x\n",
-              mMorControl,
-              (AtaDevice->IdentifyData->trusted_computing_support & BIT0)
-              ));
-      DEBUG ((EFI_D_INFO, "Try to lock device by sending TPer Reset command...\n"));
-      InitiateTPerReset(AtaDevice);
-    }
+
+  if (((mMorControl & 0x01) == 0x01) && ((AtaDevice->IdentifyData->trusted_computing_support & BIT0) != 0)) {
+    DEBUG ((EFI_D_INFO,
+            "mMorControl = %x, AtaDevice->IdentifyData->trusted_computing_support & BIT0 = %x\n",
+            mMorControl,
+            (AtaDevice->IdentifyData->trusted_computing_support & BIT0)
+            ));
+    DEBUG ((EFI_D_INFO, "Try to lock device by sending TPer Reset command...\n"));
+    InitiateTPerReset(AtaDevice);
   }
 
   gBS->OpenProtocol (
@@ -1683,12 +1681,10 @@ InitializeAtaBus(
 
   if (EFI_ERROR (Status)) {
     DEBUG ((EFI_D_INFO, "AtaBus:gEfiMemoryOverwriteControlDataGuid doesn't exist!!***\n"));
-    mHasMor     = FALSE;
     mMorControl = 0;
     Status      = EFI_SUCCESS;
   } else {
     DEBUG ((EFI_D_INFO, "AtaBus:Get the gEfiMemoryOverwriteControlDataGuid = %x!!***\n", mMorControl));
-    mHasMor     = TRUE;
   }
 
   return Status;