Add new adding ATA related status code in PI 1.3 to definition and ATA modules.

Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14535 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 62 insertions, 6 deletions

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 2001175fe7..950b5da038 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -1,7 +1,7 @@
 /** @file

   The file for AHCI mode of ATA host controller.

 

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

+  Copyright (c) 2010 - 2013, 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

@@ -1487,9 +1487,18 @@ AhciAtaSmartReturnStatusCheck (
              );

 

   if (EFI_ERROR (Status)) {

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_DISABLED)

+      );

     return EFI_DEVICE_ERROR;

   }

 

+  REPORT_STATUS_CODE (

+    EFI_PROGRESS_CODE,

+    (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_ENABLE)

+    );

+

   FisBaseAddr = (UINTN)AhciRegisters->AhciRFis + Port * sizeof (EFI_AHCI_RECEIVED_FIS);

 

   Value = *(UINT32 *) (FisBaseAddr + EFI_AHCI_D2H_FIS_OFFSET);

@@ -1503,12 +1512,19 @@ AhciAtaSmartReturnStatusCheck (
       // The threshold exceeded condition is not detected by the device

       //

       DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

-

+      REPORT_STATUS_CODE (

+            EFI_PROGRESS_CODE,

+            (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD)

+            );

     } else if ((LBAMid == 0xf4) && (LBAHigh == 0x2c)) {

       //

       // The threshold exceeded condition is detected by the device

       //

       DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

+      REPORT_STATUS_CODE (

+           EFI_PROGRESS_CODE,

+           (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD)

+           );

     }

   }

 

@@ -1549,11 +1565,21 @@ AhciAtaSmartSupport (
     //

     DEBUG ((EFI_D_INFO, "S.M.A.R.T feature is not supported at port [%d] PortMultiplier [%d]!\n",

             Port, PortMultiplier));

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED)

+      );

   } else {

     //

     // Check if the feature is enabled. If not, then enable S.M.A.R.T.

     //

     if ((IdentifyData->AtaData.command_set_feature_enb_85 & 0x0001) != 0x0001) {

+

+      REPORT_STATUS_CODE (

+        EFI_PROGRESS_CODE,

+        (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_DISABLE)

+        );

+

       ZeroMem (&AtaCommandBlock, sizeof (EFI_ATA_COMMAND_BLOCK));

 

       AtaCommandBlock.AtaCommand      = ATA_CMD_SMART;

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index caffc1cde8..b9d16140b8 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1,7 +1,7 @@
 /** @file

   Header file for AHCI mode of ATA host controller.

 

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

+  Copyright (c) 2010 - 2013, 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

@@ -2296,9 +2296,18 @@ IdeAtaSmartReturnStatusCheck (
              );

 

   if (EFI_ERROR (Status)) {

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_DISABLED)

+      );

     return EFI_DEVICE_ERROR;

   }

 

+  REPORT_STATUS_CODE (

+    EFI_PROGRESS_CODE,

+    (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_ENABLE)

+    );

+

   LBAMid  = IdeReadPortB (Instance->PciIo, Instance->IdeRegisters[Channel].CylinderLsb);

   LBAHigh = IdeReadPortB (Instance->PciIo, Instance->IdeRegisters[Channel].CylinderMsb);

 

@@ -2307,12 +2316,19 @@ IdeAtaSmartReturnStatusCheck (
     // The threshold exceeded condition is not detected by the device

     //

     DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

-

+    REPORT_STATUS_CODE (

+          EFI_PROGRESS_CODE,

+          (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD)

+          );

   } else if ((LBAMid == 0xf4) && (LBAHigh == 0x2c)) {

     //

     // The threshold exceeded condition is detected by the device

     //

     DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

+    REPORT_STATUS_CODE (

+         EFI_PROGRESS_CODE,

+         (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD)

+         );

   }

 

   return EFI_SUCCESS;

@@ -2350,12 +2366,21 @@ IdeAtaSmartSupport (
     //

     DEBUG ((EFI_D_INFO, "S.M.A.R.T feature is not supported at [%a] channel [%a] device!\n",

             (Channel == 1) ? "secondary" : "primary", (Device == 1) ? "slave" : "master"));

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED)

+      );

   } else {

     //

     // Check if the feature is enabled. If not, then enable S.M.A.R.T.

     //

     if ((IdentifyData->AtaData.command_set_feature_enb_85 & 0x0001) != 0x0001) {

 

+      REPORT_STATUS_CODE (

+        EFI_PROGRESS_CODE,

+        (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_DISABLE)

+        );

+

       ZeroMem (&AtaCommandBlock, sizeof (EFI_ATA_COMMAND_BLOCK));

 

       AtaCommandBlock.AtaCommand      = ATA_CMD_SMART;

diff --git a/MdePkg/Include/Pi/PiStatusCode.h b/MdePkg/Include/Pi/PiStatusCode.h
index b4a467f290..8a5e040f59 100644
--- a/MdePkg/Include/Pi/PiStatusCode.h
+++ b/MdePkg/Include/Pi/PiStatusCode.h
@@ -1,7 +1,7 @@
 /** @file

   StatusCode related definitions in PI.

 

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

+Copyright (c) 2009 - 2013, 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 that accompanies this distribution.  

 The full text of the license may be found at

@@ -596,7 +596,10 @@ typedef struct {
 //

 // IO Bus Class ATA/ATAPI Subclass Progress Code definitions.

 //

-

+#define EFI_IOB_ATA_BUS_SMART_ENABLE          (EFI_SUBCLASS_SPECIFIC | 0x00000000)

+#define EFI_IOB_ATA_BUS_SMART_DISABLE         (EFI_SUBCLASS_SPECIFIC | 0x00000001)

+#define EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD   (EFI_SUBCLASS_SPECIFIC | 0x00000002)

+#define EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD  (EFI_SUBCLASS_SPECIFIC | 0x00000003)

 //

 // IO Bus Class FC Subclass Progress Code definitions.

 //

@@ -669,6 +672,8 @@ typedef struct {
 //

 // IO Bus Class ATA/ATAPI Subclass Error Code definitions.

 //

+#define EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED  (EFI_SUBCLASS_SPECIFIC | 0x00000000)

+#define EFI_IOB_ATA_BUS_SMART_DISABLED      (EFI_SUBCLASS_SPECIFIC | 0x00000001)

 

 //

 // IO Bus Class FC Subclass Error Code definitions.