]> git.proxmox.com Git - mirror_edk2.git/commitdiff
SecurityPkg/OpalPassword: Remove HW init codes and consume SSC PPI
authorHao Wu <hao.a.wu@intel.com>
Mon, 27 Aug 2018 08:52:13 +0000 (16:52 +0800)
committerHao Wu <hao.a.wu@intel.com>
Fri, 22 Feb 2019 00:20:08 +0000 (08:20 +0800)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1409

For the current implementation of OpalPassword drivers, it has a feature
to support devices being automatically unlocked in the S3 resume. For this
feature, two types of devices are supported:

* ATA hard disks working under AHCI mode
* NVM Express devices

The support of this feature requires the above 2 types of device to be
initialized at the PEI phase during S3 resume, which is done by the
co-work of the OpalPasswordDxe driver and the OpalPasswordPei driver.

More specifically, the OpalPasswordDxe will handle:

* Pre-allocate MMIO resource and save it in a driver internal LockBox for
  OpalPasswordPei to retrieve;
* Save the PCI configuration space of ATA controllers into boot script.

Meanwhile, the OpalPasswordPei will handle:

* Rely on the boot script for the PCI configuration space program of ATA
  controllers;
* Restore the driver internal LockBox to get the MMIO resource;
* Complete the PCI configuration space program for ATA and NVME
  controllers;
* Initialize ATA and NVME controllers and devices.

This commit will remove these hardware initialization related codes from
the OpalPassword drivers. The hardware initialization will be covered by
PEI storage device drivers (e.g. NvmExpressPei & AhciPei in the
MdeModulePkg).

After such codes removal, the OpalPasswordDxe will only handle:

* Construct/update the S3StorageDeviceInitList LockBox with the managing
  ATA and NVME devices.

And the OpalPasswordPei will only handle:

* Locate Storage Security Command PPI instances to perform the device
  automatic unlock during the S3 resume.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
12 files changed:
SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c [deleted file]
SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h [deleted file]
SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.c [deleted file]
SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.h [deleted file]
SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeReg.h [deleted file]
SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordCommon.h
SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf
SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.c
SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.h
SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordPei.inf

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
deleted file mode 100644 (file)
index 0c4edd5..0000000
+++ /dev/null
@@ -1,1282 +0,0 @@
-/** @file\r
-  This driver is used for Opal Password Feature support at AHCI mode.\r
-\r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-\r
-#include "OpalPasswordPei.h"\r
-\r
-/**\r
-  Start command for give slot on specific port.\r
-\r
-  @param  AhciBar            AHCI bar address.\r
-  @param  Port               The number of port.\r
-  @param  CommandSlot        The number of CommandSlot.\r
-  @param  Timeout            The timeout Value of start.\r
-\r
-  @retval EFI_DEVICE_ERROR   The command start unsuccessfully.\r
-  @retval EFI_TIMEOUT        The operation is time out.\r
-  @retval EFI_SUCCESS        The command start successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciStartCommand (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT8                     CommandSlot,\r
-  IN  UINT64                    Timeout\r
-  );\r
-\r
-/**\r
-  Stop command running for giving port\r
-\r
-  @param  AhciBar            AHCI bar address.\r
-  @param  Port               The number of port.\r
-  @param  Timeout            The timeout Value of stop.\r
-\r
-  @retval EFI_DEVICE_ERROR   The command stop unsuccessfully.\r
-  @retval EFI_TIMEOUT        The operation is time out.\r
-  @retval EFI_SUCCESS        The command stop successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciStopCommand (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT64                    Timeout\r
-  );\r
-\r
-/**\r
-  Read AHCI Operation register.\r
-\r
-  @param  AhciBar      AHCI bar address.\r
-  @param  Offset       The operation register offset.\r
-\r
-  @return The register content read.\r
-\r
-**/\r
-UINT32\r
-EFIAPI\r
-AhciReadReg (\r
-  IN  UINT32              AhciBar,\r
-  IN  UINT32              Offset\r
-  )\r
-{\r
-  UINT32   Data;\r
-\r
-  Data = 0;\r
-\r
-  Data = MmioRead32 (AhciBar + Offset);\r
-\r
-  return Data;\r
-}\r
-\r
-/**\r
-  Write AHCI Operation register.\r
-\r
-  @param  AhciBar      AHCI bar address.\r
-  @param  Offset       The operation register offset.\r
-  @param  Data         The Data used to write down.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciWriteReg (\r
-  IN UINT32               AhciBar,\r
-  IN UINT32               Offset,\r
-  IN UINT32               Data\r
-  )\r
-{\r
-  MmioWrite32 (AhciBar + Offset, Data);\r
-\r
-  return ;\r
-}\r
-\r
-/**\r
-  Do AND operation with the Value of AHCI Operation register.\r
-\r
-  @param  AhciBar      AHCI bar address.\r
-  @param  Offset       The operation register offset.\r
-  @param  AndData      The Data used to do AND operation.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciAndReg (\r
-  IN UINT32               AhciBar,\r
-  IN UINT32               Offset,\r
-  IN UINT32               AndData\r
-  )\r
-{\r
-  UINT32 Data;\r
-\r
-  Data  = AhciReadReg (AhciBar, Offset);\r
-\r
-  Data &= AndData;\r
-\r
-  AhciWriteReg (AhciBar, Offset, Data);\r
-}\r
-\r
-/**\r
-  Do OR operation with the Value of AHCI Operation register.\r
-\r
-  @param  AhciBar      AHCI bar address.\r
-  @param  Offset       The operation register offset.\r
-  @param  OrData       The Data used to do OR operation.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciOrReg (\r
-  IN UINT32               AhciBar,\r
-  IN UINT32               Offset,\r
-  IN UINT32               OrData\r
-  )\r
-{\r
-  UINT32 Data;\r
-\r
-  Data  = AhciReadReg (AhciBar, Offset);\r
-\r
-  Data |= OrData;\r
-\r
-  AhciWriteReg (AhciBar, Offset, Data);\r
-}\r
-\r
-/**\r
-  Wait for memory set to the test Value.\r
-\r
-  @param  AhciBar           AHCI bar address.\r
-  @param  Offset            The memory offset to test.\r
-  @param  MaskValue         The mask Value of memory.\r
-  @param  TestValue         The test Value of memory.\r
-  @param  Timeout           The time out Value for wait memory set.\r
-\r
-  @retval EFI_DEVICE_ERROR  The memory is not set.\r
-  @retval EFI_TIMEOUT       The memory setting is time out.\r
-  @retval EFI_SUCCESS       The memory is correct set.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciWaitMmioSet (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT32                    Offset,\r
-  IN  UINT32                    MaskValue,\r
-  IN  UINT32                    TestValue,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32     Value;\r
-  UINT32     Delay;\r
-\r
-  Delay = (UINT32) (DivU64x32(Timeout, 1000) + 1);\r
-\r
-  do {\r
-    Value = AhciReadReg (AhciBar, Offset) & MaskValue;\r
-\r
-    if (Value == TestValue) {\r
-      return EFI_SUCCESS;\r
-    }\r
-\r
-    //\r
-    // Stall for 100 microseconds.\r
-    //\r
-    MicroSecondDelay (100);\r
-\r
-    Delay--;\r
-\r
-  } while (Delay > 0);\r
-\r
-  return EFI_TIMEOUT;\r
-}\r
-/**\r
-  Wait for the Value of the specified system memory set to the test Value.\r
-\r
-  @param  Address           The system memory address to test.\r
-  @param  MaskValue         The mask Value of memory.\r
-  @param  TestValue         The test Value of memory.\r
-  @param  Timeout           The time out Value for wait memory set, uses 100ns as a unit.\r
-\r
-  @retval EFI_TIMEOUT       The system memory setting is time out.\r
-  @retval EFI_SUCCESS       The system memory is correct set.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciWaitMemSet (\r
-  IN  EFI_PHYSICAL_ADDRESS      Address,\r
-  IN  UINT32                    MaskValue,\r
-  IN  UINT32                    TestValue,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32     Value;\r
-  UINT32     Delay;\r
-\r
-  Delay = (UINT32) (DivU64x32 (Timeout, 1000) + 1);\r
-\r
-  do {\r
-    //\r
-    // Access sytem memory to see if the Value is the tested one.\r
-    //\r
-    // The system memory pointed by Address will be updated by the\r
-    // SATA Host Controller, "volatile" is introduced to prevent\r
-    // compiler from optimizing the access to the memory address\r
-    // to only read once.\r
-    //\r
-    Value  = *(volatile UINT32 *) (UINTN) Address;\r
-    Value &= MaskValue;\r
-\r
-    if (Value == TestValue) {\r
-      return EFI_SUCCESS;\r
-    }\r
-\r
-    //\r
-    // Stall for 100 microseconds.\r
-    //\r
-    MicroSecondDelay (100);\r
-\r
-    Delay--;\r
-\r
-  } while (Delay > 0);\r
-\r
-  return EFI_TIMEOUT;\r
-}\r
-\r
-/**\r
-  Check the memory status to the test Value.\r
-\r
-  @param[in]       Address           The memory address to test.\r
-  @param[in]       MaskValue         The mask Value of memory.\r
-  @param[in]       TestValue         The test Value of memory.\r
-  @param[in, out]  RetryTimes        The retry times Value for waitting memory set. If 0, then just try once.\r
-\r
-  @retval EFI_NOTREADY      The memory is not set.\r
-  @retval EFI_TIMEOUT       The memory setting retry times out.\r
-  @retval EFI_SUCCESS       The memory is correct set.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciCheckMemSet (\r
-  IN     UINTN                     Address,\r
-  IN     UINT32                    MaskValue,\r
-  IN     UINT32                    TestValue,\r
-  IN OUT UINTN                     *RetryTimes OPTIONAL\r
-  )\r
-{\r
-  UINT32     Value;\r
-\r
-  if (RetryTimes != NULL) {\r
-    (*RetryTimes)--;\r
-  }\r
-\r
-  Value  = *(volatile UINT32 *) Address;\r
-  Value &= MaskValue;\r
-\r
-  if (Value == TestValue) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  if ((RetryTimes != NULL) && (*RetryTimes == 0)) {\r
-    return EFI_TIMEOUT;\r
-  } else {\r
-    return EFI_NOT_READY;\r
-  }\r
-}\r
-\r
-/**\r
-  Clear the port interrupt and error status. It will also clear\r
-  HBA interrupt status.\r
-\r
-  @param      AhciBar        AHCI bar address.\r
-  @param      Port           The number of port.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciClearPortStatus (\r
-  IN  UINT32                 AhciBar,\r
-  IN  UINT8                  Port\r
-  )\r
-{\r
-  UINT32 Offset;\r
-\r
-  //\r
-  // Clear any error status\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_SERR;\r
-  AhciWriteReg (AhciBar, Offset, AhciReadReg (AhciBar, Offset));\r
-\r
-  //\r
-  // Clear any port interrupt status\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_IS;\r
-  AhciWriteReg (AhciBar, Offset, AhciReadReg (AhciBar, Offset));\r
-\r
-  //\r
-  // Clear any HBA interrupt status\r
-  //\r
-  AhciWriteReg (AhciBar, EFI_AHCI_IS_OFFSET, AhciReadReg (AhciBar, EFI_AHCI_IS_OFFSET));\r
-}\r
-\r
-/**\r
-  Enable the FIS running for giving port.\r
-\r
-  @param      AhciBar        AHCI bar address.\r
-  @param      Port           The number of port.\r
-  @param      Timeout        The timeout Value of enabling FIS.\r
-\r
-  @retval EFI_DEVICE_ERROR   The FIS enable setting fails.\r
-  @retval EFI_TIMEOUT        The FIS enable setting is time out.\r
-  @retval EFI_SUCCESS        The FIS enable successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciEnableFisReceive (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32 Offset;\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_CMD_FRE);\r
-\r
-  return AhciWaitMmioSet (\r
-           AhciBar,\r
-           Offset,\r
-           EFI_AHCI_PORT_CMD_FR,\r
-           EFI_AHCI_PORT_CMD_FR,\r
-           Timeout\r
-           );\r
-}\r
-\r
-/**\r
-  Disable the FIS running for giving port.\r
-\r
-  @param      AhciBar        AHCI bar address.\r
-  @param      Port           The number of port.\r
-  @param      Timeout        The timeout Value of disabling FIS.\r
-\r
-  @retval EFI_DEVICE_ERROR   The FIS disable setting fails.\r
-  @retval EFI_TIMEOUT        The FIS disable setting is time out.\r
-  @retval EFI_UNSUPPORTED    The port is in running state.\r
-  @retval EFI_SUCCESS        The FIS disable successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciDisableFisReceive (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32 Offset;\r
-  UINT32 Data;\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  Data   = AhciReadReg (AhciBar, Offset);\r
-\r
-  //\r
-  // Before disabling Fis receive, the DMA engine of the port should NOT be in running status.\r
-  //\r
-  if ((Data & (EFI_AHCI_PORT_CMD_ST | EFI_AHCI_PORT_CMD_CR)) != 0) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  //\r
-  // Check if the Fis receive DMA engine for the port is running.\r
-  //\r
-  if ((Data & EFI_AHCI_PORT_CMD_FR) != EFI_AHCI_PORT_CMD_FR) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  AhciAndReg (AhciBar, Offset, (UINT32)~(EFI_AHCI_PORT_CMD_FRE));\r
-\r
-  return AhciWaitMmioSet (\r
-           AhciBar,\r
-           Offset,\r
-           EFI_AHCI_PORT_CMD_FR,\r
-           0,\r
-           Timeout\r
-           );\r
-}\r
-\r
-/**\r
-  Build the command list, command table and prepare the fis receiver.\r
-\r
-  @param    AhciContext           The pointer to the AHCI_CONTEXT.\r
-  @param    Port                  The number of port.\r
-  @param    PortMultiplier        The timeout Value of stop.\r
-  @param    CommandFis            The control fis will be used for the transfer.\r
-  @param    CommandList           The command list will be used for the transfer.\r
-  @param    AtapiCommand          The atapi command will be used for the transfer.\r
-  @param    AtapiCommandLength    The Length of the atapi command.\r
-  @param    CommandSlotNumber     The command slot will be used for the transfer.\r
-  @param    DataPhysicalAddr      The pointer to the Data Buffer pci bus master address.\r
-  @param    DataLength            The Data count to be transferred.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciBuildCommand (\r
-  IN     AHCI_CONTEXT               *AhciContext,\r
-  IN     UINT8                      Port,\r
-  IN     UINT8                      PortMultiplier,\r
-  IN     EFI_AHCI_COMMAND_FIS       *CommandFis,\r
-  IN     EFI_AHCI_COMMAND_LIST      *CommandList,\r
-  IN     EFI_AHCI_ATAPI_COMMAND     *AtapiCommand OPTIONAL,\r
-  IN     UINT8                      AtapiCommandLength,\r
-  IN     UINT8                      CommandSlotNumber,\r
-  IN OUT VOID                       *DataPhysicalAddr,\r
-  IN     UINT64                     DataLength\r
-  )\r
-{\r
-  EFI_AHCI_REGISTERS    *AhciRegisters;\r
-  UINT32                AhciBar;\r
-  UINT64                BaseAddr;\r
-  UINT64                PrdtNumber;\r
-  UINTN                 RemainedData;\r
-  UINTN                 MemAddr;\r
-  DATA_64               Data64;\r
-  UINT32                Offset;\r
-\r
-  AhciRegisters = &AhciContext->AhciRegisters;\r
-  AhciBar = AhciContext->AhciBar;\r
-\r
-  //\r
-  // Filling the PRDT\r
-  //\r
-  PrdtNumber = DivU64x32 (DataLength + EFI_AHCI_MAX_DATA_PER_PRDT - 1, EFI_AHCI_MAX_DATA_PER_PRDT);\r
-\r
-  //\r
-  // According to AHCI 1.3 spec, a PRDT entry can point to a maximum 4MB Data block.\r
-  // It also limits that the maximum amount of the PRDT entry in the command table\r
-  // is 65535.\r
-  //\r
-  ASSERT (PrdtNumber <= 1);\r
-\r
-  Data64.Uint64 = (UINTN) (AhciRegisters->AhciRFis);\r
-\r
-  BaseAddr = Data64.Uint64;\r
-\r
-  ZeroMem ((VOID *)((UINTN) BaseAddr), sizeof (EFI_AHCI_RECEIVED_FIS));\r
-\r
-  ZeroMem (AhciRegisters->AhciCommandTable, sizeof (EFI_AHCI_COMMAND_TABLE));\r
-\r
-  CommandFis->AhciCFisPmNum = PortMultiplier;\r
-\r
-  CopyMem (&AhciRegisters->AhciCommandTable->CommandFis, CommandFis, sizeof (EFI_AHCI_COMMAND_FIS));\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  if (AtapiCommand != NULL) {\r
-    CopyMem (\r
-      &AhciRegisters->AhciCommandTable->AtapiCmd,\r
-      AtapiCommand,\r
-      AtapiCommandLength\r
-      );\r
-\r
-    CommandList->AhciCmdA = 1;\r
-    CommandList->AhciCmdP = 1;\r
-\r
-    AhciOrReg (AhciBar, Offset, (EFI_AHCI_PORT_CMD_DLAE | EFI_AHCI_PORT_CMD_ATAPI));\r
-  } else {\r
-    AhciAndReg (AhciBar, Offset, (UINT32)~(EFI_AHCI_PORT_CMD_DLAE | EFI_AHCI_PORT_CMD_ATAPI));\r
-  }\r
-\r
-  RemainedData = (UINTN) DataLength;\r
-  MemAddr      = (UINTN) DataPhysicalAddr;\r
-  CommandList->AhciCmdPrdtl = (UINT32)PrdtNumber;\r
-\r
-  AhciRegisters->AhciCommandTable->PrdtTable.AhciPrdtDbc = (UINT32)RemainedData - 1;\r
-\r
-  Data64.Uint64 = (UINT64)MemAddr;\r
-  AhciRegisters->AhciCommandTable->PrdtTable.AhciPrdtDba  = Data64.Uint32.Lower32;\r
-  AhciRegisters->AhciCommandTable->PrdtTable.AhciPrdtDbau = Data64.Uint32.Upper32;\r
-\r
-  //\r
-  // Set the last PRDT to Interrupt On Complete\r
-  //\r
-  AhciRegisters->AhciCommandTable->PrdtTable.AhciPrdtIoc = 1;\r
-\r
-  CopyMem (\r
-    (VOID *) ((UINTN) AhciRegisters->AhciCmdList + (UINTN) CommandSlotNumber * sizeof (EFI_AHCI_COMMAND_LIST)),\r
-    CommandList,\r
-    sizeof (EFI_AHCI_COMMAND_LIST)\r
-    );\r
-\r
-  Data64.Uint64 = (UINT64)(UINTN) AhciRegisters->AhciCommandTable;\r
-  AhciRegisters->AhciCmdList[CommandSlotNumber].AhciCmdCtba  = Data64.Uint32.Lower32;\r
-  AhciRegisters->AhciCmdList[CommandSlotNumber].AhciCmdCtbau = Data64.Uint32.Upper32;\r
-  AhciRegisters->AhciCmdList[CommandSlotNumber].AhciCmdPmp   = PortMultiplier;\r
-\r
-}\r
-\r
-/**\r
-  Buid a command FIS.\r
-\r
-  @param  CmdFis            A pointer to the EFI_AHCI_COMMAND_FIS Data structure.\r
-  @param  AtaCommandBlock   A pointer to the AhciBuildCommandFis Data structure.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciBuildCommandFis (\r
-  IN OUT EFI_AHCI_COMMAND_FIS    *CmdFis,\r
-  IN     EFI_ATA_COMMAND_BLOCK   *AtaCommandBlock\r
-  )\r
-{\r
-  ZeroMem (CmdFis, sizeof (EFI_AHCI_COMMAND_FIS));\r
-\r
-  CmdFis->AhciCFisType = EFI_AHCI_FIS_REGISTER_H2D;\r
-  //\r
-  // Indicator it's a command\r
-  //\r
-  CmdFis->AhciCFisCmdInd      = 0x1;\r
-  CmdFis->AhciCFisCmd         = AtaCommandBlock->AtaCommand;\r
-\r
-  CmdFis->AhciCFisFeature     = AtaCommandBlock->AtaFeatures;\r
-  CmdFis->AhciCFisFeatureExp  = AtaCommandBlock->AtaFeaturesExp;\r
-\r
-  CmdFis->AhciCFisSecNum      = AtaCommandBlock->AtaSectorNumber;\r
-  CmdFis->AhciCFisSecNumExp   = AtaCommandBlock->AtaSectorNumberExp;\r
-\r
-  CmdFis->AhciCFisClyLow      = AtaCommandBlock->AtaCylinderLow;\r
-  CmdFis->AhciCFisClyLowExp   = AtaCommandBlock->AtaCylinderLowExp;\r
-\r
-  CmdFis->AhciCFisClyHigh     = AtaCommandBlock->AtaCylinderHigh;\r
-  CmdFis->AhciCFisClyHighExp  = AtaCommandBlock->AtaCylinderHighExp;\r
-\r
-  CmdFis->AhciCFisSecCount    = AtaCommandBlock->AtaSectorCount;\r
-  CmdFis->AhciCFisSecCountExp = AtaCommandBlock->AtaSectorCountExp;\r
-\r
-  CmdFis->AhciCFisDevHead     = (UINT8) (AtaCommandBlock->AtaDeviceHead | 0xE0);\r
-}\r
-\r
-/**\r
-  Start a PIO Data transfer on specific port.\r
-\r
-  @param  AhciContext         The pointer to the AHCI_CONTEXT.\r
-  @param  Port                The number of port.\r
-  @param  PortMultiplier      The timeout Value of stop.\r
-  @param  AtapiCommand        The atapi command will be used for the transfer.\r
-  @param  AtapiCommandLength  The Length of the atapi command.\r
-  @param  Read                The transfer direction.\r
-  @param  AtaCommandBlock     The EFI_ATA_COMMAND_BLOCK Data.\r
-  @param  AtaStatusBlock      The EFI_ATA_STATUS_BLOCK Data.\r
-  @param  MemoryAddr          The pointer to the Data Buffer.\r
-  @param  DataCount           The Data count to be transferred.\r
-  @param  Timeout             The timeout Value of non Data transfer.\r
-\r
-  @retval EFI_DEVICE_ERROR    The PIO Data transfer abort with error occurs.\r
-  @retval EFI_TIMEOUT         The operation is time out.\r
-  @retval EFI_UNSUPPORTED     The device is not ready for transfer.\r
-  @retval EFI_SUCCESS         The PIO Data transfer executes successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciPioTransfer (\r
-  IN     AHCI_CONTEXT               *AhciContext,\r
-  IN     UINT8                      Port,\r
-  IN     UINT8                      PortMultiplier,\r
-  IN     EFI_AHCI_ATAPI_COMMAND     *AtapiCommand OPTIONAL,\r
-  IN     UINT8                      AtapiCommandLength,\r
-  IN     BOOLEAN                    Read,\r
-  IN     EFI_ATA_COMMAND_BLOCK      *AtaCommandBlock,\r
-  IN OUT EFI_ATA_STATUS_BLOCK       *AtaStatusBlock,\r
-  IN OUT VOID                       *MemoryAddr,\r
-  IN     UINT32                     DataCount,\r
-  IN     UINT64                     Timeout\r
-  )\r
-{\r
-  EFI_STATUS                    Status;\r
-  EFI_AHCI_REGISTERS            *AhciRegisters;\r
-  UINT32                        AhciBar;\r
-  UINT32                        FisBaseAddr;\r
-  UINT32                        Offset;\r
-  UINT32                        Delay;\r
-  EFI_AHCI_COMMAND_FIS          CFis;\r
-  EFI_AHCI_COMMAND_LIST         CmdList;\r
-  UINT32                        PortTfd;\r
-  UINT32                        PrdCount;\r
-  UINT32                        OldRfisLo;\r
-  UINT32                        OldRfisHi;\r
-  UINT32                        OldCmdListLo;\r
-  UINT32                        OldCmdListHi;\r
-\r
-  AhciRegisters = &AhciContext->AhciRegisters;\r
-  AhciBar = AhciContext->AhciBar;\r
-\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FB;\r
-  OldRfisLo = AhciReadReg (AhciBar, Offset);\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FBU;\r
-  OldRfisHi = AhciReadReg (AhciBar, Offset);\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FB;\r
-  AhciWriteReg (AhciBar, Offset, (UINT32)(UINTN)AhciRegisters->AhciRFis);\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FBU;\r
-  AhciWriteReg (AhciBar, Offset, 0);\r
-\r
-  //\r
-  // Single task envrionment, we only use one command table for all port\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLB;\r
-  OldCmdListLo = AhciReadReg (AhciBar, Offset);\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLBU;\r
-  OldCmdListHi = AhciReadReg (AhciBar, Offset);\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLB;\r
-  AhciWriteReg (AhciBar, Offset, (UINT32)(UINTN)AhciRegisters->AhciCmdList);\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLBU;\r
-  AhciWriteReg (AhciBar, Offset, 0);\r
-\r
-  //\r
-  // Package read needed\r
-  //\r
-  AhciBuildCommandFis (&CFis, AtaCommandBlock);\r
-\r
-  ZeroMem (&CmdList, sizeof (EFI_AHCI_COMMAND_LIST));\r
-\r
-  CmdList.AhciCmdCfl = EFI_AHCI_FIS_REGISTER_H2D_LENGTH / 4;\r
-  CmdList.AhciCmdW   = Read ? 0 : 1;\r
-\r
-  AhciBuildCommand (\r
-    AhciContext,\r
-    Port,\r
-    PortMultiplier,\r
-    &CFis,\r
-    &CmdList,\r
-    AtapiCommand,\r
-    AtapiCommandLength,\r
-    0,\r
-    MemoryAddr,\r
-    DataCount\r
-    );\r
-\r
-  Status = AhciStartCommand (\r
-             AhciBar,\r
-             Port,\r
-             0,\r
-             Timeout\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    goto Exit;\r
-  }\r
-\r
-  //\r
-  // Checking the status and wait the driver sending Data\r
-  //\r
-  FisBaseAddr = (UINT32)(UINTN)AhciRegisters->AhciRFis;\r
-  if (Read && (AtapiCommand == 0)) {\r
-    //\r
-    // Wait device sends the PIO setup fis before Data transfer\r
-    //\r
-    Status = EFI_TIMEOUT;\r
-    Delay  = (UINT32) (DivU64x32 (Timeout, 1000) + 1);\r
-    do {\r
-      Offset = FisBaseAddr + EFI_AHCI_PIO_FIS_OFFSET;\r
-\r
-      Status = AhciCheckMemSet (Offset, EFI_AHCI_FIS_TYPE_MASK, EFI_AHCI_FIS_PIO_SETUP, 0);\r
-      if (!EFI_ERROR (Status)) {\r
-        Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
-        PortTfd = AhciReadReg (AhciBar, (UINT32) Offset);\r
-        //\r
-        // PxTFD will be updated if there is a D2H or SetupFIS received.\r
-        // For PIO IN transfer, D2H means a device error. Therefore we only need to check the TFD after receiving a SetupFIS.\r
-        //\r
-        if ((PortTfd & EFI_AHCI_PORT_TFD_ERR) != 0) {\r
-          Status = EFI_DEVICE_ERROR;\r
-          break;\r
-        }\r
-\r
-        PrdCount = *(volatile UINT32 *) (&(AhciRegisters->AhciCmdList[0].AhciCmdPrdbc));\r
-        if (PrdCount == DataCount) {\r
-          break;\r
-        }\r
-      }\r
-\r
-      Offset = FisBaseAddr + EFI_AHCI_D2H_FIS_OFFSET;\r
-      Status = AhciCheckMemSet (Offset, EFI_AHCI_FIS_TYPE_MASK, EFI_AHCI_FIS_REGISTER_D2H, 0);\r
-      if (!EFI_ERROR (Status)) {\r
-        Status = EFI_DEVICE_ERROR;\r
-        break;\r
-      }\r
-\r
-      //\r
-      // Stall for 100 microseconds.\r
-      //\r
-      MicroSecondDelay(100);\r
-\r
-      Delay--;\r
-    } while (Delay > 0);\r
-  } else {\r
-    //\r
-    // Wait for D2H Fis is received\r
-    //\r
-    Offset = FisBaseAddr + EFI_AHCI_D2H_FIS_OFFSET;\r
-    Status = AhciWaitMemSet (\r
-               Offset,\r
-               EFI_AHCI_FIS_TYPE_MASK,\r
-               EFI_AHCI_FIS_REGISTER_D2H,\r
-               Timeout\r
-               );\r
-\r
-    if (EFI_ERROR (Status)) {\r
-      goto Exit;\r
-    }\r
-\r
-    Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
-    PortTfd = AhciReadReg (AhciBar, (UINT32) Offset);\r
-    if ((PortTfd & EFI_AHCI_PORT_TFD_ERR) != 0) {\r
-      Status = EFI_DEVICE_ERROR;\r
-    }\r
-  }\r
-\r
-Exit:\r
-  AhciStopCommand (\r
-    AhciBar,\r
-    Port,\r
-    Timeout\r
-    );\r
-\r
-  AhciDisableFisReceive (\r
-    AhciBar,\r
-    Port,\r
-    Timeout\r
-    );\r
-\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FB;\r
-  AhciWriteReg (AhciBar, Offset, OldRfisLo);\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FBU;\r
-  AhciWriteReg (AhciBar, Offset, OldRfisHi);\r
-\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLB;\r
-  AhciWriteReg (AhciBar, Offset, OldCmdListLo);\r
-  Offset    = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLBU;\r
-  AhciWriteReg (AhciBar, Offset, OldCmdListHi);\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Stop command running for giving port\r
-\r
-  @param  AhciBar            AHCI bar address.\r
-  @param  Port               The number of port.\r
-  @param  Timeout            The timeout Value of stop.\r
-\r
-  @retval EFI_DEVICE_ERROR   The command stop unsuccessfully.\r
-  @retval EFI_TIMEOUT        The operation is time out.\r
-  @retval EFI_SUCCESS        The command stop successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciStopCommand (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32 Offset;\r
-  UINT32 Data;\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  Data   = AhciReadReg (AhciBar, Offset);\r
-\r
-  if ((Data & (EFI_AHCI_PORT_CMD_ST |  EFI_AHCI_PORT_CMD_CR)) == 0) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  if ((Data & EFI_AHCI_PORT_CMD_ST) != 0) {\r
-    AhciAndReg (AhciBar, Offset, (UINT32)~(EFI_AHCI_PORT_CMD_ST));\r
-  }\r
-\r
-  return AhciWaitMmioSet (\r
-           AhciBar,\r
-           Offset,\r
-           EFI_AHCI_PORT_CMD_CR,\r
-           0,\r
-           Timeout\r
-           );\r
-}\r
-\r
-/**\r
-  Start command for give slot on specific port.\r
-\r
-  @param  AhciBar            AHCI bar address.\r
-  @param  Port               The number of port.\r
-  @param  CommandSlot        The number of CommandSlot.\r
-  @param  Timeout            The timeout Value of start.\r
-\r
-  @retval EFI_DEVICE_ERROR   The command start unsuccessfully.\r
-  @retval EFI_TIMEOUT        The operation is time out.\r
-  @retval EFI_SUCCESS        The command start successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciStartCommand (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT8                     Port,\r
-  IN  UINT8                     CommandSlot,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32                        CmdSlotBit;\r
-  EFI_STATUS                    Status;\r
-  UINT32                        PortStatus;\r
-  UINT32                        StartCmd;\r
-  UINT32                        PortTfd;\r
-  UINT32                        Offset;\r
-  UINT32                        Capability;\r
-\r
-  //\r
-  // Collect AHCI controller information\r
-  //\r
-  Capability = AhciReadReg(AhciBar, EFI_AHCI_CAPABILITY_OFFSET);\r
-\r
-  CmdSlotBit = (UINT32) (1 << CommandSlot);\r
-\r
-  AhciClearPortStatus (\r
-    AhciBar,\r
-    Port\r
-    );\r
-\r
-  Status = AhciEnableFisReceive (\r
-             AhciBar,\r
-             Port,\r
-             Timeout\r
-             );\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  PortStatus = AhciReadReg (AhciBar, Offset);\r
-\r
-  StartCmd = 0;\r
-  if ((PortStatus & EFI_AHCI_PORT_CMD_ALPE) != 0) {\r
-    StartCmd = AhciReadReg (AhciBar, Offset);\r
-    StartCmd &= ~EFI_AHCI_PORT_CMD_ICC_MASK;\r
-    StartCmd |= EFI_AHCI_PORT_CMD_ACTIVE;\r
-  }\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
-  PortTfd = AhciReadReg (AhciBar, Offset);\r
-\r
-  if ((PortTfd & (EFI_AHCI_PORT_TFD_BSY | EFI_AHCI_PORT_TFD_DRQ)) != 0) {\r
-    if ((Capability & BIT24) != 0) {\r
-      Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-      AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_CMD_COL);\r
-\r
-      AhciWaitMmioSet (\r
-        AhciBar,\r
-        Offset,\r
-        EFI_AHCI_PORT_CMD_COL,\r
-        0,\r
-        Timeout\r
-        );\r
-    }\r
-  }\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_CMD_ST | StartCmd);\r
-\r
-  //\r
-  // Setting the command\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_SACT;\r
-  AhciAndReg (AhciBar, Offset, 0);\r
-  AhciOrReg (AhciBar, Offset, CmdSlotBit);\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CI;\r
-  AhciAndReg (AhciBar, Offset, 0);\r
-  AhciOrReg (AhciBar, Offset, CmdSlotBit);\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-\r
-/**\r
-  Do AHCI HBA reset.\r
-\r
-  @param[in]  AhciBar        AHCI bar address.\r
-  @param[in]  Timeout        The timeout Value of reset.\r
-\r
-  @retval EFI_DEVICE_ERROR   AHCI controller is failed to complete hardware reset.\r
-  @retval EFI_TIMEOUT        The reset operation is time out.\r
-  @retval EFI_SUCCESS        AHCI controller is reset successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciReset (\r
-  IN  UINT32                    AhciBar,\r
-  IN  UINT64                    Timeout\r
-  )\r
-{\r
-  UINT32                 Delay;\r
-  UINT32                 Value;\r
-  UINT32                 Capability;\r
-\r
-  //\r
-  // Collect AHCI controller information\r
-  //\r
-  Capability = AhciReadReg (AhciBar, EFI_AHCI_CAPABILITY_OFFSET);\r
-\r
-  //\r
-  // Enable AE before accessing any AHCI registers if Supports AHCI Mode Only is not set\r
-  //\r
-  if ((Capability & EFI_AHCI_CAP_SAM) == 0) {\r
-    AhciOrReg (AhciBar, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_ENABLE);\r
-  }\r
-\r
-  AhciOrReg (AhciBar, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_RESET);\r
-\r
-  Delay = (UINT32) (DivU64x32(Timeout, 1000) + 1);\r
-\r
-  do {\r
-    Value = AhciReadReg(AhciBar, EFI_AHCI_GHC_OFFSET);\r
-    if ((Value & EFI_AHCI_GHC_RESET) == 0) {\r
-      return EFI_SUCCESS;\r
-    }\r
-\r
-    //\r
-    // Stall for 100 microseconds.\r
-    //\r
-    MicroSecondDelay(100);\r
-\r
-    Delay--;\r
-  } while (Delay > 0);\r
-\r
-  return EFI_TIMEOUT;\r
-\r
-\r
-}\r
-\r
-/**\r
-  Allocate transfer-related data struct which is used at AHCI mode.\r
-\r
-  @param[in, out] AhciContext   The pointer to the AHCI_CONTEXT.\r
-\r
-  @retval EFI_OUT_OF_RESOURCE   No enough resource.\r
-  @retval EFI_SUCCESS           Successful to allocate resource.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciAllocateResource (\r
-  IN OUT AHCI_CONTEXT       *AhciContext\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  EFI_AHCI_REGISTERS        *AhciRegisters;\r
-  EFI_PHYSICAL_ADDRESS      DeviceAddress;\r
-  VOID                      *Base;\r
-  VOID                      *Mapping;\r
-\r
-  AhciRegisters = &AhciContext->AhciRegisters;\r
-\r
-  //\r
-  // Allocate resources required by AHCI host controller.\r
-  //\r
-  Status = IoMmuAllocateBuffer (\r
-             EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-             &Base,\r
-             &DeviceAddress,\r
-             &Mapping\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Base));\r
-  AhciRegisters->AhciRFisMapping = Mapping;\r
-  AhciRegisters->AhciRFis = Base;\r
-  ZeroMem (AhciRegisters->AhciRFis, EFI_PAGE_SIZE * EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)));\r
-\r
-  Status = IoMmuAllocateBuffer (\r
-             EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_LIST)),\r
-             &Base,\r
-             &DeviceAddress,\r
-             &Mapping\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-       AhciRegisters->AhciRFis,\r
-       AhciRegisters->AhciRFisMapping\r
-       );\r
-    AhciRegisters->AhciRFis = NULL;\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Base));\r
-  AhciRegisters->AhciCmdListMapping = Mapping;\r
-  AhciRegisters->AhciCmdList = Base;\r
-  ZeroMem (AhciRegisters->AhciCmdList, EFI_PAGE_SIZE * EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_LIST)));\r
-\r
-  Status = IoMmuAllocateBuffer (\r
-             EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_TABLE)),\r
-             &Base,\r
-             &DeviceAddress,\r
-             &Mapping\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_LIST)),\r
-       AhciRegisters->AhciCmdList,\r
-       AhciRegisters->AhciCmdListMapping\r
-       );\r
-    AhciRegisters->AhciCmdList = NULL;\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-       AhciRegisters->AhciRFis,\r
-       AhciRegisters->AhciRFisMapping\r
-       );\r
-    AhciRegisters->AhciRFis = NULL;\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Base));\r
-  AhciRegisters->AhciCommandTableMapping = Mapping;\r
-  AhciRegisters->AhciCommandTable = Base;\r
-  ZeroMem (AhciRegisters->AhciCommandTable, EFI_PAGE_SIZE * EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_TABLE)));\r
-\r
-  //\r
-  // Allocate resources for data transfer.\r
-  //\r
-  Status = IoMmuAllocateBuffer (\r
-             EFI_SIZE_TO_PAGES (HDD_PAYLOAD),\r
-             &Base,\r
-             &DeviceAddress,\r
-             &Mapping\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-       AhciRegisters->AhciCommandTable,\r
-       AhciRegisters->AhciCommandTableMapping\r
-       );\r
-    AhciRegisters->AhciCommandTable = NULL;\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_LIST)),\r
-       AhciRegisters->AhciCmdList,\r
-       AhciRegisters->AhciCmdListMapping\r
-       );\r
-    AhciRegisters->AhciCmdList = NULL;\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-       AhciRegisters->AhciRFis,\r
-       AhciRegisters->AhciRFisMapping\r
-       );\r
-    AhciRegisters->AhciRFis = NULL;\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Base));\r
-  AhciContext->BufferMapping = Mapping;\r
-  AhciContext->Buffer = Base;\r
-  ZeroMem (AhciContext->Buffer, EFI_PAGE_SIZE * EFI_SIZE_TO_PAGES (HDD_PAYLOAD));\r
-\r
-  DEBUG ((\r
-    DEBUG_INFO,\r
-    "%a() AhciContext 0x%x 0x%x 0x%x 0x%x\n",\r
-    __FUNCTION__,\r
-    AhciContext->Buffer,\r
-    AhciRegisters->AhciRFis,\r
-    AhciRegisters->AhciCmdList,\r
-    AhciRegisters->AhciCommandTable\r
-    ));\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Free allocated transfer-related data struct which is used at AHCI mode.\r
-\r
-  @param[in, out] AhciContext   The pointer to the AHCI_CONTEXT.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciFreeResource (\r
-  IN OUT AHCI_CONTEXT       *AhciContext\r
-  )\r
-{\r
-  EFI_AHCI_REGISTERS        *AhciRegisters;\r
-\r
-  AhciRegisters = &AhciContext->AhciRegisters;\r
-\r
-  if (AhciContext->Buffer != NULL) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (HDD_PAYLOAD),\r
-       AhciContext->Buffer,\r
-       AhciContext->BufferMapping\r
-       );\r
-    AhciContext->Buffer = NULL;\r
-  }\r
-\r
-  if (AhciRegisters->AhciCommandTable != NULL) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_TABLE)),\r
-       AhciRegisters->AhciCommandTable,\r
-       AhciRegisters->AhciCommandTableMapping\r
-       );\r
-    AhciRegisters->AhciCommandTable = NULL;\r
-  }\r
-\r
-  if (AhciRegisters->AhciCmdList != NULL) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_COMMAND_LIST)),\r
-       AhciRegisters->AhciCmdList,\r
-       AhciRegisters->AhciCmdListMapping\r
-       );\r
-    AhciRegisters->AhciCmdList = NULL;\r
-  }\r
-\r
-  if (AhciRegisters->AhciRFis != NULL) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (sizeof (EFI_AHCI_RECEIVED_FIS)),\r
-       AhciRegisters->AhciRFis,\r
-       AhciRegisters->AhciRFisMapping\r
-       );\r
-    AhciRegisters->AhciRFis = NULL;\r
-  }\r
-}\r
-\r
-/**\r
-  Initialize ATA host controller at AHCI mode.\r
-\r
-  The function is designed to initialize ATA host controller.\r
-\r
-  @param[in]  AhciContext   The pointer to the AHCI_CONTEXT.\r
-  @param[in]  Port          The port number to do initialization.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciModeInitialize (\r
-  IN AHCI_CONTEXT    *AhciContext,\r
-  IN UINT8           Port\r
-  )\r
-{\r
-  EFI_STATUS         Status;\r
-  EFI_AHCI_REGISTERS *AhciRegisters;\r
-  UINT32             AhciBar;\r
-  UINT32             Capability;\r
-  UINT32             Offset;\r
-  UINT32             Data;\r
-  UINT32             PhyDetectDelay;\r
-\r
-  AhciRegisters = &AhciContext->AhciRegisters;\r
-  AhciBar = AhciContext->AhciBar;\r
-\r
-  Status = AhciReset (AhciBar, ATA_TIMEOUT);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  //\r
-  // Collect AHCI controller information\r
-  //\r
-  Capability = AhciReadReg (AhciBar, EFI_AHCI_CAPABILITY_OFFSET);\r
-\r
-  //\r
-  // Enable AE before accessing any AHCI registers if Supports AHCI Mode Only is not set\r
-  //\r
-  if ((Capability & EFI_AHCI_CAP_SAM) == 0) {\r
-    AhciOrReg (AhciBar, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_ENABLE);\r
-  }\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_FB;\r
-  AhciWriteReg (AhciBar, Offset, (UINT32)(UINTN)AhciRegisters->AhciRFis);\r
-\r
-  //\r
-  // Single task envrionment, we only use one command table for all port\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CLB;\r
-  AhciWriteReg (AhciBar, Offset, (UINT32)(UINTN)AhciRegisters->AhciCmdList);\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;\r
-  Data = AhciReadReg (AhciBar, Offset);\r
-  if ((Data & EFI_AHCI_PORT_CMD_CPD) != 0) {\r
-    AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_CMD_POD);\r
-  }\r
-\r
-  if ((Capability & BIT27) != 0) {\r
-    AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_CMD_SUD);\r
-  }\r
-\r
-  //\r
-  // Disable aggressive power management.\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_SCTL;\r
-  AhciOrReg (AhciBar, Offset, EFI_AHCI_PORT_SCTL_IPM_INIT);\r
-  //\r
-  // Disable the reporting of the corresponding interrupt to system software.\r
-  //\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_IE;\r
-  AhciAndReg (AhciBar, Offset, 0);\r
-\r
-  Status = AhciEnableFisReceive (\r
-             AhciBar,\r
-             Port,\r
-             5000000\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  //\r
-  // According to SATA1.0a spec section 5.2, we need to wait for PxTFD.BSY and PxTFD.DRQ\r
-  // and PxTFD.ERR to be zero. The maximum wait time is 16s which is defined at ATA spec.\r
-  //\r
-  PhyDetectDelay = 16 * 1000;\r
-  do {\r
-    Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_SERR;\r
-    if (AhciReadReg(AhciBar, Offset) != 0) {\r
-      AhciWriteReg (AhciBar, Offset, AhciReadReg(AhciBar, Offset));\r
-    }\r
-    Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
-\r
-    Data = AhciReadReg (AhciBar, Offset) & EFI_AHCI_PORT_TFD_MASK;\r
-    if (Data == 0) {\r
-      break;\r
-    }\r
-\r
-    MicroSecondDelay (1000);\r
-    PhyDetectDelay--;\r
-  } while (PhyDetectDelay > 0);\r
-\r
-  if (PhyDetectDelay == 0) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_SIG;\r
-  Status = AhciWaitMmioSet (\r
-             AhciBar,\r
-             Offset,\r
-             0x0000FFFF,\r
-             0x00000101,\r
-             160000000\r
-             );\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
deleted file mode 100644 (file)
index 2076b04..0000000
+++ /dev/null
@@ -1,412 +0,0 @@
-/** @file\r
-  Header file for AHCI mode of ATA host controller.\r
-\r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-\r
-#ifndef __OPAL_PASSWORD_AHCI_MODE_H__\r
-#define __OPAL_PASSWORD_AHCI_MODE_H__\r
-\r
-//\r
-// OPAL LIBRARY CALLBACKS\r
-//\r
-#define ATA_COMMAND_TRUSTED_RECEIVE            0x5C\r
-#define ATA_COMMAND_TRUSTED_SEND               0x5E\r
-\r
-//\r
-// ATA TRUSTED commands express transfer Length in 512 byte multiple\r
-//\r
-#define ATA_TRUSTED_TRANSFER_LENGTH_MULTIPLE   512\r
-#define ATA_DEVICE_LBA                         0x40    ///< Set for commands with LBA (rather than CHS) addresses\r
-\r
-\r
-#define EFI_AHCI_BAR_INDEX                     0x05\r
-\r
-#define EFI_AHCI_CAPABILITY_OFFSET             0x0000\r
-#define   EFI_AHCI_CAP_SAM                     BIT18\r
-#define EFI_AHCI_GHC_OFFSET                    0x0004\r
-#define   EFI_AHCI_GHC_RESET                   BIT0\r
-#define   EFI_AHCI_GHC_IE                      BIT1\r
-#define   EFI_AHCI_GHC_ENABLE                  BIT31\r
-#define EFI_AHCI_IS_OFFSET                     0x0008\r
-#define EFI_AHCI_PI_OFFSET                     0x000C\r
-\r
-typedef struct {\r
-  UINT32  Lower32;\r
-  UINT32  Upper32;\r
-} DATA_32;\r
-\r
-typedef union {\r
-  DATA_32   Uint32;\r
-  UINT64    Uint64;\r
-} DATA_64;\r
-\r
-//\r
-// Each PRDT entry can point to a memory block up to 4M byte\r
-//\r
-#define EFI_AHCI_MAX_DATA_PER_PRDT             0x400000\r
-\r
-#define EFI_AHCI_FIS_REGISTER_H2D              0x27      //Register FIS - Host to Device\r
-#define   EFI_AHCI_FIS_REGISTER_H2D_LENGTH     20\r
-#define EFI_AHCI_FIS_REGISTER_D2H              0x34      //Register FIS - Device to Host\r
-#define   EFI_AHCI_FIS_REGISTER_D2H_LENGTH     20\r
-#define EFI_AHCI_FIS_DMA_ACTIVATE              0x39      //DMA Activate FIS - Device to Host\r
-#define   EFI_AHCI_FIS_DMA_ACTIVATE_LENGTH     4\r
-#define EFI_AHCI_FIS_DMA_SETUP                 0x41      //DMA Setup FIS - Bi-directional\r
-#define   EFI_AHCI_FIS_DMA_SETUP_LENGTH        28\r
-#define EFI_AHCI_FIS_DATA                      0x46      //Data FIS - Bi-directional\r
-#define EFI_AHCI_FIS_BIST                      0x58      //BIST Activate FIS - Bi-directional\r
-#define   EFI_AHCI_FIS_BIST_LENGTH             12\r
-#define EFI_AHCI_FIS_PIO_SETUP                 0x5F      //PIO Setup FIS - Device to Host\r
-#define   EFI_AHCI_FIS_PIO_SETUP_LENGTH        20\r
-#define EFI_AHCI_FIS_SET_DEVICE                0xA1      //Set Device Bits FIS - Device to Host\r
-#define   EFI_AHCI_FIS_SET_DEVICE_LENGTH       8\r
-\r
-#define EFI_AHCI_D2H_FIS_OFFSET                0x40\r
-#define EFI_AHCI_DMA_FIS_OFFSET                0x00\r
-#define EFI_AHCI_PIO_FIS_OFFSET                0x20\r
-#define EFI_AHCI_SDB_FIS_OFFSET                0x58\r
-#define EFI_AHCI_FIS_TYPE_MASK                 0xFF\r
-#define EFI_AHCI_U_FIS_OFFSET                  0x60\r
-\r
-//\r
-// Port register\r
-//\r
-#define EFI_AHCI_PORT_START                    0x0100\r
-#define EFI_AHCI_PORT_REG_WIDTH                0x0080\r
-#define EFI_AHCI_PORT_CLB                      0x0000\r
-#define EFI_AHCI_PORT_CLBU                     0x0004\r
-#define EFI_AHCI_PORT_FB                       0x0008\r
-#define EFI_AHCI_PORT_FBU                      0x000C\r
-#define EFI_AHCI_PORT_IS                       0x0010\r
-#define   EFI_AHCI_PORT_IS_DHRS                BIT0\r
-#define   EFI_AHCI_PORT_IS_PSS                 BIT1\r
-#define   EFI_AHCI_PORT_IS_SSS                 BIT2\r
-#define   EFI_AHCI_PORT_IS_SDBS                BIT3\r
-#define   EFI_AHCI_PORT_IS_UFS                 BIT4\r
-#define   EFI_AHCI_PORT_IS_DPS                 BIT5\r
-#define   EFI_AHCI_PORT_IS_PCS                 BIT6\r
-#define   EFI_AHCI_PORT_IS_DIS                 BIT7\r
-#define   EFI_AHCI_PORT_IS_PRCS                BIT22\r
-#define   EFI_AHCI_PORT_IS_IPMS                BIT23\r
-#define   EFI_AHCI_PORT_IS_OFS                 BIT24\r
-#define   EFI_AHCI_PORT_IS_INFS                BIT26\r
-#define   EFI_AHCI_PORT_IS_IFS                 BIT27\r
-#define   EFI_AHCI_PORT_IS_HBDS                BIT28\r
-#define   EFI_AHCI_PORT_IS_HBFS                BIT29\r
-#define   EFI_AHCI_PORT_IS_TFES                BIT30\r
-#define   EFI_AHCI_PORT_IS_CPDS                BIT31\r
-#define   EFI_AHCI_PORT_IS_CLEAR               0xFFFFFFFF\r
-#define   EFI_AHCI_PORT_IS_FIS_CLEAR           0x0000000F\r
-\r
-#define EFI_AHCI_PORT_IE                       0x0014\r
-#define EFI_AHCI_PORT_CMD                      0x0018\r
-#define   EFI_AHCI_PORT_CMD_ST_MASK            0xFFFFFFFE\r
-#define   EFI_AHCI_PORT_CMD_ST                 BIT0\r
-#define   EFI_AHCI_PORT_CMD_SUD                BIT1\r
-#define   EFI_AHCI_PORT_CMD_POD                BIT2\r
-#define   EFI_AHCI_PORT_CMD_COL                BIT3\r
-#define   EFI_AHCI_PORT_CMD_CR                 BIT15\r
-#define   EFI_AHCI_PORT_CMD_FRE                BIT4\r
-#define   EFI_AHCI_PORT_CMD_FR                 BIT14\r
-#define   EFI_AHCI_PORT_CMD_MASK               ~(EFI_AHCI_PORT_CMD_ST | EFI_AHCI_PORT_CMD_FRE | EFI_AHCI_PORT_CMD_COL)\r
-#define   EFI_AHCI_PORT_CMD_PMA                BIT17\r
-#define   EFI_AHCI_PORT_CMD_HPCP               BIT18\r
-#define   EFI_AHCI_PORT_CMD_MPSP               BIT19\r
-#define   EFI_AHCI_PORT_CMD_CPD                BIT20\r
-#define   EFI_AHCI_PORT_CMD_ESP                BIT21\r
-#define   EFI_AHCI_PORT_CMD_ATAPI              BIT24\r
-#define   EFI_AHCI_PORT_CMD_DLAE               BIT25\r
-#define   EFI_AHCI_PORT_CMD_ALPE               BIT26\r
-#define   EFI_AHCI_PORT_CMD_ASP                BIT27\r
-#define   EFI_AHCI_PORT_CMD_ICC_MASK           (BIT28 | BIT29 | BIT30 | BIT31)\r
-#define   EFI_AHCI_PORT_CMD_ACTIVE             (1 << 28 )\r
-#define EFI_AHCI_PORT_TFD                      0x0020\r
-#define   EFI_AHCI_PORT_TFD_MASK               (BIT7 | BIT3 | BIT0)\r
-#define   EFI_AHCI_PORT_TFD_BSY                BIT7\r
-#define   EFI_AHCI_PORT_TFD_DRQ                BIT3\r
-#define   EFI_AHCI_PORT_TFD_ERR                BIT0\r
-#define   EFI_AHCI_PORT_TFD_ERR_MASK           0x00FF00\r
-#define EFI_AHCI_PORT_SIG                      0x0024\r
-#define EFI_AHCI_PORT_SSTS                     0x0028\r
-#define   EFI_AHCI_PORT_SSTS_DET_MASK          0x000F\r
-#define   EFI_AHCI_PORT_SSTS_DET               0x0001\r
-#define   EFI_AHCI_PORT_SSTS_DET_PCE           0x0003\r
-#define   EFI_AHCI_PORT_SSTS_SPD_MASK          0x00F0\r
-#define EFI_AHCI_PORT_SCTL                     0x002C\r
-#define   EFI_AHCI_PORT_SCTL_DET_MASK          0x000F\r
-#define   EFI_AHCI_PORT_SCTL_MASK              (~EFI_AHCI_PORT_SCTL_DET_MASK)\r
-#define   EFI_AHCI_PORT_SCTL_DET_INIT          0x0001\r
-#define   EFI_AHCI_PORT_SCTL_DET_PHYCOMM       0x0003\r
-#define   EFI_AHCI_PORT_SCTL_SPD_MASK          0x00F0\r
-#define   EFI_AHCI_PORT_SCTL_IPM_MASK          0x0F00\r
-#define   EFI_AHCI_PORT_SCTL_IPM_INIT          0x0300\r
-#define   EFI_AHCI_PORT_SCTL_IPM_PSD           0x0100\r
-#define   EFI_AHCI_PORT_SCTL_IPM_SSD           0x0200\r
-#define EFI_AHCI_PORT_SERR                     0x0030\r
-#define   EFI_AHCI_PORT_SERR_RDIE              BIT0\r
-#define   EFI_AHCI_PORT_SERR_RCE               BIT1\r
-#define   EFI_AHCI_PORT_SERR_TDIE              BIT8\r
-#define   EFI_AHCI_PORT_SERR_PCDIE             BIT9\r
-#define   EFI_AHCI_PORT_SERR_PE                BIT10\r
-#define   EFI_AHCI_PORT_SERR_IE                BIT11\r
-#define   EFI_AHCI_PORT_SERR_PRC               BIT16\r
-#define   EFI_AHCI_PORT_SERR_PIE               BIT17\r
-#define   EFI_AHCI_PORT_SERR_CW                BIT18\r
-#define   EFI_AHCI_PORT_SERR_BDE               BIT19\r
-#define   EFI_AHCI_PORT_SERR_DE                BIT20\r
-#define   EFI_AHCI_PORT_SERR_CRCE              BIT21\r
-#define   EFI_AHCI_PORT_SERR_HE                BIT22\r
-#define   EFI_AHCI_PORT_SERR_LSE               BIT23\r
-#define   EFI_AHCI_PORT_SERR_TSTE              BIT24\r
-#define   EFI_AHCI_PORT_SERR_UFT               BIT25\r
-#define   EFI_AHCI_PORT_SERR_EX                BIT26\r
-#define   EFI_AHCI_PORT_ERR_CLEAR              0xFFFFFFFF\r
-#define EFI_AHCI_PORT_SACT                     0x0034\r
-#define EFI_AHCI_PORT_CI                       0x0038\r
-#define EFI_AHCI_PORT_SNTF                     0x003C\r
-\r
-\r
-#pragma pack(1)\r
-//\r
-// Command List structure includes total 32 entries.\r
-// The entry Data structure is listed at the following.\r
-//\r
-typedef struct {\r
-  UINT32   AhciCmdCfl:5;      //Command FIS Length\r
-  UINT32   AhciCmdA:1;        //ATAPI\r
-  UINT32   AhciCmdW:1;        //Write\r
-  UINT32   AhciCmdP:1;        //Prefetchable\r
-  UINT32   AhciCmdR:1;        //Reset\r
-  UINT32   AhciCmdB:1;        //BIST\r
-  UINT32   AhciCmdC:1;        //Clear Busy upon R_OK\r
-  UINT32   AhciCmdRsvd:1;\r
-  UINT32   AhciCmdPmp:4;      //Port Multiplier Port\r
-  UINT32   AhciCmdPrdtl:16;   //Physical Region Descriptor Table Length\r
-  UINT32   AhciCmdPrdbc;      //Physical Region Descriptor Byte Count\r
-  UINT32   AhciCmdCtba;       //Command Table Descriptor Base Address\r
-  UINT32   AhciCmdCtbau;      //Command Table Descriptor Base Address Upper 32-BITs\r
-  UINT32   AhciCmdRsvd1[4];\r
-} EFI_AHCI_COMMAND_LIST;\r
-\r
-//\r
-// This is a software constructed FIS.\r
-// For Data transfer operations, this is the H2D Register FIS format as\r
-// specified in the Serial ATA Revision 2.6 specification.\r
-//\r
-typedef struct {\r
-  UINT8    AhciCFisType;\r
-  UINT8    AhciCFisPmNum:4;\r
-  UINT8    AhciCFisRsvd:1;\r
-  UINT8    AhciCFisRsvd1:1;\r
-  UINT8    AhciCFisRsvd2:1;\r
-  UINT8    AhciCFisCmdInd:1;\r
-  UINT8    AhciCFisCmd;\r
-  UINT8    AhciCFisFeature;\r
-  UINT8    AhciCFisSecNum;\r
-  UINT8    AhciCFisClyLow;\r
-  UINT8    AhciCFisClyHigh;\r
-  UINT8    AhciCFisDevHead;\r
-  UINT8    AhciCFisSecNumExp;\r
-  UINT8    AhciCFisClyLowExp;\r
-  UINT8    AhciCFisClyHighExp;\r
-  UINT8    AhciCFisFeatureExp;\r
-  UINT8    AhciCFisSecCount;\r
-  UINT8    AhciCFisSecCountExp;\r
-  UINT8    AhciCFisRsvd3;\r
-  UINT8    AhciCFisControl;\r
-  UINT8    AhciCFisRsvd4[4];\r
-  UINT8    AhciCFisRsvd5[44];\r
-} EFI_AHCI_COMMAND_FIS;\r
-\r
-//\r
-// ACMD: ATAPI command (12 or 16 bytes)\r
-//\r
-typedef struct {\r
-  UINT8    AtapiCmd[0x10];\r
-} EFI_AHCI_ATAPI_COMMAND;\r
-\r
-//\r
-// Physical Region Descriptor Table includes up to 65535 entries\r
-// The entry Data structure is listed at the following.\r
-// the actual entry number comes from the PRDTL field in the command\r
-// list entry for this command slot.\r
-//\r
-typedef struct {\r
-  UINT32   AhciPrdtDba;       //Data Base Address\r
-  UINT32   AhciPrdtDbau;      //Data Base Address Upper 32-BITs\r
-  UINT32   AhciPrdtRsvd;\r
-  UINT32   AhciPrdtDbc:22;    //Data Byte Count\r
-  UINT32   AhciPrdtRsvd1:9;\r
-  UINT32   AhciPrdtIoc:1;     //Interrupt on Completion\r
-} EFI_AHCI_COMMAND_PRDT;\r
-\r
-//\r
-// Command table Data strucute which is pointed to by the entry in the command list\r
-//\r
-typedef struct {\r
-  EFI_AHCI_COMMAND_FIS      CommandFis;       // A software constructed FIS.\r
-  EFI_AHCI_ATAPI_COMMAND    AtapiCmd;         // 12 or 16 bytes ATAPI cmd.\r
-  UINT8                     Reserved[0x30];\r
-  EFI_AHCI_COMMAND_PRDT     PrdtTable;    // The scatter/gather list for Data transfer\r
-} EFI_AHCI_COMMAND_TABLE;\r
-\r
-//\r
-// Received FIS structure\r
-//\r
-typedef struct {\r
-  UINT8    AhciDmaSetupFis[0x1C];         // Dma Setup Fis: offset 0x00\r
-  UINT8    AhciDmaSetupFisRsvd[0x04];\r
-  UINT8    AhciPioSetupFis[0x14];         // Pio Setup Fis: offset 0x20\r
-  UINT8    AhciPioSetupFisRsvd[0x0C];\r
-  UINT8    AhciD2HRegisterFis[0x14];      // D2H Register Fis: offset 0x40\r
-  UINT8    AhciD2HRegisterFisRsvd[0x04];\r
-  UINT64   AhciSetDeviceBitsFis;          // Set Device Bits Fix: offset 0x58\r
-  UINT8    AhciUnknownFis[0x40];          // Unkonwn Fis: offset 0x60\r
-  UINT8    AhciUnknownFisRsvd[0x60];\r
-} EFI_AHCI_RECEIVED_FIS;\r
-\r
-#pragma pack()\r
-\r
-typedef struct {\r
-  EFI_AHCI_RECEIVED_FIS     *AhciRFis;\r
-  VOID                      *AhciRFisMapping;\r
-  EFI_AHCI_COMMAND_LIST     *AhciCmdList;\r
-  VOID                      *AhciCmdListMapping;\r
-  EFI_AHCI_COMMAND_TABLE    *AhciCommandTable;\r
-  VOID                      *AhciCommandTableMapping;\r
-} EFI_AHCI_REGISTERS;\r
-\r
-typedef struct {\r
-  VOID                      *Buffer;\r
-  VOID                      *BufferMapping;\r
-  EFI_AHCI_REGISTERS        AhciRegisters;\r
-  UINT32                    AhciBar;\r
-} AHCI_CONTEXT;\r
-\r
-/**\r
-  Allocate transfer-related data struct which is used at AHCI mode.\r
-\r
-  @param[in, out] AhciContext   The pointer to the AHCI_CONTEXT.\r
-\r
-  @retval EFI_OUT_OF_RESOURCE   No enough resource.\r
-  @retval EFI_SUCCESS           Successful to allocate resource.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciAllocateResource (\r
-  IN OUT AHCI_CONTEXT       *AhciContext\r
-  );\r
-\r
-/**\r
-  Free allocated transfer-related data struct which is used at AHCI mode.\r
-\r
-  @param[in, out] AhciContext   The pointer to the AHCI_CONTEXT.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AhciFreeResource (\r
-  IN OUT AHCI_CONTEXT       *AhciContext\r
-  );\r
-\r
-/**\r
-  Initialize ATA host controller at AHCI mode.\r
-\r
-  The function is designed to initialize ATA host controller.\r
-\r
-  @param[in]  AhciContext   The pointer to the AHCI_CONTEXT.\r
-  @param[in]  Port          The port number to do initialization.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciModeInitialize (\r
-  IN AHCI_CONTEXT    *AhciContext,\r
-  IN UINT8           Port\r
-  );\r
-\r
-typedef struct _EFI_ATA_COMMAND_BLOCK {\r
-  UINT8 Reserved1[2];\r
-  UINT8 AtaCommand;\r
-  UINT8 AtaFeatures;\r
-  UINT8 AtaSectorNumber;\r
-  UINT8 AtaCylinderLow;\r
-  UINT8 AtaCylinderHigh;\r
-  UINT8 AtaDeviceHead;\r
-  UINT8 AtaSectorNumberExp;\r
-  UINT8 AtaCylinderLowExp;\r
-  UINT8 AtaCylinderHighExp;\r
-  UINT8 AtaFeaturesExp;\r
-  UINT8 AtaSectorCount;\r
-  UINT8 AtaSectorCountExp;\r
-  UINT8 Reserved2[6];\r
-} EFI_ATA_COMMAND_BLOCK;\r
-\r
-typedef struct _EFI_ATA_STATUS_BLOCK {\r
-  UINT8 Reserved1[2];\r
-  UINT8 AtaStatus;\r
-  UINT8 AtaError;\r
-  UINT8 AtaSectorNumber;\r
-  UINT8 AtaCylinderLow;\r
-  UINT8 AtaCylinderHigh;\r
-  UINT8 AtaDeviceHead;\r
-  UINT8 AtaSectorNumberExp;\r
-  UINT8 AtaCylinderLowExp;\r
-  UINT8 AtaCylinderHighExp;\r
-  UINT8 Reserved2;\r
-  UINT8 AtaSectorCount;\r
-  UINT8 AtaSectorCountExp;\r
-  UINT8 Reserved3[6];\r
-} EFI_ATA_STATUS_BLOCK;\r
-\r
-/**\r
-  Start a PIO Data transfer on specific port.\r
-\r
-  @param  AhciContext         The pointer to the AHCI_CONTEXT.\r
-  @param  Port                The number of port.\r
-  @param  PortMultiplier      The timeout Value of stop.\r
-  @param  AtapiCommand        The atapi command will be used for the transfer.\r
-  @param  AtapiCommandLength  The Length of the atapi command.\r
-  @param  Read                The transfer direction.\r
-  @param  AtaCommandBlock     The EFI_ATA_COMMAND_BLOCK Data.\r
-  @param  AtaStatusBlock      The EFI_ATA_STATUS_BLOCK Data.\r
-  @param  MemoryAddr          The pointer to the Data Buffer.\r
-  @param  DataCount           The Data count to be transferred.\r
-  @param  Timeout             The timeout Value of non Data transfer.\r
-\r
-  @retval EFI_DEVICE_ERROR    The PIO Data transfer abort with error occurs.\r
-  @retval EFI_TIMEOUT         The operation is time out.\r
-  @retval EFI_UNSUPPORTED     The device is not ready for transfer.\r
-  @retval EFI_SUCCESS         The PIO Data transfer executes successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AhciPioTransfer (\r
-  IN     AHCI_CONTEXT               *AhciContext,\r
-  IN     UINT8                      Port,\r
-  IN     UINT8                      PortMultiplier,\r
-  IN     EFI_AHCI_ATAPI_COMMAND     *AtapiCommand OPTIONAL,\r
-  IN     UINT8                      AtapiCommandLength,\r
-  IN     BOOLEAN                    Read,\r
-  IN     EFI_ATA_COMMAND_BLOCK      *AtaCommandBlock,\r
-  IN OUT EFI_ATA_STATUS_BLOCK       *AtaStatusBlock,\r
-  IN OUT VOID                       *MemoryAddr,\r
-  IN     UINT32                     DataCount,\r
-  IN     UINT64                     Timeout\r
-  );\r
-\r
-\r
-#endif\r
-\r
index b5317d82b8c734d25691549d82e7e47e8400a097..c1b3c7930d72b6c680190b28d54503f7b45c5d79 100644 (file)
@@ -21,40 +21,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "OpalDriver.h"\r
 #include "OpalHii.h"\r
 \r
-EFI_GUID mOpalDeviceAtaGuid = OPAL_DEVICE_ATA_GUID;\r
-EFI_GUID mOpalDeviceNvmeGuid = OPAL_DEVICE_NVME_GUID;\r
+EFI_GUID mOpalDeviceLockBoxGuid = OPAL_DEVICE_LOCKBOX_GUID;\r
 \r
 BOOLEAN                 mOpalEndOfDxe = FALSE;\r
 OPAL_REQUEST_VARIABLE   *mOpalRequestVariable = NULL;\r
 UINTN                   mOpalRequestVariableSize = 0;\r
 CHAR16                  mPopUpString[100];\r
 \r
-typedef struct {\r
-  UINT32                   Address;\r
-  S3_BOOT_SCRIPT_LIB_WIDTH Width;\r
-} OPAL_HC_PCI_REGISTER_SAVE;\r
-\r
-//\r
-// To unlock the Intel SATA controller at S3 Resume, restored the following registers.\r
-//\r
-const OPAL_HC_PCI_REGISTER_SAVE mSataHcRegisterSaveTemplate[] = {\r
-  {0x9,  S3BootScriptWidthUint8},\r
-  {0x10, S3BootScriptWidthUint32},\r
-  {0x14, S3BootScriptWidthUint32},\r
-  {0x18, S3BootScriptWidthUint32},\r
-  {0x1C, S3BootScriptWidthUint32},\r
-  {0x20, S3BootScriptWidthUint32},\r
-  {0x24, S3BootScriptWidthUint32},\r
-  {0x3c, S3BootScriptWidthUint8},\r
-  {0x3d, S3BootScriptWidthUint8},\r
-  {0x40, S3BootScriptWidthUint16},\r
-  {0x42, S3BootScriptWidthUint16},\r
-  {0x92, S3BootScriptWidthUint16},\r
-  {0x94, S3BootScriptWidthUint32},\r
-  {0x9C, S3BootScriptWidthUint32},\r
-  {0x4,  S3BootScriptWidthUint16},\r
-};\r
-\r
 OPAL_DRIVER mOpalDriver;\r
 \r
 //\r
@@ -233,14 +206,12 @@ OpalSupportUpdatePassword (
   @param[out] DevInfoLength     Device information length needed.\r
   @param[out] DevInfo           Device information extracted.\r
 \r
-  @return Device type.\r
-\r
 **/\r
-UINT8\r
+VOID\r
 ExtractDeviceInfoFromDevicePath (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
-  OUT UINT16                    *DevInfoLength,\r
-  OUT OPAL_DEVICE_COMMON        *DevInfo OPTIONAL\r
+  OUT UINT32                    *DevInfoLength,\r
+  OUT OPAL_DEVICE_LOCKBOX_DATA  *DevInfo OPTIONAL\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL      *TmpDevPath;\r
@@ -249,10 +220,6 @@ ExtractDeviceInfoFromDevicePath (
   UINT8                         DeviceType;\r
   UINT8                         BusNum;\r
   OPAL_PCI_DEVICE               *PciDevice;\r
-  OPAL_DEVICE_ATA               *DevInfoAta;\r
-  OPAL_DEVICE_NVME              *DevInfoNvme;\r
-  SATA_DEVICE_PATH              *SataDevPath;\r
-  NVME_NAMESPACE_DEVICE_PATH    *NvmeDevPath;\r
 \r
   ASSERT (DevicePath != NULL);\r
   ASSERT (DevInfoLength != NULL);\r
@@ -266,30 +233,15 @@ ExtractDeviceInfoFromDevicePath (
   // Get device type.\r
   //\r
   while (!IsDevicePathEnd (TmpDevPath)) {\r
-    if (TmpDevPath->Type == MESSAGING_DEVICE_PATH && TmpDevPath->SubType == MSG_SATA_DP) {\r
-      //\r
-      // SATA\r
-      //\r
-      if (DevInfo != NULL) {\r
-        SataDevPath = (SATA_DEVICE_PATH *) TmpDevPath;\r
-        DevInfoAta = (OPAL_DEVICE_ATA *) DevInfo;\r
-        DevInfoAta->Port = SataDevPath->HBAPortNumber;\r
-        DevInfoAta->PortMultiplierPort = SataDevPath->PortMultiplierPortNumber;\r
-      }\r
-      DeviceType = OPAL_DEVICE_TYPE_ATA;\r
-      *DevInfoLength = sizeof (OPAL_DEVICE_ATA);\r
-      break;\r
-    } else if (TmpDevPath->Type == MESSAGING_DEVICE_PATH && TmpDevPath->SubType == MSG_NVME_NAMESPACE_DP) {\r
-      //\r
-      // NVMe\r
-      //\r
+    if ((TmpDevPath->Type == MESSAGING_DEVICE_PATH) &&\r
+        (TmpDevPath->SubType == MSG_SATA_DP || TmpDevPath->SubType == MSG_NVME_NAMESPACE_DP)) {\r
       if (DevInfo != NULL) {\r
-        NvmeDevPath = (NVME_NAMESPACE_DEVICE_PATH *) TmpDevPath;\r
-        DevInfoNvme = (OPAL_DEVICE_NVME *) DevInfo;\r
-        DevInfoNvme->NvmeNamespaceId = NvmeDevPath->NamespaceId;\r
+        DevInfo->DevicePathLength = (UINT32) GetDevicePathSize (DevicePath);\r
+        CopyMem (DevInfo->DevicePath, DevicePath, DevInfo->DevicePathLength);\r
       }\r
-      DeviceType = OPAL_DEVICE_TYPE_NVME;\r
-      *DevInfoLength = sizeof (OPAL_DEVICE_NVME);\r
+\r
+      DeviceType = (TmpDevPath->SubType == MSG_SATA_DP) ? OPAL_DEVICE_TYPE_ATA : OPAL_DEVICE_TYPE_NVME;\r
+      *DevInfoLength = sizeof (OPAL_DEVICE_LOCKBOX_DATA) + (UINT32) GetDevicePathSize (DevicePath);\r
       break;\r
     }\r
     TmpDevPath = NextDevicePathNode (TmpDevPath);\r
@@ -304,8 +256,8 @@ ExtractDeviceInfoFromDevicePath (
   while (!IsDevicePathEnd (TmpDevPath2)) {\r
     if (TmpDevPath->Type == HARDWARE_DEVICE_PATH && TmpDevPath->SubType == HW_PCI_DP) {\r
       PciDevPath = (PCI_DEVICE_PATH *) TmpDevPath;\r
-      if ((TmpDevPath2->Type == MESSAGING_DEVICE_PATH && TmpDevPath2->SubType == MSG_NVME_NAMESPACE_DP)||\r
-          (TmpDevPath2->Type == MESSAGING_DEVICE_PATH && TmpDevPath2->SubType == MSG_SATA_DP)) {\r
+      if ((TmpDevPath2->Type == MESSAGING_DEVICE_PATH) &&\r
+          (TmpDevPath2->SubType == MSG_SATA_DP || TmpDevPath2->SubType == MSG_NVME_NAMESPACE_DP)) {\r
         if (DevInfo != NULL) {\r
           PciDevice = &DevInfo->Device;\r
           PciDevice->Segment = 0;\r
@@ -314,14 +266,6 @@ ExtractDeviceInfoFromDevicePath (
           PciDevice->Function = PciDevPath->Function;\r
         }\r
       } else {\r
-        if (DevInfo != NULL) {\r
-          PciDevice = (OPAL_PCI_DEVICE *) ((UINTN) DevInfo + *DevInfoLength);\r
-          PciDevice->Segment = 0;\r
-          PciDevice->Bus = BusNum;\r
-          PciDevice->Device = PciDevPath->Device;\r
-          PciDevice->Function = PciDevPath->Function;\r
-        }\r
-        *DevInfoLength += sizeof (OPAL_PCI_DEVICE);\r
         if (TmpDevPath2->Type == HARDWARE_DEVICE_PATH && TmpDevPath2->SubType == HW_PCI_DP) {\r
           BusNum = PciRead8 (PCI_LIB_ADDRESS (BusNum, PciDevPath->Device, PciDevPath->Function, PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET));\r
         }\r
@@ -333,251 +277,157 @@ ExtractDeviceInfoFromDevicePath (
   }\r
 \r
   ASSERT (DeviceType != OPAL_DEVICE_TYPE_UNKNOWN);\r
-  return DeviceType;\r
-}\r
-\r
-/**\r
-  Save boot script for ATA OPAL device.\r
-\r
-  @param[in] DevInfo    Pointer to ATA Opal device information.\r
-\r
- **/\r
-VOID\r
-OpalDeviceAtaSaveBootScript (\r
-  IN OPAL_DEVICE_ATA    *DevInfo\r
-  )\r
-{\r
-  UINTN                         Bus;\r
-  UINTN                         Device;\r
-  UINTN                         Function;\r
-  UINTN                         Index;\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Offset;\r
-  UINT64                        Address;\r
-  S3_BOOT_SCRIPT_LIB_WIDTH      Width;\r
-  UINT32                        Data;\r
-  OPAL_HC_PCI_REGISTER_SAVE     *HcRegisterSaveListPtr;\r
-  UINTN                         Count;\r
-\r
-  Data = 0;\r
-\r
-  Bus        = DevInfo->Device.Bus;\r
-  Device     = DevInfo->Device.Device;\r
-  Function   = DevInfo->Device.Function;\r
-\r
-  HcRegisterSaveListPtr = (OPAL_HC_PCI_REGISTER_SAVE *) mSataHcRegisterSaveTemplate;\r
-  Count = sizeof (mSataHcRegisterSaveTemplate) / sizeof (OPAL_HC_PCI_REGISTER_SAVE);\r
-\r
-  for (Index = 0; Index < Count; Index++) {\r
-    Offset  = HcRegisterSaveListPtr[Index].Address;\r
-    Width   = HcRegisterSaveListPtr[Index].Width;\r
-\r
-    switch (Width) {\r
-      case S3BootScriptWidthUint8:\r
-        Data = (UINT32)PciRead8 (PCI_LIB_ADDRESS(Bus,Device,Function,Offset));\r
-        break;\r
-      case S3BootScriptWidthUint16:\r
-        Data = (UINT32)PciRead16 (PCI_LIB_ADDRESS(Bus,Device,Function,Offset));\r
-        break;\r
-      case S3BootScriptWidthUint32:\r
-        Data = PciRead32 (PCI_LIB_ADDRESS(Bus,Device,Function,Offset));\r
-        break;\r
-      default:\r
-        ASSERT (FALSE);\r
-        break;\r
-    }\r
-\r
-    Address = S3_BOOT_SCRIPT_LIB_PCI_ADDRESS (Bus, Device, Function, Offset);\r
-    Status  = S3BootScriptSavePciCfgWrite (Width, Address, 1, &Data);\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
+  return;\r
 }\r
 \r
 /**\r
-  Build ATA OPAL device info and save them to LockBox.\r
-\r
-  @param[in] BarAddr    Bar address allocated.\r
+  Build OPAL device info and save them to LockBox.\r
 \r
  **/\r
 VOID\r
-BuildOpalDeviceInfoAta (\r
-  IN UINT32     BarAddr\r
+BuildOpalDeviceInfo (\r
+  VOID\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  UINT8                 DeviceType;\r
-  OPAL_DEVICE_ATA       *DevInfoAta;\r
-  OPAL_DEVICE_ATA       *TempDevInfoAta;\r
-  UINTN                 DevInfoLengthAta;\r
-  UINT16                DevInfoLength;\r
-  OPAL_DRIVER_DEVICE    *TmpDev;\r
+  EFI_STATUS                  Status;\r
+  OPAL_DEVICE_LOCKBOX_DATA    *DevInfo;\r
+  OPAL_DEVICE_LOCKBOX_DATA    *TempDevInfo;\r
+  UINTN                       TotalDevInfoLength;\r
+  UINT32                      DevInfoLength;\r
+  OPAL_DRIVER_DEVICE          *TmpDev;\r
+  UINT8                       DummyData;\r
+  BOOLEAN                     S3InitDevicesExist;\r
+  UINTN                       S3InitDevicesLength;\r
+  EFI_DEVICE_PATH_PROTOCOL    *S3InitDevices;\r
+  EFI_DEVICE_PATH_PROTOCOL    *S3InitDevicesBak;\r
 \r
   //\r
-  // Build ATA OPAL device info and save them to LockBox.\r
+  // Build OPAL device info and save them to LockBox.\r
   //\r
-  DevInfoLengthAta = 0;\r
+  TotalDevInfoLength = 0;\r
   TmpDev = mOpalDriver.DeviceList;\r
   while (TmpDev != NULL) {\r
-    DeviceType = ExtractDeviceInfoFromDevicePath (\r
-                   TmpDev->OpalDisk.OpalDevicePath,\r
-                   &DevInfoLength,\r
-                   NULL\r
-                   );\r
-    if (DeviceType == OPAL_DEVICE_TYPE_ATA) {\r
-      DevInfoLengthAta += DevInfoLength;\r
-    }\r
-\r
+    ExtractDeviceInfoFromDevicePath (\r
+      TmpDev->OpalDisk.OpalDevicePath,\r
+      &DevInfoLength,\r
+      NULL\r
+      );\r
+    TotalDevInfoLength += DevInfoLength;\r
     TmpDev = TmpDev->Next;\r
   }\r
 \r
-  if (DevInfoLengthAta == 0) {\r
+  if (TotalDevInfoLength == 0) {\r
     return;\r
   }\r
 \r
-  DevInfoAta = AllocateZeroPool (DevInfoLengthAta);\r
-  ASSERT (DevInfoAta != NULL);\r
-  if (DevInfoAta == NULL) {\r
-    return;\r
-  }\r
-\r
-  TempDevInfoAta = DevInfoAta;\r
-  TmpDev = mOpalDriver.DeviceList;\r
-  while (TmpDev != NULL) {\r
-    DeviceType = ExtractDeviceInfoFromDevicePath (\r
-                   TmpDev->OpalDisk.OpalDevicePath,\r
-                   &DevInfoLength,\r
-                   NULL\r
-                   );\r
-    if (DeviceType == OPAL_DEVICE_TYPE_ATA) {\r
-      ExtractDeviceInfoFromDevicePath (\r
-        TmpDev->OpalDisk.OpalDevicePath,\r
-        &DevInfoLength,\r
-        (OPAL_DEVICE_COMMON *) TempDevInfoAta\r
-        );\r
-      TempDevInfoAta->Length = DevInfoLength;\r
-      TempDevInfoAta->OpalBaseComId = TmpDev->OpalDisk.OpalBaseComId;\r
-      TempDevInfoAta->BarAddr = BarAddr;\r
-      CopyMem (\r
-        TempDevInfoAta->Password,\r
-        TmpDev->OpalDisk.Password,\r
-        TmpDev->OpalDisk.PasswordLength\r
-        );\r
-      TempDevInfoAta->PasswordLength = TmpDev->OpalDisk.PasswordLength;\r
-      OpalDeviceAtaSaveBootScript (TempDevInfoAta);\r
-      TempDevInfoAta = (OPAL_DEVICE_ATA *) ((UINTN) TempDevInfoAta + DevInfoLength);\r
-    }\r
-\r
-    TmpDev = TmpDev->Next;\r
-  }\r
-\r
-  Status = SaveLockBox (\r
-             &mOpalDeviceAtaGuid,\r
-             DevInfoAta,\r
-             DevInfoLengthAta\r
+  S3InitDevicesLength = sizeof (DummyData);\r
+  Status = RestoreLockBox (\r
+             &gS3StorageDeviceInitListGuid,\r
+             &DummyData,\r
+             &S3InitDevicesLength\r
              );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  Status = SetLockBoxAttributes (\r
-             &mOpalDeviceAtaGuid,\r
-             LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  ZeroMem (DevInfoAta, DevInfoLengthAta);\r
-  FreePool (DevInfoAta);\r
-}\r
-\r
-/**\r
-  Build NVMe OPAL device info and save them to LockBox.\r
-\r
-  @param[in] BarAddr    Bar address allocated.\r
-\r
- **/\r
-VOID\r
-BuildOpalDeviceInfoNvme (\r
-  IN UINT32     BarAddr\r
-  )\r
-{\r
-  EFI_STATUS            Status;\r
-  UINT8                 DeviceType;\r
-  OPAL_DEVICE_NVME      *DevInfoNvme;\r
-  OPAL_DEVICE_NVME      *TempDevInfoNvme;\r
-  UINTN                 DevInfoLengthNvme;\r
-  UINT16                DevInfoLength;\r
-  OPAL_DRIVER_DEVICE    *TmpDev;\r
-\r
-  //\r
-  // Build NVMe OPAL device info and save them to LockBox.\r
-  //\r
-  DevInfoLengthNvme = 0;\r
-  TmpDev = mOpalDriver.DeviceList;\r
-  while (TmpDev != NULL) {\r
-    DeviceType = ExtractDeviceInfoFromDevicePath (\r
-                   TmpDev->OpalDisk.OpalDevicePath,\r
-                   &DevInfoLength,\r
-                   NULL\r
-                   );\r
-    if (DeviceType == OPAL_DEVICE_TYPE_NVME) {\r
-      DevInfoLengthNvme += DevInfoLength;\r
+  ASSERT ((Status == EFI_NOT_FOUND) || (Status == EFI_BUFFER_TOO_SMALL));\r
+  if (Status == EFI_NOT_FOUND) {\r
+    S3InitDevices      = NULL;\r
+    S3InitDevicesExist = FALSE;\r
+  } else if (Status == EFI_BUFFER_TOO_SMALL) {\r
+    S3InitDevices = AllocatePool (S3InitDevicesLength);\r
+    ASSERT (S3InitDevices != NULL);\r
+    if (S3InitDevices == NULL) {\r
+      return;\r
     }\r
 \r
-    TmpDev = TmpDev->Next;\r
-  }\r
-\r
-  if (DevInfoLengthNvme == 0) {\r
+    Status = RestoreLockBox (\r
+               &gS3StorageDeviceInitListGuid,\r
+               S3InitDevices,\r
+               &S3InitDevicesLength\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+    S3InitDevicesExist = TRUE;\r
+  } else {\r
     return;\r
   }\r
 \r
-  DevInfoNvme = AllocateZeroPool (DevInfoLengthNvme);\r
-  ASSERT (DevInfoNvme != NULL);\r
-  if (DevInfoNvme == NULL) {\r
+  DevInfo = AllocateZeroPool (TotalDevInfoLength);\r
+  ASSERT (DevInfo != NULL);\r
+  if (DevInfo == NULL) {\r
     return;\r
   }\r
 \r
-  TempDevInfoNvme = DevInfoNvme;\r
-  TmpDev = mOpalDriver.DeviceList;\r
+  TempDevInfo = DevInfo;\r
+  TmpDev      = mOpalDriver.DeviceList;\r
   while (TmpDev != NULL) {\r
-    DeviceType = ExtractDeviceInfoFromDevicePath (\r
-                   TmpDev->OpalDisk.OpalDevicePath,\r
-                   &DevInfoLength,\r
-                   NULL\r
-                   );\r
-    if (DeviceType == OPAL_DEVICE_TYPE_NVME) {\r
-      ExtractDeviceInfoFromDevicePath (\r
-        TmpDev->OpalDisk.OpalDevicePath,\r
-        &DevInfoLength,\r
-        (OPAL_DEVICE_COMMON *) TempDevInfoNvme\r
-        );\r
-      TempDevInfoNvme->Length = DevInfoLength;\r
-      TempDevInfoNvme->OpalBaseComId = TmpDev->OpalDisk.OpalBaseComId;\r
-      TempDevInfoNvme->BarAddr = BarAddr;\r
-      CopyMem (\r
-        TempDevInfoNvme->Password,\r
-        TmpDev->OpalDisk.Password,\r
-        TmpDev->OpalDisk.PasswordLength\r
-        );\r
-      TempDevInfoNvme->PasswordLength = TmpDev->OpalDisk.PasswordLength;\r
-      TempDevInfoNvme = (OPAL_DEVICE_NVME *) ((UINTN) TempDevInfoNvme + DevInfoLength);\r
+    ExtractDeviceInfoFromDevicePath (\r
+      TmpDev->OpalDisk.OpalDevicePath,\r
+      &DevInfoLength,\r
+      TempDevInfo\r
+      );\r
+    TempDevInfo->Length = DevInfoLength;\r
+    TempDevInfo->OpalBaseComId = TmpDev->OpalDisk.OpalBaseComId;\r
+    CopyMem (\r
+      TempDevInfo->Password,\r
+      TmpDev->OpalDisk.Password,\r
+      TmpDev->OpalDisk.PasswordLength\r
+      );\r
+    TempDevInfo->PasswordLength = TmpDev->OpalDisk.PasswordLength;\r
+\r
+    S3InitDevicesBak = S3InitDevices;\r
+    S3InitDevices    = AppendDevicePathInstance (\r
+                         S3InitDevicesBak,\r
+                         TmpDev->OpalDisk.OpalDevicePath\r
+                         );\r
+    if (S3InitDevicesBak != NULL) {\r
+      FreePool (S3InitDevicesBak);\r
+    }\r
+    ASSERT (S3InitDevices != NULL);\r
+    if (S3InitDevices == NULL) {\r
+      return;\r
     }\r
 \r
+    TempDevInfo = (OPAL_DEVICE_LOCKBOX_DATA *) ((UINTN) TempDevInfo + DevInfoLength);\r
     TmpDev = TmpDev->Next;\r
   }\r
 \r
   Status = SaveLockBox (\r
-             &mOpalDeviceNvmeGuid,\r
-             DevInfoNvme,\r
-             DevInfoLengthNvme\r
+             &mOpalDeviceLockBoxGuid,\r
+             DevInfo,\r
+             TotalDevInfoLength\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = SetLockBoxAttributes (\r
-             &mOpalDeviceNvmeGuid,\r
+             &mOpalDeviceLockBoxGuid,\r
              LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  ZeroMem (DevInfoNvme, DevInfoLengthNvme);\r
-  FreePool (DevInfoNvme);\r
+  S3InitDevicesLength = GetDevicePathSize (S3InitDevices);\r
+  if (S3InitDevicesExist) {\r
+    Status = UpdateLockBox (\r
+               &gS3StorageDeviceInitListGuid,\r
+               0,\r
+               S3InitDevices,\r
+               S3InitDevicesLength\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  } else {\r
+    Status = SaveLockBox (\r
+               &gS3StorageDeviceInitListGuid,\r
+               S3InitDevices,\r
+               S3InitDevicesLength\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    Status = SetLockBoxAttributes (\r
+               &gS3StorageDeviceInitListGuid,\r
+               LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
+\r
+  ZeroMem (DevInfo, TotalDevInfoLength);\r
+  FreePool (DevInfo);\r
+  FreePool (S3InitDevices);\r
 }\r
 \r
 /**\r
@@ -596,9 +446,6 @@ OpalEndOfDxeEventNotify (
   VOID                                    *Context\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_PHYSICAL_ADDRESS  Address;\r
-  UINT64                Length;\r
   OPAL_DRIVER_DEVICE    *TmpDev;\r
 \r
   DEBUG ((DEBUG_INFO, "%a() - enter\n", __FUNCTION__));\r
@@ -623,24 +470,7 @@ OpalEndOfDxeEventNotify (
     return;\r
   }\r
 \r
-  //\r
-  // Assume 64K size and alignment are enough.\r
-  //\r
-  Length = 0x10000;\r
-  Address = 0xFFFFFFFF;\r
-  Status = gDS->AllocateMemorySpace (\r
-                  EfiGcdAllocateMaxAddressSearchBottomUp,\r
-                  EfiGcdMemoryTypeMemoryMappedIo,\r
-                  16,                             // 2^16: 64K Alignment\r
-                  Length,\r
-                  &Address,\r
-                  gImageHandle,\r
-                  NULL\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  BuildOpalDeviceInfoAta ((UINT32) Address);\r
-  BuildOpalDeviceInfoNvme ((UINT32) Address);\r
+  BuildOpalDeviceInfo ();\r
 \r
   //\r
   // Zero passsword.\r
index 2bca770620d2cd4015dedae48630e65254b7c6d2..1baa483e72c747c05f25cfef5141d27ed8c15b7b 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Values defined and used by the Opal UEFI Driver.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/StorageSecurityCommand.h>\r
 \r
 #include <Guid/EventGroup.h>\r
+#include <Guid/S3StorageDeviceInitList.h>\r
 \r
 #include <Library/UefiLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
@@ -42,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HiiLib.h>\r
 #include <Library/UefiHiiServicesLib.h>\r
 #include <Library/PciLib.h>\r
-#include <Library/S3BootScriptLib.h>\r
 #include <Library/LockBoxLib.h>\r
 #include <Library/TcgStorageOpalLib.h>\r
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.c
deleted file mode 100644 (file)
index 01c316d..0000000
+++ /dev/null
@@ -1,1823 +0,0 @@
-/** @file\r
-  Provide functions to initialize NVME controller and perform NVME commands\r
-\r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#include "OpalPasswordPei.h"\r
-\r
-\r
-#define ALIGN(v, a)                         (UINTN)((((v) - 1) | ((a) - 1)) + 1)\r
-\r
-///\r
-/// NVME Host controller registers operation\r
-///\r
-#define NVME_GET_CAP(Nvme, Cap)             NvmeMmioRead  (Cap, Nvme->Nbar + NVME_CAP_OFFSET, sizeof (NVME_CAP))\r
-#define NVME_GET_CC(Nvme, Cc)               NvmeMmioRead  (Cc, Nvme->Nbar + NVME_CC_OFFSET, sizeof (NVME_CC))\r
-#define NVME_SET_CC(Nvme, Cc)               NvmeMmioWrite (Nvme->Nbar + NVME_CC_OFFSET, Cc, sizeof (NVME_CC))\r
-#define NVME_GET_CSTS(Nvme, Csts)           NvmeMmioRead  (Csts, Nvme->Nbar + NVME_CSTS_OFFSET, sizeof (NVME_CSTS))\r
-#define NVME_GET_AQA(Nvme, Aqa)             NvmeMmioRead  (Aqa, Nvme->Nbar + NVME_AQA_OFFSET, sizeof (NVME_AQA))\r
-#define NVME_SET_AQA(Nvme, Aqa)             NvmeMmioWrite (Nvme->Nbar + NVME_AQA_OFFSET, Aqa, sizeof (NVME_AQA))\r
-#define NVME_GET_ASQ(Nvme, Asq)             NvmeMmioRead  (Asq, Nvme->Nbar + NVME_ASQ_OFFSET, sizeof (NVME_ASQ))\r
-#define NVME_SET_ASQ(Nvme, Asq)             NvmeMmioWrite (Nvme->Nbar + NVME_ASQ_OFFSET, Asq, sizeof (NVME_ASQ))\r
-#define NVME_GET_ACQ(Nvme, Acq)             NvmeMmioRead  (Acq, Nvme->Nbar + NVME_ACQ_OFFSET, sizeof (NVME_ACQ))\r
-#define NVME_SET_ACQ(Nvme, Acq)             NvmeMmioWrite (Nvme->Nbar + NVME_ACQ_OFFSET, Acq, sizeof (NVME_ACQ))\r
-#define NVME_GET_VER(Nvme, Ver)             NvmeMmioRead  (Ver, Nvme->Nbar + NVME_VER_OFFSET, sizeof (NVME_VER))\r
-#define NVME_SET_SQTDBL(Nvme, Qid, Sqtdbl)  NvmeMmioWrite (Nvme->Nbar + NVME_SQTDBL_OFFSET(Qid, Nvme->Cap.Dstrd), Sqtdbl, sizeof (NVME_SQTDBL))\r
-#define NVME_SET_CQHDBL(Nvme, Qid, Cqhdbl)  NvmeMmioWrite (Nvme->Nbar + NVME_CQHDBL_OFFSET(Qid, Nvme->Cap.Dstrd), Cqhdbl, sizeof (NVME_CQHDBL))\r
-\r
-///\r
-/// Base memory address\r
-///\r
-enum {\r
-  BASEMEM_CONTROLLER_DATA,\r
-  BASEMEM_IDENTIFY_DATA,\r
-  BASEMEM_ASQ,\r
-  BASEMEM_ACQ,\r
-  BASEMEM_SQ,\r
-  BASEMEM_CQ,\r
-  BASEMEM_PRP,\r
-  BASEMEM_SECURITY,\r
-  MAX_BASEMEM_COUNT\r
-};\r
-\r
-///\r
-/// All of base memories are 4K(0x1000) alignment\r
-///\r
-#define NVME_MEM_BASE(Nvme)                 ((UINTN)(Nvme->BaseMem))\r
-#define NVME_CONTROL_DATA_BASE(Nvme)        (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_CONTROLLER_DATA))                        * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_NAMESPACE_DATA_BASE(Nvme)      (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_IDENTIFY_DATA))                          * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_ASQ_BASE(Nvme)                 (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_ASQ))                                    * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_ACQ_BASE(Nvme)                 (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_ACQ))                                    * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_SQ_BASE(Nvme, index)           (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_SQ) + ((index)*(NVME_MAX_IO_QUEUES-1)))  * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_CQ_BASE(Nvme, index)           (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_CQ) + ((index)*(NVME_MAX_IO_QUEUES-1)))  * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_PRP_BASE(Nvme, index)          (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_PRP) + ((index)*NVME_PRP_SIZE))          * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-#define NVME_SEC_BASE(Nvme)                 (ALIGN (NVME_MEM_BASE(Nvme) + ((NvmeGetBaseMemPages (BASEMEM_SECURITY))                               * EFI_PAGE_SIZE), EFI_PAGE_SIZE))\r
-\r
-/**\r
-  Transfer MMIO Data to memory.\r
-\r
-  @param[in,out] MemBuffer - Destination: Memory address\r
-  @param[in] MmioAddr      - Source: MMIO address\r
-  @param[in] Size          - Size for read\r
-\r
-  @retval EFI_SUCCESS - MMIO read sucessfully\r
-**/\r
-EFI_STATUS\r
-NvmeMmioRead (\r
-  IN OUT VOID *MemBuffer,\r
-  IN     UINTN MmioAddr,\r
-  IN     UINTN Size\r
-  )\r
-{\r
-  UINTN  Offset;\r
-  UINT8  Data;\r
-  UINT8  *Ptr;\r
-\r
-  // priority has adjusted\r
-  switch (Size) {\r
-    case 4:\r
-      *((UINT32 *)MemBuffer) = MmioRead32 (MmioAddr);\r
-      break;\r
-\r
-    case 8:\r
-      *((UINT64 *)MemBuffer) = MmioRead64 (MmioAddr);\r
-      break;\r
-\r
-    case 2:\r
-      *((UINT16 *)MemBuffer) = MmioRead16 (MmioAddr);\r
-      break;\r
-\r
-    case 1:\r
-      *((UINT8 *)MemBuffer) = MmioRead8 (MmioAddr);\r
-      break;\r
-\r
-    default:\r
-      Ptr = (UINT8 *)MemBuffer;\r
-      for (Offset = 0; Offset < Size; Offset += 1) {\r
-        Data = MmioRead8 (MmioAddr + Offset);\r
-        Ptr[Offset] = Data;\r
-      }\r
-      break;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Transfer memory data to MMIO.\r
-\r
-  @param[in,out] MmioAddr - Destination: MMIO address\r
-  @param[in] MemBuffer    - Source: Memory address\r
-  @param[in] Size         - Size for write\r
-\r
-  @retval EFI_SUCCESS - MMIO write sucessfully\r
-**/\r
-EFI_STATUS\r
-NvmeMmioWrite (\r
-  IN OUT UINTN MmioAddr,\r
-  IN     VOID *MemBuffer,\r
-  IN     UINTN Size\r
-  )\r
-{\r
-  UINTN  Offset;\r
-  UINT8  Data;\r
-  UINT8  *Ptr;\r
-\r
-  // priority has adjusted\r
-  switch (Size) {\r
-    case 4:\r
-      MmioWrite32 (MmioAddr, *((UINT32 *)MemBuffer));\r
-      break;\r
-\r
-    case 8:\r
-      MmioWrite64 (MmioAddr, *((UINT64 *)MemBuffer));\r
-      break;\r
-\r
-    case 2:\r
-      MmioWrite16 (MmioAddr, *((UINT16 *)MemBuffer));\r
-      break;\r
-\r
-    case 1:\r
-      MmioWrite8 (MmioAddr, *((UINT8 *)MemBuffer));\r
-      break;\r
-\r
-    default:\r
-      Ptr = (UINT8 *)MemBuffer;\r
-      for (Offset = 0; Offset < Size; Offset += 1) {\r
-        Data = Ptr[Offset];\r
-        MmioWrite8 (MmioAddr + Offset, Data);\r
-      }\r
-      break;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Transfer MMIO data to memory.\r
-\r
-  @param[in,out] MemBuffer - Destination: Memory address\r
-  @param[in] MmioAddr      - Source: MMIO address\r
-  @param[in] Size          - Size for read\r
-\r
-  @retval EFI_SUCCESS - MMIO read sucessfully\r
-**/\r
-EFI_STATUS\r
-OpalPciRead (\r
-  IN OUT VOID *MemBuffer,\r
-  IN     UINTN MmioAddr,\r
-  IN     UINTN Size\r
-  )\r
-{\r
-  UINTN  Offset;\r
-  UINT8  Data;\r
-  UINT8  *Ptr;\r
-\r
-  // priority has adjusted\r
-  switch (Size) {\r
-    case 4:\r
-      *((UINT32 *)MemBuffer) = PciRead32 (MmioAddr);\r
-      break;\r
-\r
-    case 2:\r
-      *((UINT16 *)MemBuffer) = PciRead16 (MmioAddr);\r
-      break;\r
-\r
-    case 1:\r
-      *((UINT8 *)MemBuffer) = PciRead8 (MmioAddr);\r
-      break;\r
-\r
-    default:\r
-      Ptr = (UINT8 *)MemBuffer;\r
-      for (Offset = 0; Offset < Size; Offset += 1) {\r
-        Data = PciRead8 (MmioAddr + Offset);\r
-        Ptr[Offset] = Data;\r
-      }\r
-      break;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Transfer memory data to MMIO.\r
-\r
-  @param[in,out] MmioAddr - Destination: MMIO address\r
-  @param[in] MemBuffer    - Source: Memory address\r
-  @param[in] Size         - Size for write\r
-\r
-  @retval EFI_SUCCESS - MMIO write sucessfully\r
-**/\r
-EFI_STATUS\r
-OpalPciWrite (\r
-  IN OUT UINTN MmioAddr,\r
-  IN     VOID *MemBuffer,\r
-  IN     UINTN Size\r
-  )\r
-{\r
-  UINTN  Offset;\r
-  UINT8  Data;\r
-  UINT8  *Ptr;\r
-\r
-  // priority has adjusted\r
-  switch (Size) {\r
-    case 4:\r
-      PciWrite32 (MmioAddr, *((UINT32 *)MemBuffer));\r
-      break;\r
-\r
-    case 2:\r
-      PciWrite16 (MmioAddr, *((UINT16 *)MemBuffer));\r
-      break;\r
-\r
-    case 1:\r
-      PciWrite8 (MmioAddr, *((UINT8 *)MemBuffer));\r
-      break;\r
-\r
-    default:\r
-      Ptr = (UINT8 *)MemBuffer;\r
-      for (Offset = 0; Offset < Size; Offset += 1) {\r
-        Data = Ptr[Offset];\r
-        PciWrite8 (MmioAddr + Offset, Data);\r
-      }\r
-      break;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Get total pages for specific NVME based memory.\r
-\r
-  @param[in] BaseMemIndex           - The Index of BaseMem (0-based).\r
-\r
-  @retval - The page count for specific BaseMem Index\r
-\r
-**/\r
-UINT32\r
-NvmeGetBaseMemPages (\r
-  IN UINTN              BaseMemIndex\r
-  )\r
-{\r
-  UINT32                Pages;\r
-  UINTN                 Index;\r
-  UINT32                PageSizeList[8];\r
-\r
-  PageSizeList[0] = 1;  /* Controller Data */\r
-  PageSizeList[1] = 1;  /* Identify Data */\r
-  PageSizeList[2] = 1;  /* ASQ */\r
-  PageSizeList[3] = 1;  /* ACQ */\r
-  PageSizeList[4] = 1;  /* SQs */\r
-  PageSizeList[5] = 1;  /* CQs */\r
-  PageSizeList[6] = NVME_PRP_SIZE * NVME_CSQ_DEPTH;  /* PRPs */\r
-  PageSizeList[7] = 1;  /* Security Commands */\r
-\r
-  if (BaseMemIndex > MAX_BASEMEM_COUNT) {\r
-    ASSERT (FALSE);\r
-    return 0;\r
-  }\r
-\r
-  Pages = 0;\r
-  for (Index = 0; Index < BaseMemIndex; Index++) {\r
-    Pages += PageSizeList[Index];\r
-  }\r
-\r
-  return Pages;\r
-}\r
-\r
-/**\r
-  Wait for NVME controller status to be ready or not.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] WaitReady              - Flag for waitting status ready or not\r
-\r
-  @return EFI_SUCCESS               - Successfully to wait specific status.\r
-  @return others                    - Fail to wait for specific controller status.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeWaitController (\r
-  IN NVME_CONTEXT       *Nvme,\r
-  IN BOOLEAN            WaitReady\r
-  )\r
-{\r
-  NVME_CSTS              Csts;\r
-  EFI_STATUS             Status;\r
-  UINT32                 Index;\r
-  UINT8                  Timeout;\r
-\r
-  //\r
-  // Cap.To specifies max delay time in 500ms increments for Csts.Rdy to set after\r
-  // Cc.Enable. Loop produces a 1 millisecond delay per itteration, up to 500 * Cap.To.\r
-  //\r
-  if (Nvme->Cap.To == 0) {\r
-    Timeout = 1;\r
-  } else {\r
-    Timeout = Nvme->Cap.To;\r
-  }\r
-\r
-  Status = EFI_SUCCESS;\r
-  for(Index = (Timeout * 500); Index != 0; --Index) {\r
-    MicroSecondDelay (1000);\r
-\r
-    //\r
-    // Check if the controller is initialized\r
-    //\r
-    Status = NVME_GET_CSTS (Nvme, &Csts);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NVME_GET_CSTS fail, Status = %r\n", Status));\r
-      return Status;\r
-    }\r
-\r
-    if ((BOOLEAN) Csts.Rdy == WaitReady) {\r
-      break;\r
-    }\r
-  }\r
-\r
-  if (Index == 0) {\r
-    Status = EFI_TIMEOUT;\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Disable the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully disable the controller.\r
-  @return others                    - Fail to disable the controller.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeDisableController (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  NVME_CC                Cc;\r
-  NVME_CSTS              Csts;\r
-  EFI_STATUS             Status;\r
-\r
-  Status = NVME_GET_CSTS (Nvme, &Csts);\r
-\r
-  ///\r
-  /// Read Controller Configuration Register.\r
-  ///\r
-  Status = NVME_GET_CC (Nvme, &Cc);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_GET_CC fail, Status = %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  if (Cc.En == 1) {\r
-    Cc.En = 0;\r
-    ///\r
-    /// Disable the controller.\r
-    ///\r
-    Status = NVME_SET_CC (Nvme, &Cc);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NVME_SET_CC fail, Status = %r\n", Status));\r
-      goto Done;\r
-    }\r
-  }\r
-\r
-  Status = NvmeWaitController (Nvme, FALSE);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeWaitController fail, Status = %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-\r
-Done:\r
-  DEBUG ((DEBUG_INFO, "NvmeDisableController fail, Status: %r\n", Status));\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Enable the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully enable the controller.\r
-  @return EFI_DEVICE_ERROR          - Fail to enable the controller.\r
-  @return EFI_TIMEOUT               - Fail to enable the controller in given time slot.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeEnableController (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  NVME_CC                Cc;\r
-  EFI_STATUS             Status;\r
-\r
-  //\r
-  // Enable the controller\r
-  //\r
-  ZeroMem (&Cc, sizeof (NVME_CC));\r
-  Cc.En     = 1;\r
-  Cc.Iosqes = 6;\r
-  Cc.Iocqes = 4;\r
-  Status    = NVME_SET_CC (Nvme, &Cc);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_SET_CC fail, Status = %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  Status = NvmeWaitController (Nvme, TRUE);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeWaitController fail, Status = %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-\r
-Done:\r
-  DEBUG ((DEBUG_INFO, "NvmeEnableController fail, Status: %r\n", Status));\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Shutdown the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully shutdown the controller.\r
-  @return EFI_DEVICE_ERROR          - Fail to shutdown the controller.\r
-  @return EFI_TIMEOUT               - Fail to shutdown the controller in given time slot.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeShutdownController (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  NVME_CC                Cc;\r
-  NVME_CSTS              Csts;\r
-  EFI_STATUS             Status;\r
-  UINT32                 Index;\r
-  UINTN                  Timeout;\r
-\r
-  Status    = NVME_GET_CC (Nvme, &Cc);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_GET_CC fail, Status = %r\n", Status));\r
-    return Status;\r
-  }\r
-\r
-  Cc.Shn     = 1; // Normal shutdown\r
-\r
-  Status    = NVME_SET_CC (Nvme, &Cc);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_SET_CC fail, Status = %r\n", Status));\r
-    return Status;\r
-  }\r
-\r
-  Timeout = NVME_GENERIC_TIMEOUT/1000; // ms\r
-  for(Index = (UINT32)(Timeout); Index != 0; --Index) {\r
-    MicroSecondDelay (1000);\r
-\r
-    Status = NVME_GET_CSTS (Nvme, &Csts);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NVME_GET_CSTS fail, Status = %r\n", Status));\r
-      return Status;\r
-    }\r
-\r
-    if (Csts.Shst == 2) { // Shutdown processing complete\r
-      break;\r
-    }\r
-  }\r
-\r
-  if (Index == 0) {\r
-    Status = EFI_TIMEOUT;\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Check the execution status from a given completion queue entry.\r
-\r
-  @param[in]     Cq                 - A pointer to the NVME_CQ item.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeCheckCqStatus (\r
-  IN NVME_CQ             *Cq\r
-  )\r
-{\r
-  if (Cq->Sct == 0x0 && Cq->Sc == 0x0) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  DEBUG ((DEBUG_INFO, "Dump NVMe Completion Entry Status from [0x%x]:\n", (UINTN)Cq));\r
-  DEBUG ((DEBUG_INFO, "  SQ Identifier : [0x%x], Phase Tag : [%d], Cmd Identifier : [0x%x]\n", Cq->Sqid, Cq->Pt, Cq->Cid));\r
-  DEBUG ((DEBUG_INFO, "  NVMe Cmd Execution Result - "));\r
-\r
-  switch (Cq->Sct) {\r
-    case 0x0:\r
-      switch (Cq->Sc) {\r
-        case 0x0:\r
-          DEBUG ((DEBUG_INFO, "Successful Completion\n"));\r
-          return EFI_SUCCESS;\r
-        case 0x1:\r
-          DEBUG ((DEBUG_INFO, "Invalid Command Opcode\n"));\r
-          break;\r
-        case 0x2:\r
-          DEBUG ((DEBUG_INFO, "Invalid Field in Command\n"));\r
-          break;\r
-        case 0x3:\r
-          DEBUG ((DEBUG_INFO, "Command ID Conflict\n"));\r
-          break;\r
-        case 0x4:\r
-          DEBUG ((DEBUG_INFO, "Data Transfer Error\n"));\r
-          break;\r
-        case 0x5:\r
-          DEBUG ((DEBUG_INFO, "Commands Aborted due to Power Loss Notification\n"));\r
-          break;\r
-        case 0x6:\r
-          DEBUG ((DEBUG_INFO, "Internal Device Error\n"));\r
-          break;\r
-        case 0x7:\r
-          DEBUG ((DEBUG_INFO, "Command Abort Requested\n"));\r
-          break;\r
-        case 0x8:\r
-          DEBUG ((DEBUG_INFO, "Command Aborted due to SQ Deletion\n"));\r
-          break;\r
-        case 0x9:\r
-          DEBUG ((DEBUG_INFO, "Command Aborted due to Failed Fused Command\n"));\r
-          break;\r
-        case 0xA:\r
-          DEBUG ((DEBUG_INFO, "Command Aborted due to Missing Fused Command\n"));\r
-          break;\r
-        case 0xB:\r
-          DEBUG ((DEBUG_INFO, "Invalid Namespace or Format\n"));\r
-          break;\r
-        case 0xC:\r
-          DEBUG ((DEBUG_INFO, "Command Sequence Error\n"));\r
-          break;\r
-        case 0xD:\r
-          DEBUG ((DEBUG_INFO, "Invalid SGL Last Segment Descriptor\n"));\r
-          break;\r
-        case 0xE:\r
-          DEBUG ((DEBUG_INFO, "Invalid Number of SGL Descriptors\n"));\r
-          break;\r
-        case 0xF:\r
-          DEBUG ((DEBUG_INFO, "Data SGL Length Invalid\n"));\r
-          break;\r
-        case 0x10:\r
-          DEBUG ((DEBUG_INFO, "Metadata SGL Length Invalid\n"));\r
-          break;\r
-        case 0x11:\r
-          DEBUG ((DEBUG_INFO, "SGL Descriptor Type Invalid\n"));\r
-          break;\r
-        case 0x80:\r
-          DEBUG ((DEBUG_INFO, "LBA Out of Range\n"));\r
-          break;\r
-        case 0x81:\r
-          DEBUG ((DEBUG_INFO, "Capacity Exceeded\n"));\r
-          break;\r
-        case 0x82:\r
-          DEBUG ((DEBUG_INFO, "Namespace Not Ready\n"));\r
-          break;\r
-        case 0x83:\r
-          DEBUG ((DEBUG_INFO, "Reservation Conflict\n"));\r
-          break;\r
-      }\r
-      break;\r
-\r
-    case 0x1:\r
-      switch (Cq->Sc) {\r
-        case 0x0:\r
-          DEBUG ((DEBUG_INFO, "Completion Queue Invalid\n"));\r
-          break;\r
-        case 0x1:\r
-          DEBUG ((DEBUG_INFO, "Invalid Queue Identifier\n"));\r
-          break;\r
-        case 0x2:\r
-          DEBUG ((DEBUG_INFO, "Maximum Queue Size Exceeded\n"));\r
-          break;\r
-        case 0x3:\r
-          DEBUG ((DEBUG_INFO, "Abort Command Limit Exceeded\n"));\r
-          break;\r
-        case 0x5:\r
-          DEBUG ((DEBUG_INFO, "Asynchronous Event Request Limit Exceeded\n"));\r
-          break;\r
-        case 0x6:\r
-          DEBUG ((DEBUG_INFO, "Invalid Firmware Slot\n"));\r
-          break;\r
-        case 0x7:\r
-          DEBUG ((DEBUG_INFO, "Invalid Firmware Image\n"));\r
-          break;\r
-        case 0x8:\r
-          DEBUG ((DEBUG_INFO, "Invalid Interrupt Vector\n"));\r
-          break;\r
-        case 0x9:\r
-          DEBUG ((DEBUG_INFO, "Invalid Log Page\n"));\r
-          break;\r
-        case 0xA:\r
-          DEBUG ((DEBUG_INFO, "Invalid Format\n"));\r
-          break;\r
-        case 0xB:\r
-          DEBUG ((DEBUG_INFO, "Firmware Application Requires Conventional Reset\n"));\r
-          break;\r
-        case 0xC:\r
-          DEBUG ((DEBUG_INFO, "Invalid Queue Deletion\n"));\r
-          break;\r
-        case 0xD:\r
-          DEBUG ((DEBUG_INFO, "Feature Identifier Not Saveable\n"));\r
-          break;\r
-        case 0xE:\r
-          DEBUG ((DEBUG_INFO, "Feature Not Changeable\n"));\r
-          break;\r
-        case 0xF:\r
-          DEBUG ((DEBUG_INFO, "Feature Not Namespace Specific\n"));\r
-          break;\r
-        case 0x10:\r
-          DEBUG ((DEBUG_INFO, "Firmware Application Requires NVM Subsystem Reset\n"));\r
-          break;\r
-        case 0x80:\r
-          DEBUG ((DEBUG_INFO, "Conflicting Attributes\n"));\r
-          break;\r
-        case 0x81:\r
-          DEBUG ((DEBUG_INFO, "Invalid Protection Information\n"));\r
-          break;\r
-        case 0x82:\r
-          DEBUG ((DEBUG_INFO, "Attempted Write to Read Only Range\n"));\r
-          break;\r
-      }\r
-      break;\r
-\r
-    case 0x2:\r
-      switch (Cq->Sc) {\r
-        case 0x80:\r
-          DEBUG ((DEBUG_INFO, "Write Fault\n"));\r
-          break;\r
-        case 0x81:\r
-          DEBUG ((DEBUG_INFO, "Unrecovered Read Error\n"));\r
-          break;\r
-        case 0x82:\r
-          DEBUG ((DEBUG_INFO, "End-to-end Guard Check Error\n"));\r
-          break;\r
-        case 0x83:\r
-          DEBUG ((DEBUG_INFO, "End-to-end Application Tag Check Error\n"));\r
-          break;\r
-        case 0x84:\r
-          DEBUG ((DEBUG_INFO, "End-to-end Reference Tag Check Error\n"));\r
-          break;\r
-        case 0x85:\r
-          DEBUG ((DEBUG_INFO, "Compare Failure\n"));\r
-          break;\r
-        case 0x86:\r
-          DEBUG ((DEBUG_INFO, "Access Denied\n"));\r
-          break;\r
-      }\r
-      break;\r
-\r
-    default:\r
-      DEBUG ((DEBUG_INFO, "Unknown error\n"));\r
-      break;\r
-  }\r
-\r
-  return EFI_DEVICE_ERROR;\r
-}\r
-\r
-/**\r
-  Create PRP lists for Data transfer which is larger than 2 memory pages.\r
-  Note here we calcuate the number of required PRP lists and allocate them at one time.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] SqId                   - The SQ index for this PRP\r
-  @param[in] PhysicalAddr           - The physical base address of Data Buffer.\r
-  @param[in] Pages                  - The number of pages to be transfered.\r
-  @param[out] PrpListHost           - The host base address of PRP lists.\r
-  @param[in,out] PrpListNo          - The number of PRP List.\r
-\r
-  @retval The pointer Value to the first PRP List of the PRP lists.\r
-\r
-**/\r
-STATIC\r
-UINT64\r
-NvmeCreatePrpList (\r
-  IN     NVME_CONTEXT                 *Nvme,\r
-  IN     UINT16                       SqId,\r
-  IN     EFI_PHYSICAL_ADDRESS         PhysicalAddr,\r
-  IN     UINTN                        Pages,\r
-     OUT VOID                         **PrpListHost,\r
-  IN OUT UINTN                        *PrpListNo\r
-  )\r
-{\r
-  UINTN                       PrpEntryNo;\r
-  UINT64                      PrpListBase;\r
-  UINTN                       PrpListIndex;\r
-  UINTN                       PrpEntryIndex;\r
-  UINT64                      Remainder;\r
-  EFI_PHYSICAL_ADDRESS        PrpListPhyAddr;\r
-  UINTN                       Bytes;\r
-  UINT8                       *PrpEntry;\r
-  EFI_PHYSICAL_ADDRESS        NewPhyAddr;\r
-\r
-  ///\r
-  /// The number of Prp Entry in a memory page.\r
-  ///\r
-  PrpEntryNo = EFI_PAGE_SIZE / sizeof (UINT64);\r
-\r
-  ///\r
-  /// Calculate total PrpList number.\r
-  ///\r
-  *PrpListNo = (UINTN) DivU64x64Remainder ((UINT64)Pages, (UINT64)PrpEntryNo, &Remainder);\r
-  if (Remainder != 0) {\r
-    *PrpListNo += 1;\r
-  }\r
-\r
-  if (*PrpListNo > NVME_PRP_SIZE) {\r
-    DEBUG ((DEBUG_INFO, "NvmeCreatePrpList (PhysicalAddr: %lx, Pages: %x) PrpEntryNo: %x\n",\r
-      PhysicalAddr, Pages, PrpEntryNo));\r
-    DEBUG ((DEBUG_INFO, "*PrpListNo: %x, Remainder: %lx", *PrpListNo, Remainder));\r
-    ASSERT (FALSE);\r
-  }\r
-  *PrpListHost = (VOID *)(UINTN) NVME_PRP_BASE (Nvme, SqId);\r
-\r
-  Bytes = EFI_PAGES_TO_SIZE (*PrpListNo);\r
-  PrpListPhyAddr = (UINT64)(UINTN)(*PrpListHost);\r
-\r
-  ///\r
-  /// Fill all PRP lists except of last one.\r
-  ///\r
-  ZeroMem (*PrpListHost, Bytes);\r
-  for (PrpListIndex = 0; PrpListIndex < *PrpListNo - 1; ++PrpListIndex) {\r
-    PrpListBase = *(UINT64*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE;\r
-\r
-    for (PrpEntryIndex = 0; PrpEntryIndex < PrpEntryNo; ++PrpEntryIndex) {\r
-      PrpEntry = (UINT8 *)(UINTN) (PrpListBase + PrpEntryIndex * sizeof(UINT64));\r
-      if (PrpEntryIndex != PrpEntryNo - 1) {\r
-        ///\r
-        /// Fill all PRP entries except of last one.\r
-        ///\r
-        CopyMem (PrpEntry, (VOID *)(UINTN) (&PhysicalAddr), sizeof (UINT64));\r
-        PhysicalAddr += EFI_PAGE_SIZE;\r
-      } else {\r
-        ///\r
-        /// Fill last PRP entries with next PRP List pointer.\r
-        ///\r
-        NewPhyAddr = (PrpListPhyAddr + (PrpListIndex + 1) * EFI_PAGE_SIZE);\r
-        CopyMem (PrpEntry, (VOID *)(UINTN) (&NewPhyAddr), sizeof (UINT64));\r
-      }\r
-    }\r
-  }\r
-\r
-  ///\r
-  /// Fill last PRP list.\r
-  ///\r
-  PrpListBase = *(UINT64*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE;\r
-  for (PrpEntryIndex = 0; PrpEntryIndex < ((Remainder != 0) ? Remainder : PrpEntryNo); ++PrpEntryIndex) {\r
-    PrpEntry = (UINT8 *)(UINTN) (PrpListBase + PrpEntryIndex * sizeof(UINT64));\r
-    CopyMem (PrpEntry, (VOID *)(UINTN) (&PhysicalAddr), sizeof (UINT64));\r
-\r
-    PhysicalAddr += EFI_PAGE_SIZE;\r
-  }\r
-\r
-  return PrpListPhyAddr;\r
-}\r
-\r
-/**\r
-  Waits until all NVME commands completed.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] Qid                    - Queue index\r
-\r
-  @retval EFI_SUCCESS               - All NVME commands have completed\r
-  @retval EFI_TIMEOUT               - Timeout occured\r
-  @retval EFI_NOT_READY             - Not all NVME commands have completed\r
-  @retval others                    - Error occurred on device side.\r
-**/\r
-EFI_STATUS\r
-NvmeWaitAllComplete (\r
-  IN NVME_CONTEXT       *Nvme,\r
-  IN UINT8              Qid\r
-  )\r
-{\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Sends an NVM Express Command Packet to an NVM Express controller or namespace. This function supports\r
-  both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the nonblocking\r
-  I/O functionality is optional.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] NamespaceId            - Is a 32 bit Namespace ID to which the Express HCI command packet will be sent.\r
-                                      A Value of 0 denotes the NVM Express controller, a Value of all 0FFh in the namespace\r
-                                      ID specifies that the command packet should be sent to all valid namespaces.\r
-  @param[in] NamespaceUuid          - Is a 64 bit Namespace UUID to which the Express HCI command packet will be sent.\r
-                                      A Value of 0 denotes the NVM Express controller, a Value of all 0FFh in the namespace\r
-                                      UUID specifies that the command packet should be sent to all valid namespaces.\r
-  @param[in,out] Packet             - A pointer to the NVM Express HCI Command Packet to send to the NVMe namespace specified\r
-                                      by NamespaceId.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Command Packet was sent by the host. TransferLength bytes were transferred\r
-                                      to, or from DataBuffer.\r
-  @retval EFI_NOT_READY             - The NVM Express Command Packet could not be sent because the controller is not ready. The caller\r
-                                      may retry again later.\r
-  @retval EFI_DEVICE_ERROR          - A device error occurred while attempting to send the NVM Express Command Packet.\r
-  @retval EFI_INVALID_PARAMETER     - Namespace, or the contents of NVM_EXPRESS_PASS_THRU_COMMAND_PACKET are invalid. The NVM\r
-                                      Express Command Packet was not sent, so no additional status information is available.\r
-  @retval EFI_UNSUPPORTED           - The command described by the NVM Express Command Packet is not supported by the host adapter.\r
-                                      The NVM Express Command Packet was not sent, so no additional status information is available.\r
-  @retval EFI_TIMEOUT               - A timeout occurred while waiting for the NVM Express Command Packet to execute.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmePassThru (\r
-  IN     NVME_CONTEXT                         *Nvme,\r
-  IN     UINT32                               NamespaceId,\r
-  IN     UINT64                               NamespaceUuid,\r
-  IN OUT NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet\r
-  )\r
-{\r
-  EFI_STATUS                    Status;\r
-  NVME_SQ                       *Sq;\r
-  NVME_CQ                       *Cq;\r
-  UINT8                         Qid;\r
-  UINT32                        Bytes;\r
-  UINT32                        Offset;\r
-  EFI_PHYSICAL_ADDRESS          PhyAddr;\r
-  VOID                          *PrpListHost;\r
-  UINTN                         PrpListNo;\r
-  UINT32                        Timer;\r
-  UINTN SqSize;\r
-  UINTN CqSize;\r
-\r
-  ///\r
-  /// check the Data fields in Packet parameter.\r
-  ///\r
-  if ((Nvme == NULL) || (Packet == NULL)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmePassThru, invalid parameter: Nvme(%x)/Packet(%x)\n",\r
-      (UINTN)Nvme, (UINTN)Packet));\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  if ((Packet->NvmeCmd == NULL) || (Packet->NvmeResponse == NULL)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmePassThru, invalid parameter: NvmeCmd(%x)/NvmeResponse(%x)\n",\r
-      (UINTN)Packet->NvmeCmd, (UINTN)Packet->NvmeResponse));\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  if (Packet->QueueId != NVME_ADMIN_QUEUE && Packet->QueueId != NVME_IO_QUEUE) {\r
-    DEBUG ((DEBUG_ERROR, "NvmePassThru, invalid parameter: QueueId(%x)\n",\r
-      Packet->QueueId));\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  PrpListHost = NULL;\r
-  PrpListNo   = 0;\r
-  Status      = EFI_SUCCESS;\r
-\r
-  Qid = Packet->QueueId;\r
-  Sq  = Nvme->SqBuffer[Qid] + Nvme->SqTdbl[Qid].Sqt;\r
-  Cq  = Nvme->CqBuffer[Qid] + Nvme->CqHdbl[Qid].Cqh;\r
-  if (Qid == NVME_ADMIN_QUEUE) {\r
-    SqSize = NVME_ASQ_SIZE + 1;\r
-    CqSize = NVME_ACQ_SIZE + 1;\r
-  } else {\r
-    SqSize = NVME_CSQ_DEPTH;\r
-    CqSize = NVME_CCQ_DEPTH;\r
-  }\r
-\r
-  if (Packet->NvmeCmd->Nsid != NamespaceId) {\r
-    DEBUG ((DEBUG_ERROR, "NvmePassThru: Nsid mismatch (%x, %x)\n",\r
-      Packet->NvmeCmd->Nsid, NamespaceId));\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  ZeroMem (Sq, sizeof (NVME_SQ));\r
-  Sq->Opc  = Packet->NvmeCmd->Cdw0.Opcode;\r
-  Sq->Fuse = Packet->NvmeCmd->Cdw0.FusedOperation;\r
-  Sq->Cid  = Packet->NvmeCmd->Cdw0.Cid;\r
-  Sq->Nsid = Packet->NvmeCmd->Nsid;\r
-\r
-  ///\r
-  /// Currently we only support PRP for Data transfer, SGL is NOT supported.\r
-  ///\r
-  ASSERT (Sq->Psdt == 0);\r
-  if (Sq->Psdt != 0) {\r
-    DEBUG ((DEBUG_ERROR, "NvmePassThru: doesn't support SGL mechanism\n"));\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  Sq->Prp[0] = Packet->TransferBuffer;\r
-  Sq->Prp[1] = 0;\r
-\r
-  if(Packet->MetadataBuffer != (UINT64)(UINTN)NULL) {\r
-    Sq->Mptr = Packet->MetadataBuffer;\r
-  }\r
-\r
-  ///\r
-  /// If the Buffer Size spans more than two memory pages (page Size as defined in CC.Mps),\r
-  /// then build a PRP list in the second PRP submission queue entry.\r
-  ///\r
-  Offset = ((UINT32)Sq->Prp[0]) & (EFI_PAGE_SIZE - 1);\r
-  Bytes  = Packet->TransferLength;\r
-\r
-  if ((Offset + Bytes) > (EFI_PAGE_SIZE * 2)) {\r
-    ///\r
-    /// Create PrpList for remaining Data Buffer.\r
-    ///\r
-    PhyAddr = (Sq->Prp[0] + EFI_PAGE_SIZE) & ~(EFI_PAGE_SIZE - 1);\r
-    Sq->Prp[1] = NvmeCreatePrpList (Nvme, Nvme->SqTdbl[Qid].Sqt, PhyAddr, EFI_SIZE_TO_PAGES(Offset + Bytes) - 1, &PrpListHost, &PrpListNo);\r
-    if (Sq->Prp[1] == 0) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      DEBUG ((DEBUG_ERROR, "NvmeCreatePrpList fail, Status: %r\n", Status));\r
-      goto EXIT;\r
-    }\r
-\r
-  } else if ((Offset + Bytes) > EFI_PAGE_SIZE) {\r
-    Sq->Prp[1] = (Sq->Prp[0] + EFI_PAGE_SIZE) & ~(EFI_PAGE_SIZE - 1);\r
-  }\r
-\r
-  if(Packet->NvmeCmd->Flags & CDW10_VALID) {\r
-    Sq->Payload.Raw.Cdw10 = Packet->NvmeCmd->Cdw10;\r
-  }\r
-  if(Packet->NvmeCmd->Flags & CDW11_VALID) {\r
-    Sq->Payload.Raw.Cdw11 = Packet->NvmeCmd->Cdw11;\r
-  }\r
-  if(Packet->NvmeCmd->Flags & CDW12_VALID) {\r
-    Sq->Payload.Raw.Cdw12 = Packet->NvmeCmd->Cdw12;\r
-  }\r
-  if(Packet->NvmeCmd->Flags & CDW13_VALID) {\r
-    Sq->Payload.Raw.Cdw13 = Packet->NvmeCmd->Cdw13;\r
-  }\r
-  if(Packet->NvmeCmd->Flags & CDW14_VALID) {\r
-    Sq->Payload.Raw.Cdw14 = Packet->NvmeCmd->Cdw14;\r
-  }\r
-  if(Packet->NvmeCmd->Flags & CDW15_VALID) {\r
-    Sq->Payload.Raw.Cdw15 = Packet->NvmeCmd->Cdw15;\r
-  }\r
-\r
-  ///\r
-  /// Ring the submission queue doorbell.\r
-  ///\r
-  Nvme->SqTdbl[Qid].Sqt++;\r
-  if(Nvme->SqTdbl[Qid].Sqt == SqSize) {\r
-    Nvme->SqTdbl[Qid].Sqt = 0;\r
-  }\r
-  Status = NVME_SET_SQTDBL (Nvme, Qid, &Nvme->SqTdbl[Qid]);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_SET_SQTDBL fail, Status: %r\n", Status));\r
-    goto EXIT;\r
-  }\r
-\r
-  ///\r
-  /// Wait for completion queue to get filled in.\r
-  ///\r
-  Status = EFI_TIMEOUT;\r
-  Timer   = 0;\r
-  while (Timer < NVME_CMD_TIMEOUT) {\r
-    //DEBUG ((DEBUG_VERBOSE, "Timer: %x, Cq:\n", Timer));\r
-    //DumpMem (Cq, sizeof (NVME_CQ));\r
-    if (Cq->Pt != Nvme->Pt[Qid]) {\r
-      Status = EFI_SUCCESS;\r
-      break;\r
-    }\r
-\r
-    MicroSecondDelay (NVME_CMD_WAIT);\r
-    Timer += NVME_CMD_WAIT;\r
-  }\r
-\r
-  Nvme->CqHdbl[Qid].Cqh++;\r
-  if (Nvme->CqHdbl[Qid].Cqh == CqSize) {\r
-    Nvme->CqHdbl[Qid].Cqh = 0;\r
-    Nvme->Pt[Qid] ^= 1;\r
-  }\r
-\r
-  ///\r
-  /// Copy the Respose Queue entry for this command to the callers response Buffer\r
-  ///\r
-  CopyMem (Packet->NvmeResponse, Cq, sizeof(NVM_EXPRESS_RESPONSE));\r
-\r
-  if (!EFI_ERROR(Status)) { // We still need to check CQ status if no timeout error occured\r
-    Status = NvmeCheckCqStatus (Cq);\r
-  }\r
-  NVME_SET_CQHDBL (Nvme, Qid, &Nvme->CqHdbl[Qid]);\r
-\r
-EXIT:\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Get identify controller Data.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] Buffer                 - The Buffer used to store the identify controller Data.\r
-\r
-  @return EFI_SUCCESS               - Successfully get the identify controller Data.\r
-  @return others                    - Fail to get the identify controller Data.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeIdentifyController (\r
-  IN NVME_CONTEXT                          *Nvme,\r
-  IN VOID                                  *Buffer\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  //\r
-  // According to Nvm Express 1.1 spec Figure 38, When not used, the field shall be cleared to 0h.\r
-  // For the Identify command, the Namespace Identifier is only used for the Namespace Data structure.\r
-  //\r
-  Command.Nsid        = 0;\r
-\r
-  CommandPacket.NvmeCmd        = &Command;\r
-  CommandPacket.NvmeResponse   = &Response;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Buffer;\r
-  CommandPacket.TransferLength = sizeof (NVME_ADMIN_CONTROLLER_DATA);\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-  //\r
-  // Set bit 0 (Cns bit) to 1 to identify a controller\r
-  //\r
-  Command.Cdw10                = 1;\r
-  Command.Flags                = CDW10_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Get specified identify namespace Data.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] NamespaceId            - The specified namespace identifier.\r
-  @param[in] Buffer                 - The Buffer used to store the identify namespace Data.\r
-\r
-  @return EFI_SUCCESS               - Successfully get the identify namespace Data.\r
-  @return others                    - Fail to get the identify namespace Data.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeIdentifyNamespace (\r
-  IN NVME_CONTEXT                          *Nvme,\r
-  IN UINT32                                NamespaceId,\r
-  IN VOID                                  *Buffer\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  Command.Nsid        = NamespaceId;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Buffer;\r
-  CommandPacket.TransferLength = sizeof (NVME_ADMIN_NAMESPACE_DATA);\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-  //\r
-  // Set bit 0 (Cns bit) to 1 to identify a namespace\r
-  //\r
-  CommandPacket.NvmeCmd->Cdw10 = 0;\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NamespaceId,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Get Block Size for specific namespace of NVME.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return                           - Block Size in bytes\r
-\r
-**/\r
-STATIC\r
-UINT32\r
-NvmeGetBlockSize (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  UINT32                BlockSize;\r
-  UINT32                Lbads;\r
-  UINT32                Flbas;\r
-  UINT32                LbaFmtIdx;\r
-\r
-  Flbas     = Nvme->NamespaceData->Flbas;\r
-  LbaFmtIdx = Flbas & 3;\r
-  Lbads     = Nvme->NamespaceData->LbaFormat[LbaFmtIdx].Lbads;\r
-\r
-  BlockSize = (UINT32)1 << Lbads;\r
-  return BlockSize;\r
-}\r
-\r
-/**\r
-  Get last LBA for specific namespace of NVME.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return                           - Last LBA address\r
-\r
-**/\r
-STATIC\r
-EFI_LBA\r
-NvmeGetLastLba (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  EFI_LBA               LastBlock;\r
-  LastBlock = Nvme->NamespaceData->Nsze - 1;\r
-  return LastBlock;\r
-}\r
-\r
-/**\r
-  Create io completion queue.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully create io completion queue.\r
-  @return others                    - Fail to create io completion queue.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeCreateIoCompletionQueue (\r
-  IN     NVME_CONTEXT                      *Nvme\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-  NVME_ADMIN_CRIOCQ                        CrIoCq;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-  ZeroMem (&CrIoCq, sizeof(NVME_ADMIN_CRIOCQ));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_CRIOCQ_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Nvme->CqBuffer[NVME_IO_QUEUE];\r
-  CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-\r
-  CrIoCq.Qid   = NVME_IO_QUEUE;\r
-  CrIoCq.Qsize = NVME_CCQ_SIZE;\r
-  CrIoCq.Pc    = 1;\r
-  CopyMem (&CommandPacket.NvmeCmd->Cdw10, &CrIoCq, sizeof (NVME_ADMIN_CRIOCQ));\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Create io submission queue.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully create io submission queue.\r
-  @return others                    - Fail to create io submission queue.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeCreateIoSubmissionQueue (\r
-  IN NVME_CONTEXT                          *Nvme\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-  NVME_ADMIN_CRIOSQ                        CrIoSq;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-  ZeroMem (&CrIoSq, sizeof(NVME_ADMIN_CRIOSQ));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_CRIOSQ_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Nvme->SqBuffer[NVME_IO_QUEUE];\r
-  CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-\r
-  CrIoSq.Qid   = NVME_IO_QUEUE;\r
-  CrIoSq.Qsize = NVME_CSQ_SIZE;\r
-  CrIoSq.Pc    = 1;\r
-  CrIoSq.Cqid  = NVME_IO_QUEUE;\r
-  CrIoSq.Qprio = 0;\r
-  CopyMem (&CommandPacket.NvmeCmd->Cdw10, &CrIoSq, sizeof (NVME_ADMIN_CRIOSQ));\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Security send and receive commands.\r
-\r
-  @param[in]     Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in]     SendCommand            - The flag to indicate the command type, TRUE for Send command and FALSE for receive command\r
-  @param[in]     SecurityProtocol       - Security Protocol\r
-  @param[in]     SpSpecific             - Security Protocol Specific\r
-  @param[in]     TransferLength         - Transfer Length of Buffer (in bytes) - always a multiple of 512\r
-  @param[in,out] TransferBuffer         - Address of Data to transfer\r
-\r
-  @return EFI_SUCCESS               - Successfully create io submission queue.\r
-  @return others                    - Fail to send/receive commands.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeSecuritySendReceive (\r
-  IN NVME_CONTEXT                          *Nvme,\r
-  IN BOOLEAN                               SendCommand,\r
-  IN UINT8                                 SecurityProtocol,\r
-  IN UINT16                                SpSpecific,\r
-  IN UINTN                                 TransferLength,\r
-  IN OUT VOID                              *TransferBuffer\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-  NVME_ADMIN_SECSEND                       SecSend;\r
-  OACS                                     *Oacs;\r
-  UINT8                                    Opcode;\r
-  VOID*                                    *SecBuff;\r
-\r
-  Oacs = (OACS *)&Nvme->ControllerData->Oacs;\r
-\r
-  //\r
-  // Verify security bit for Security Send/Receive commands\r
-  //\r
-  if (Oacs->Security == 0) {\r
-    DEBUG ((DEBUG_ERROR, "Security command doesn't support.\n"));\r
-    return EFI_NOT_READY;\r
-  }\r
-\r
-  SecBuff = (VOID *)(UINTN) NVME_SEC_BASE (Nvme);\r
-\r
-  //\r
-  // Actions for sending security command\r
-  //\r
-  if (SendCommand) {\r
-    CopyMem (SecBuff, TransferBuffer, TransferLength);\r
-  }\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-  ZeroMem (&SecSend, sizeof(NVME_ADMIN_SECSEND));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Opcode = (UINT8)(SendCommand ? NVME_ADMIN_SECURITY_SEND_OPC : NVME_ADMIN_SECURITY_RECV_OPC);\r
-  Command.Cdw0.Opcode = Opcode;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)SecBuff;\r
-  CommandPacket.TransferLength = (UINT32)TransferLength;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-\r
-  SecSend.Spsp = SpSpecific;\r
-  SecSend.Secp = SecurityProtocol;\r
-  SecSend.Tl   = (UINT32)TransferLength;\r
-\r
-  CopyMem (&CommandPacket.NvmeCmd->Cdw10, &SecSend, sizeof (NVME_ADMIN_SECSEND));\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  //\r
-  // Actions for receiving security command\r
-  //\r
-  if (!SendCommand) {\r
-    CopyMem (TransferBuffer, SecBuff, TransferLength);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Destroy io completion queue.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully destroy io completion queue.\r
-  @return others                    - Fail to destroy io completion queue.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeDestroyIoCompletionQueue (\r
-  IN     NVME_CONTEXT                      *Nvme\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-  NVME_ADMIN_DEIOCQ                        DelIoCq;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-  ZeroMem (&DelIoCq, sizeof(NVME_ADMIN_DEIOCQ));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_DELIOCQ_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Nvme->CqBuffer[NVME_IO_QUEUE];\r
-  CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-\r
-  DelIoCq.Qid   = NVME_IO_QUEUE;\r
-  CopyMem (&CommandPacket.NvmeCmd->Cdw10, &DelIoCq, sizeof (NVME_ADMIN_DEIOCQ));\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Destroy io submission queue.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @return EFI_SUCCESS               - Successfully destroy io submission queue.\r
-  @return others                    - Fail to destroy io submission queue.\r
-\r
-**/\r
-STATIC\r
-EFI_STATUS\r
-NvmeDestroyIoSubmissionQueue (\r
-  IN NVME_CONTEXT                          *Nvme\r
-  )\r
-{\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
-  EFI_STATUS                               Status;\r
-  NVME_ADMIN_DEIOSQ                        DelIoSq;\r
-\r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
-  ZeroMem (&DelIoSq, sizeof(NVME_ADMIN_DEIOSQ));\r
-\r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
-\r
-  Command.Cdw0.Opcode = NVME_ADMIN_DELIOSQ_OPC;\r
-  Command.Cdw0.Cid    = Nvme->Cid[NVME_ADMIN_QUEUE]++;\r
-  CommandPacket.TransferBuffer = (UINT64)(UINTN)Nvme->SqBuffer[NVME_IO_QUEUE];\r
-  CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
-  CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_ADMIN_QUEUE;\r
-\r
-  DelIoSq.Qid   = NVME_IO_QUEUE;\r
-  CopyMem (&CommandPacket.NvmeCmd->Cdw10, &DelIoSq, sizeof (NVME_ADMIN_DEIOSQ));\r
-  CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID;\r
-\r
-  Status = NvmePassThru (\r
-              Nvme,\r
-              NVME_CONTROLLER_ID,\r
-              0,\r
-              &CommandPacket\r
-              );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = NvmeWaitAllComplete (Nvme, CommandPacket.QueueId);\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Allocate transfer-related Data struct which is used at Nvme.\r
-\r
-  @param[in, out] Nvme          The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_OUT_OF_RESOURCE   No enough resource.\r
-  @retval EFI_SUCCESS           Successful to allocate resource.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NvmeAllocateResource (\r
-  IN OUT NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      DeviceAddress;\r
-  VOID                      *Base;\r
-  VOID                      *Mapping;\r
-\r
-  //\r
-  // Allocate resources for DMA.\r
-  //\r
-  Status = IoMmuAllocateBuffer (\r
-             EFI_SIZE_TO_PAGES (NVME_MEM_MAX_SIZE),\r
-             &Base,\r
-             &DeviceAddress,\r
-             &Mapping\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Base));\r
-  Nvme->BaseMemMapping = Mapping;\r
-  Nvme->BaseMem = Base;\r
-  ZeroMem (Nvme->BaseMem, EFI_PAGE_SIZE * EFI_SIZE_TO_PAGES (NVME_MEM_MAX_SIZE));\r
-\r
-  DEBUG ((\r
-    DEBUG_INFO,\r
-    "%a() NvmeContext 0x%x\n",\r
-    __FUNCTION__,\r
-    Nvme->BaseMem\r
-    ));\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Free allocated transfer-related Data struct which is used at NVMe.\r
-\r
-  @param[in, out] Nvme          The pointer to the NVME_CONTEXT Data structure.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-NvmeFreeResource (\r
-  IN OUT NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  if (Nvme->BaseMem != NULL) {\r
-    IoMmuFreeBuffer (\r
-       EFI_SIZE_TO_PAGES (NVME_MEM_MAX_SIZE),\r
-       Nvme->BaseMem,\r
-       Nvme->BaseMemMapping\r
-       );\r
-    Nvme->BaseMem = NULL;\r
-  }\r
-}\r
-\r
-/**\r
-  Initialize the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Controller is initialized successfully.\r
-  @retval Others                    - A device error occurred while initializing the controller.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeControllerInit (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  EFI_STATUS            Status;\r
-  NVME_AQA              Aqa;\r
-  NVME_ASQ              Asq;\r
-  NVME_ACQ              Acq;\r
-  NVME_VER              Ver;\r
-\r
-  UINT32                MlBAR;\r
-  UINT32                MuBAR;\r
-\r
-  ///\r
-  /// Update PCIE BAR0/1 for NVME device\r
-  ///\r
-  MlBAR = Nvme->Nbar;\r
-  MuBAR = 0;\r
-  PciWrite32 (Nvme->PciBase + 0x10, MlBAR); // MLBAR (BAR0)\r
-  PciWrite32 (Nvme->PciBase + 0x14, MuBAR); // MUBAR (BAR1)\r
-\r
-  ///\r
-  /// Enable PCIE decode\r
-  ///\r
-  PciWrite8 (Nvme->PciBase + NVME_PCIE_PCICMD, 0x6);\r
-\r
-  // Version\r
-  NVME_GET_VER (Nvme, &Ver);\r
-  if (!(Ver.Mjr == 0x0001) && (Ver.Mnr == 0x0000)) {\r
-    DEBUG ((DEBUG_INFO, "\n!!!\n!!! NVME Version mismatch for the implementation !!!\n!!!\n"));\r
-  }\r
-\r
-  ///\r
-  /// Read the Controller Capabilities register and verify that the NVM command set is supported\r
-  ///\r
-  Status = NVME_GET_CAP (Nvme, &Nvme->Cap);\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NVME_GET_CAP fail, Status: %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  if (Nvme->Cap.Css != 0x01) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeControllerInit fail: the controller doesn't support NVMe command set\n"));\r
-    Status = EFI_UNSUPPORTED;\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Currently the driver only supports 4k page Size.\r
-  ///\r
-  if ((Nvme->Cap.Mpsmin + 12) > EFI_PAGE_SHIFT) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeControllerInit fail: only supports 4k page Size\n"));\r
-    ASSERT (FALSE);\r
-    Status = EFI_UNSUPPORTED;\r
-    goto Done;\r
-  }\r
-\r
-  Nvme->Cid[0] = 0;\r
-  Nvme->Cid[1] = 0;\r
-\r
-  Nvme->Pt[0]  = 0;\r
-  Nvme->Pt[1]  = 0;\r
-\r
-  ZeroMem ((VOID *)(UINTN)(&(Nvme->SqTdbl[0])), sizeof (NVME_SQTDBL) * NVME_MAX_IO_QUEUES);\r
-  ZeroMem ((VOID *)(UINTN)(&(Nvme->CqHdbl[0])), sizeof (NVME_CQHDBL) * NVME_MAX_IO_QUEUES);\r
-\r
-  ZeroMem (Nvme->BaseMem, NVME_MEM_MAX_SIZE);\r
-\r
-  Status = NvmeDisableController (Nvme);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeDisableController fail, Status: %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// set number of entries admin submission & completion queues.\r
-  ///\r
-  Aqa.Asqs  = NVME_ASQ_SIZE;\r
-  Aqa.Rsvd1 = 0;\r
-  Aqa.Acqs  = NVME_ACQ_SIZE;\r
-  Aqa.Rsvd2 = 0;\r
-\r
-  ///\r
-  /// Address of admin submission queue.\r
-  ///\r
-  Asq = (UINT64)(UINTN)(NVME_ASQ_BASE (Nvme) & ~0xFFF);\r
-\r
-  ///\r
-  /// Address of admin completion queue.\r
-  ///\r
-  Acq = (UINT64)(UINTN)(NVME_ACQ_BASE (Nvme) & ~0xFFF);\r
-\r
-  ///\r
-  /// Address of I/O submission & completion queue.\r
-  ///\r
-  Nvme->SqBuffer[0] = (NVME_SQ *)(UINTN)NVME_ASQ_BASE (Nvme);   // NVME_ADMIN_QUEUE\r
-  Nvme->CqBuffer[0] = (NVME_CQ *)(UINTN)NVME_ACQ_BASE (Nvme);   // NVME_ADMIN_QUEUE\r
-  Nvme->SqBuffer[1] = (NVME_SQ *)(UINTN)NVME_SQ_BASE (Nvme, 0); // NVME_IO_QUEUE\r
-  Nvme->CqBuffer[1] = (NVME_CQ *)(UINTN)NVME_CQ_BASE (Nvme, 0); // NVME_IO_QUEUE\r
-\r
-  DEBUG ((DEBUG_INFO, "Admin Submission Queue Size (Aqa.Asqs) = [%08X]\n", Aqa.Asqs));\r
-  DEBUG ((DEBUG_INFO, "Admin Completion Queue Size (Aqa.Acqs) = [%08X]\n", Aqa.Acqs));\r
-  DEBUG ((DEBUG_INFO, "Admin Submission Queue (SqBuffer[0]) =   [%08X]\n", Nvme->SqBuffer[0]));\r
-  DEBUG ((DEBUG_INFO, "Admin Completion Queue (CqBuffer[0]) =   [%08X]\n", Nvme->CqBuffer[0]));\r
-  DEBUG ((DEBUG_INFO, "I/O   Submission Queue (SqBuffer[1]) =   [%08X]\n", Nvme->SqBuffer[1]));\r
-  DEBUG ((DEBUG_INFO, "I/O   Completion Queue (CqBuffer[1]) =   [%08X]\n", Nvme->CqBuffer[1]));\r
-\r
-  ///\r
-  /// Program admin queue attributes.\r
-  ///\r
-  Status = NVME_SET_AQA (Nvme, &Aqa);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Program admin submission queue address.\r
-  ///\r
-  Status = NVME_SET_ASQ (Nvme, &Asq);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Program admin completion queue address.\r
-  ///\r
-  Status = NVME_SET_ACQ (Nvme, &Acq);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  Status = NvmeEnableController (Nvme);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Create one I/O completion queue.\r
-  ///\r
-  Status = NvmeCreateIoCompletionQueue (Nvme);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Create one I/O Submission queue.\r
-  ///\r
-  Status = NvmeCreateIoSubmissionQueue (Nvme);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Get current Identify Controller Data\r
-  ///\r
-  Nvme->ControllerData = (NVME_ADMIN_CONTROLLER_DATA *)(UINTN) NVME_CONTROL_DATA_BASE (Nvme);\r
-  Status = NvmeIdentifyController (Nvme, Nvme->ControllerData);\r
-  if (EFI_ERROR(Status)) {\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Dump NvmExpress Identify Controller Data\r
-  ///\r
-  Nvme->ControllerData->Sn[19] = 0;\r
-  Nvme->ControllerData->Mn[39] = 0;\r
-  //NvmeDumpIdentifyController (Nvme->ControllerData);\r
-\r
-  ///\r
-  /// Get current Identify Namespace Data\r
-  ///\r
-  Nvme->NamespaceData = (NVME_ADMIN_NAMESPACE_DATA *)NVME_NAMESPACE_DATA_BASE (Nvme);\r
-  Status = NvmeIdentifyNamespace (Nvme, Nvme->Nsid, Nvme->NamespaceData);\r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG ((DEBUG_ERROR, "NvmeIdentifyNamespace fail, Status = %r\n", Status));\r
-    goto Done;\r
-  }\r
-\r
-  ///\r
-  /// Dump NvmExpress Identify Namespace Data\r
-  ///\r
-  if (Nvme->NamespaceData->Ncap == 0) {\r
-    DEBUG ((DEBUG_ERROR, "Invalid Namespace, Ncap: %lx\n", Nvme->NamespaceData->Ncap));\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Done;\r
-  }\r
-\r
-  Nvme->BlockSize = NvmeGetBlockSize (Nvme);\r
-  Nvme->LastBlock = NvmeGetLastLba (Nvme);\r
-\r
-  Nvme->State    = NvmeStatusInit;\r
-\r
-  return EFI_SUCCESS;\r
-\r
-Done:\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Un-initialize the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Controller is un-initialized successfully.\r
-  @retval Others                    - A device error occurred while un-initializing the controller.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeControllerExit (\r
-  IN NVME_CONTEXT       *Nvme\r
-  )\r
-{\r
-  EFI_STATUS            Status;\r
-\r
-  Status = EFI_SUCCESS;\r
-  if (Nvme->State == NvmeStatusInit || Nvme->State == NvmeStatusMax) {\r
-    ///\r
-    /// Destroy I/O Submission queue.\r
-    ///\r
-    Status = NvmeDestroyIoSubmissionQueue (Nvme);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NvmeDestroyIoSubmissionQueue fail, Status = %r\n", Status));\r
-      return Status;\r
-    }\r
-\r
-    ///\r
-    /// Destroy I/O completion queue.\r
-    ///\r
-    Status = NvmeDestroyIoCompletionQueue (Nvme);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NvmeDestroyIoCompletionQueue fail, Status = %r\n", Status));\r
-      return Status;\r
-    }\r
-\r
-    Status = NvmeShutdownController (Nvme);\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_ERROR, "NvmeShutdownController fail, Status: %r\n", Status));\r
-    }\r
-  }\r
-\r
-  ///\r
-  /// Disable PCIE decode\r
-  ///\r
-  PciWrite8  (Nvme->PciBase + NVME_PCIE_PCICMD, 0x0);\r
-  PciWrite32 (Nvme->PciBase + 0x10, 0); // MLBAR (BAR0)\r
-  PciWrite32 (Nvme->PciBase + 0x14, 0); // MUBAR (BAR1)\r
-\r
-  Nvme->State = NvmeStatusUnknown;\r
-  return Status;\r
-}\r
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.h
deleted file mode 100644 (file)
index bd2bd52..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-/** @file\r
-  Header file for NVMe function definitions\r
-\r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef __OPAL_PASSWORD_NVME_MODE_H__\r
-#define __OPAL_PASSWORD_NVME_MODE_H__\r
-\r
-\r
-#include "OpalNvmeReg.h"\r
-\r
-#define NVME_MAX_SECTORS            0x10000\r
-//\r
-// QueueId\r
-//\r
-#define NVME_ADMIN_QUEUE            0x00\r
-#define NVME_IO_QUEUE               0x01\r
-\r
-typedef struct {\r
-  UINT8                             Opcode;\r
-  UINT8                             FusedOperation;\r
-    #define NORMAL_CMD              0x00\r
-    #define FUSED_FIRST_CMD         0x01\r
-    #define FUSED_SECOND_CMD        0x02\r
-  UINT16                            Cid;\r
-} NVME_CDW0;\r
-\r
-typedef struct {\r
-  NVME_CDW0                         Cdw0;\r
-  UINT8                             Flags;\r
-    #define CDW10_VALID             0x01\r
-    #define CDW11_VALID             0x02\r
-    #define CDW12_VALID             0x04\r
-    #define CDW13_VALID             0x08\r
-    #define CDW14_VALID             0x10\r
-    #define CDW15_VALID             0x20\r
-  UINT32                            Nsid;\r
-  UINT32                            Cdw10;\r
-  UINT32                            Cdw11;\r
-  UINT32                            Cdw12;\r
-  UINT32                            Cdw13;\r
-  UINT32                            Cdw14;\r
-  UINT32                            Cdw15;\r
-} NVM_EXPRESS_COMMAND;\r
-\r
-typedef struct {\r
-  UINT32                            Cdw0;\r
-  UINT32                            Cdw1;\r
-  UINT32                            Cdw2;\r
-  UINT32                            Cdw3;\r
-} NVM_EXPRESS_RESPONSE;\r
-\r
-typedef struct {\r
-  UINT64                            CommandTimeout;\r
-  UINT64                            TransferBuffer;\r
-  UINT32                            TransferLength;\r
-  UINT64                            MetadataBuffer;\r
-  UINT32                            MetadataLength;\r
-  UINT8                             QueueId;\r
-  NVM_EXPRESS_COMMAND               *NvmeCmd;\r
-  NVM_EXPRESS_RESPONSE              *NvmeResponse;\r
-} NVM_EXPRESS_PASS_THRU_COMMAND_PACKET;\r
-\r
-\r
-#pragma pack(1)\r
-\r
-// Internal fields\r
-typedef enum {\r
-  NvmeStatusUnknown,\r
-  NvmeStatusInit,\r
-  NvmeStatusInuse,\r
-  NvmeStatusMax,\r
-} NVME_STATUS;\r
-\r
-typedef struct {\r
-  UINT32                            Nbar;\r
-  VOID                              *BaseMem;\r
-  VOID                              *BaseMemMapping;\r
-  BOOLEAN                           PollCancellation;\r
-  UINT16                            NvmeInitWaitTime;\r
-\r
-  NVME_STATUS                       State;\r
-  UINT8                             BusID;\r
-  UINT8                             DeviceID;\r
-  UINT8                             FuncID;\r
-  UINTN                             PciBase;\r
-\r
-  UINT32                            Nsid;\r
-  UINT64                            Nsuuid;\r
-  UINT32                            BlockSize;\r
-  EFI_LBA                           LastBlock;\r
-\r
-  //\r
-  // Pointers to 4kB aligned submission & completion queues.\r
-  //\r
-  NVME_SQ                           *SqBuffer[NVME_MAX_IO_QUEUES];\r
-  NVME_CQ                           *CqBuffer[NVME_MAX_IO_QUEUES];\r
-  UINT16                            Cid[NVME_MAX_IO_QUEUES];\r
-\r
-  //\r
-  // Submission and completion queue indices.\r
-  //\r
-  NVME_SQTDBL                       SqTdbl[NVME_MAX_IO_QUEUES];\r
-  NVME_CQHDBL                       CqHdbl[NVME_MAX_IO_QUEUES];\r
-  UINT8                             Pt[NVME_MAX_IO_QUEUES];\r
-\r
-  UINTN                             SqeCount[NVME_MAX_IO_QUEUES];\r
-\r
-  //\r
-  // Nvme controller capabilities\r
-  //\r
-  NVME_CAP                          Cap;\r
-\r
-  //\r
-  // pointer to identify controller Data\r
-  //\r
-  NVME_ADMIN_CONTROLLER_DATA        *ControllerData;\r
-  NVME_ADMIN_NAMESPACE_DATA         *NamespaceData;\r
-} NVME_CONTEXT;\r
-\r
-#pragma pack()\r
-\r
-/**\r
-  Transfer MMIO Data to memory.\r
-\r
-  @param[in,out] MemBuffer - Destination: Memory address\r
-  @param[in] MmioAddr      - Source: MMIO address\r
-  @param[in] Size          - Size for read\r
-\r
-  @retval EFI_SUCCESS - MMIO read sucessfully\r
-**/\r
-EFI_STATUS\r
-NvmeMmioRead (\r
-  IN OUT VOID *MemBuffer,\r
-  IN     UINTN MmioAddr,\r
-  IN     UINTN Size\r
-  );\r
-\r
-/**\r
-  Transfer memory Data to MMIO.\r
-\r
-  @param[in,out] MmioAddr - Destination: MMIO address\r
-  @param[in] MemBuffer    - Source: Memory address\r
-  @param[in] Size         - Size for write\r
-\r
-  @retval EFI_SUCCESS - MMIO write sucessfully\r
-**/\r
-EFI_STATUS\r
-NvmeMmioWrite (\r
-  IN OUT UINTN MmioAddr,\r
-  IN     VOID *MemBuffer,\r
-  IN     UINTN Size\r
-  );\r
-\r
-/**\r
-  Transfer memory data to MMIO.\r
-\r
-  @param[in,out] MmioAddr - Destination: MMIO address\r
-  @param[in] MemBuffer    - Source: Memory address\r
-  @param[in] Size         - Size for write\r
-\r
-  @retval EFI_SUCCESS - MMIO write sucessfully\r
-**/\r
-EFI_STATUS\r
-OpalPciWrite (\r
-  IN OUT UINTN MmioAddr,\r
-  IN     VOID *MemBuffer,\r
-  IN     UINTN Size\r
-  );\r
-\r
-/**\r
-  Transfer MMIO data to memory.\r
-\r
-  @param[in,out] MemBuffer - Destination: Memory address\r
-  @param[in] MmioAddr      - Source: MMIO address\r
-  @param[in] Size          - Size for read\r
-\r
-  @retval EFI_SUCCESS - MMIO read sucessfully\r
-**/\r
-EFI_STATUS\r
-OpalPciRead (\r
-  IN OUT VOID *MemBuffer,\r
-  IN     UINTN MmioAddr,\r
-  IN     UINTN Size\r
-  );\r
-\r
-/**\r
-  Allocate transfer-related Data struct which is used at Nvme.\r
-\r
-  @param[in, out] Nvme          The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_OUT_OF_RESOURCE   No enough resource.\r
-  @retval EFI_SUCCESS           Successful to allocate resource.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NvmeAllocateResource (\r
-  IN OUT NVME_CONTEXT       *Nvme\r
-  );\r
-\r
-/**\r
-  Free allocated transfer-related Data struct which is used at NVMe.\r
-\r
-  @param[in, out] Nvme          The pointer to the NVME_CONTEXT Data structure.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-NvmeFreeResource (\r
-  IN OUT NVME_CONTEXT       *Nvme\r
-  );\r
-\r
-/**\r
-  Sends an NVM Express Command Packet to an NVM Express controller or namespace. This function supports\r
-  both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the nonblocking\r
-  I/O functionality is optional.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] NamespaceId            - Is a 32 bit Namespace ID to which the Express HCI command packet will be sent.\r
-                                      A Value of 0 denotes the NVM Express controller, a Value of all 0FFh in the namespace\r
-                                      ID specifies that the command packet should be sent to all valid namespaces.\r
-  @param[in] NamespaceUuid          - Is a 64 bit Namespace UUID to which the Express HCI command packet will be sent.\r
-                                      A Value of 0 denotes the NVM Express controller, a Value of all 0FFh in the namespace\r
-                                      UUID specifies that the command packet should be sent to all valid namespaces.\r
-  @param[in,out] Packet             - A pointer to the NVM Express HCI Command Packet to send to the NVMe namespace specified\r
-                                      by NamespaceId.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Command Packet was sent by the host. TransferLength bytes were transferred\r
-                                      to, or from DataBuffer.\r
-  @retval EFI_NOT_READY             - The NVM Express Command Packet could not be sent because the controller is not ready. The caller\r
-                                      may retry again later.\r
-  @retval EFI_DEVICE_ERROR          - A device error occurred while attempting to send the NVM Express Command Packet.\r
-  @retval EFI_INVALID_PARAMETER     - Namespace, or the contents of NVM_EXPRESS_PASS_THRU_COMMAND_PACKET are invalid. The NVM\r
-                                      Express Command Packet was not sent, so no additional status information is available.\r
-  @retval EFI_UNSUPPORTED           - The command described by the NVM Express Command Packet is not supported by the host adapter.\r
-                                      The NVM Express Command Packet was not sent, so no additional status information is available.\r
-  @retval EFI_TIMEOUT               - A timeout occurred while waiting for the NVM Express Command Packet to execute.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmePassThru (\r
-  IN     NVME_CONTEXT                         *Nvme,\r
-  IN     UINT32                               NamespaceId,\r
-  IN     UINT64                               NamespaceUuid,\r
-  IN OUT NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet\r
-  );\r
-\r
-/**\r
-  Waits until all NVME commands completed.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in] Qid                    - Queue index\r
-\r
-  @retval EFI_SUCCESS               - All NVME commands have completed\r
-  @retval EFI_TIMEOUT               - Timeout occured\r
-  @retval EFI_NOT_READY             - Not all NVME commands have completed\r
-  @retval others                    - Error occurred on device side.\r
-**/\r
-EFI_STATUS\r
-NvmeWaitAllComplete (\r
-  IN NVME_CONTEXT       *Nvme,\r
-  IN UINT8              Qid\r
-  );\r
-\r
-/**\r
-  Initialize the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Controller is initialized successfully.\r
-  @retval Others                    - A device error occurred while initializing the controller.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeControllerInit (\r
-  IN NVME_CONTEXT       *Nvme\r
-  );\r
-\r
-/**\r
-  Un-initialize the Nvm Express controller.\r
-\r
-  @param[in] Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-\r
-  @retval EFI_SUCCESS               - The NVM Express Controller is un-initialized successfully.\r
-  @retval Others                    - A device error occurred while un-initializing the controller.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeControllerExit (\r
-  IN NVME_CONTEXT       *Nvme\r
-  );\r
-\r
-/**\r
-  Security send and receive commands.\r
-\r
-  @param[in]     Nvme                   - The pointer to the NVME_CONTEXT Data structure.\r
-  @param[in]     SendCommand            - The flag to indicate the command type, TRUE for Send command and FALSE for receive command\r
-  @param[in]     SecurityProtocol       - Security Protocol\r
-  @param[in]     SpSpecific             - Security Protocol Specific\r
-  @param[in]     TransferLength         - Transfer Length of Buffer (in bytes) - always a multiple of 512\r
-  @param[in,out] TransferBuffer         - Address of Data to transfer\r
-\r
-  @return EFI_SUCCESS               - Successfully create io submission queue.\r
-  @return others                    - Fail to send/receive commands.\r
-\r
-**/\r
-EFI_STATUS\r
-NvmeSecuritySendReceive (\r
-  IN NVME_CONTEXT                          *Nvme,\r
-  IN BOOLEAN                               SendCommand,\r
-  IN UINT8                                 SecurityProtocol,\r
-  IN UINT16                                SpSpecific,\r
-  IN UINTN                                 TransferLength,\r
-  IN OUT VOID                              *TransferBuffer\r
-  );\r
-\r
-#endif\r
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeReg.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeReg.h
deleted file mode 100644 (file)
index 03376b9..0000000
+++ /dev/null
@@ -1,815 +0,0 @@
-/** @file\r
-  Header file for Registers and Structure definitions\r
-\r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-#ifndef __OPAL_PASSWORD_NVME_REG_H__\r
-#define __OPAL_PASSWORD_NVME_REG_H__\r
-\r
-//\r
-// PCI Header for PCIe root port configuration\r
-//\r
-#define NVME_PCIE_PCICMD                         0x04\r
-#define NVME_PCIE_BNUM                           0x18\r
-#define NVME_PCIE_SEC_BNUM                       0x19\r
-#define NVME_PCIE_IOBL                           0x1C\r
-#define NVME_PCIE_MBL                            0x20\r
-#define NVME_PCIE_PMBL                           0x24\r
-#define NVME_PCIE_PMBU32                         0x28\r
-#define NVME_PCIE_PMLU32                         0x2C\r
-#define NVME_PCIE_INTR                           0x3C\r
-\r
-//\r
-// NVMe related definitions\r
-//\r
-#define PCI_CLASS_MASS_STORAGE_NVM                0x08  // mass storage sub-class non-volatile memory.\r
-#define PCI_IF_NVMHCI                             0x02  // mass storage programming interface NVMHCI.\r
-\r
-#define NVME_ASQ_SIZE                                    1     // Number of admin submission queue entries, which is 0-based\r
-#define NVME_ACQ_SIZE                                    1     // Number of admin completion queue entries, which is 0-based\r
-\r
-#define NVME_CSQ_SIZE                                    63     // Number of I/O submission queue entries, which is 0-based\r
-#define NVME_CCQ_SIZE                                    63     // Number of I/O completion queue entries, which is 0-based\r
-\r
-#define NVME_MAX_IO_QUEUES                               2     // Number of I/O queues supported by the driver, 1 for AQ, 1 for CQ\r
-\r
-#define NVME_CSQ_DEPTH                                   (NVME_CSQ_SIZE+1)\r
-#define NVME_CCQ_DEPTH                                   (NVME_CCQ_SIZE+1)\r
-#define NVME_PRP_SIZE                                    (4)    // Pages of PRP list\r
-\r
-#define NVME_CONTROLLER_ID                               0\r
-\r
-//\r
-// Time out Value for Nvme transaction execution\r
-//\r
-#define NVME_GENERIC_TIMEOUT                             5000000   ///< us\r
-#define NVME_CMD_WAIT                                    100       ///< us\r
-#define NVME_CMD_TIMEOUT                                 20000000  ///< us\r
-\r
-\r
-\r
-#define NVME_MEM_MAX_SIZE \\r
-  (( \\r
-  1                                         /* Controller Data */ +  \\r
-  1                                         /* Identify Data */   +  \\r
-  1                                         /* ASQ */             +  \\r
-  1                                         /* ACQ */             +  \\r
-  1                                         /* SQs */             +  \\r
-  1                                         /* CQs */             +  \\r
-  NVME_PRP_SIZE * NVME_CSQ_DEPTH            /* PRPs */            +  \\r
-  1                                         /* SECURITY */           \\r
-  ) * EFI_PAGE_SIZE)\r
-\r
-\r
-//\r
-// controller register offsets\r
-//\r
-#define NVME_CAP_OFFSET          0x0000  // Controller Capabilities\r
-#define NVME_VER_OFFSET          0x0008  // Version\r
-#define NVME_INTMS_OFFSET        0x000c  // Interrupt Mask Set\r
-#define NVME_INTMC_OFFSET        0x0010  // Interrupt Mask Clear\r
-#define NVME_CC_OFFSET           0x0014  // Controller Configuration\r
-#define NVME_CSTS_OFFSET         0x001c  // Controller Status\r
-#define NVME_AQA_OFFSET          0x0024  // Admin Queue Attributes\r
-#define NVME_ASQ_OFFSET          0x0028  // Admin Submission Queue Base Address\r
-#define NVME_ACQ_OFFSET          0x0030  // Admin Completion Queue Base Address\r
-#define NVME_SQ0_OFFSET          0x1000  // Submission Queue 0 (admin) Tail Doorbell\r
-#define NVME_CQ0_OFFSET          0x1004  // Completion Queue 0 (admin) Head Doorbell\r
-\r
-//\r
-// These register offsets are defined as 0x1000 + (N * (4 << CAP.DSTRD))\r
-// Get the doorbell stride bit shift Value from the controller capabilities.\r
-//\r
-#define NVME_SQTDBL_OFFSET(QID, DSTRD)    0x1000 + ((2 * (QID)) * (4 << (DSTRD)))       // Submission Queue y (NVM) Tail Doorbell\r
-#define NVME_CQHDBL_OFFSET(QID, DSTRD)    0x1000 + (((2 * (QID)) + 1) * (4 << (DSTRD))) // Completion Queue y (NVM) Head Doorbell\r
-\r
-\r
-#pragma pack(1)\r
-\r
-//\r
-// 3.1.1 Offset 00h: CAP - Controller Capabilities\r
-//\r
-typedef struct {\r
-  UINT16 Mqes;      // Maximum Queue Entries Supported\r
-  UINT8  Cqr:1;     // Contiguous Queues Required\r
-  UINT8  Ams:2;     // Arbitration Mechanism Supported\r
-  UINT8  Rsvd1:5;\r
-  UINT8  To;        // Timeout\r
-  UINT16 Dstrd:4;\r
-  UINT16 Rsvd2:1;\r
-  UINT16 Css:4;     // Command Sets Supported\r
-  UINT16 Rsvd3:7;\r
-  UINT8  Mpsmin:4;\r
-  UINT8  Mpsmax:4;\r
-  UINT8  Rsvd4;\r
-} NVME_CAP;\r
-\r
-//\r
-// 3.1.2 Offset 08h: VS - Version\r
-//\r
-typedef struct {\r
-  UINT16 Mnr;       // Minor version number\r
-  UINT16 Mjr;       // Major version number\r
-} NVME_VER;\r
-\r
-//\r
-// 3.1.5 Offset 14h: CC - Controller Configuration\r
-//\r
-typedef struct {\r
-  UINT16 En:1;       // Enable\r
-  UINT16 Rsvd1:3;\r
-  UINT16 Css:3;      // Command Set Selected\r
-  UINT16 Mps:4;      // Memory Page Size\r
-  UINT16 Ams:3;      // Arbitration Mechanism Selected\r
-  UINT16 Shn:2;      // Shutdown Notification\r
-  UINT8  Iosqes:4;   // I/O Submission Queue Entry Size\r
-  UINT8  Iocqes:4;   // I/O Completion Queue Entry Size\r
-  UINT8  Rsvd2;\r
-} NVME_CC;\r
-\r
-//\r
-// 3.1.6 Offset 1Ch: CSTS - Controller Status\r
-//\r
-typedef struct {\r
-  UINT32 Rdy:1;      // Ready\r
-  UINT32 Cfs:1;      // Controller Fatal Status\r
-  UINT32 Shst:2;     // Shutdown Status\r
-  UINT32 Nssro:1;    // NVM Subsystem Reset Occurred\r
-  UINT32 Rsvd1:27;\r
-} NVME_CSTS;\r
-\r
-//\r
-// 3.1.8 Offset 24h: AQA - Admin Queue Attributes\r
-//\r
-typedef struct {\r
-  UINT16 Asqs:12;    // Submission Queue Size\r
-  UINT16 Rsvd1:4;\r
-  UINT16 Acqs:12;    // Completion Queue Size\r
-  UINT16 Rsvd2:4;\r
-} NVME_AQA;\r
-\r
-//\r
-// 3.1.9 Offset 28h: ASQ - Admin Submission Queue Base Address\r
-//\r
-#define NVME_ASQ      UINT64\r
-\r
-//\r
-// 3.1.10 Offset 30h: ACQ - Admin Completion Queue Base Address\r
-//\r
-#define NVME_ACQ      UINT64\r
-\r
-//\r
-// 3.1.11 Offset (1000h + ((2y) * (4 << CAP.DSTRD))): SQyTDBL - Submission Queue y Tail Doorbell\r
-//\r
-typedef struct {\r
-  UINT16 Sqt;\r
-  UINT16 Rsvd1;\r
-} NVME_SQTDBL;\r
-\r
-//\r
-// 3.1.12 Offset (1000h + ((2y + 1) * (4 << CAP.DSTRD))): CQyHDBL - Completion Queue y Head Doorbell\r
-//\r
-typedef struct {\r
-  UINT16 Cqh;\r
-  UINT16 Rsvd1;\r
-} NVME_CQHDBL;\r
-\r
-//\r
-// NVM command set structures\r
-//\r
-// Read Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10, 11\r
-  //\r
-  UINT64 Slba;                /* Starting Sector Address */\r
-  //\r
-  // CDW 12\r
-  //\r
-  UINT16 Nlb;                 /* Number of Sectors */\r
-  UINT16 Rsvd1:10;\r
-  UINT16 Prinfo:4;            /* Protection Info Check */\r
-  UINT16 Fua:1;               /* Force Unit Access */\r
-  UINT16 Lr:1;                /* Limited Retry */\r
-  //\r
-  // CDW 13\r
-  //\r
-  UINT32 Af:4;                /* Access Frequency */\r
-  UINT32 Al:2;                /* Access Latency */\r
-  UINT32 Sr:1;                /* Sequential Request */\r
-  UINT32 In:1;                /* Incompressible */\r
-  UINT32 Rsvd2:24;\r
-  //\r
-  // CDW 14\r
-  //\r
-  UINT32 Eilbrt;              /* Expected Initial Logical Block Reference Tag */\r
-  //\r
-  // CDW 15\r
-  //\r
-  UINT16 Elbat;               /* Expected Logical Block Application Tag */\r
-  UINT16 Elbatm;              /* Expected Logical Block Application Tag Mask */\r
-} NVME_READ;\r
-\r
-//\r
-// Write Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10, 11\r
-  //\r
-  UINT64 Slba;                /* Starting Sector Address */\r
-  //\r
-  // CDW 12\r
-  //\r
-  UINT16 Nlb;                 /* Number of Sectors */\r
-  UINT16 Rsvd1:10;\r
-  UINT16 Prinfo:4;            /* Protection Info Check */\r
-  UINT16 Fua:1;               /* Force Unit Access */\r
-  UINT16 Lr:1;                /* Limited Retry */\r
-  //\r
-  // CDW 13\r
-  //\r
-  UINT32 Af:4;                /* Access Frequency */\r
-  UINT32 Al:2;                /* Access Latency */\r
-  UINT32 Sr:1;                /* Sequential Request */\r
-  UINT32 In:1;                /* Incompressible */\r
-  UINT32 Rsvd2:24;\r
-  //\r
-  // CDW 14\r
-  //\r
-  UINT32 Ilbrt;               /* Initial Logical Block Reference Tag */\r
-  //\r
-  // CDW 15\r
-  //\r
-  UINT16 Lbat;                /* Logical Block Application Tag */\r
-  UINT16 Lbatm;               /* Logical Block Application Tag Mask */\r
-} NVME_WRITE;\r
-\r
-//\r
-// Flush\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Flush;               /* Flush */\r
-} NVME_FLUSH;\r
-\r
-//\r
-// Write Uncorrectable command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10, 11\r
-  //\r
-  UINT64 Slba;                /* Starting LBA */\r
-  //\r
-  // CDW 12\r
-  //\r
-  UINT32 Nlb:16;              /* Number of  Logical Blocks */\r
-  UINT32 Rsvd1:16;\r
-} NVME_WRITE_UNCORRECTABLE;\r
-\r
-//\r
-// Write Zeroes command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10, 11\r
-  //\r
-  UINT64 Slba;                /* Starting LBA */\r
-  //\r
-  // CDW 12\r
-  //\r
-  UINT16 Nlb;                 /* Number of Logical Blocks */\r
-  UINT16 Rsvd1:10;\r
-  UINT16 Prinfo:4;            /* Protection Info Check */\r
-  UINT16 Fua:1;               /* Force Unit Access */\r
-  UINT16 Lr:1;                /* Limited Retry */\r
-  //\r
-  // CDW 13\r
-  //\r
-  UINT32 Rsvd2;\r
-  //\r
-  // CDW 14\r
-  //\r
-  UINT32 Ilbrt;               /* Initial Logical Block Reference Tag */\r
-  //\r
-  // CDW 15\r
-  //\r
-  UINT16 Lbat;                /* Logical Block Application Tag */\r
-  UINT16 Lbatm;               /* Logical Block Application Tag Mask */\r
-} NVME_WRITE_ZEROES;\r
-\r
-//\r
-// Compare command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10, 11\r
-  //\r
-  UINT64 Slba;                /* Starting LBA */\r
-  //\r
-  // CDW 12\r
-  //\r
-  UINT16 Nlb;                 /* Number of Logical Blocks */\r
-  UINT16 Rsvd1:10;\r
-  UINT16 Prinfo:4;            /* Protection Info Check */\r
-  UINT16 Fua:1;               /* Force Unit Access */\r
-  UINT16 Lr:1;                /* Limited Retry */\r
-  //\r
-  // CDW 13\r
-  //\r
-  UINT32 Rsvd2;\r
-  //\r
-  // CDW 14\r
-  //\r
-  UINT32 Eilbrt;              /* Expected Initial Logical Block Reference Tag */\r
-  //\r
-  // CDW 15\r
-  //\r
-  UINT16 Elbat;               /* Expected Logical Block Application Tag */\r
-  UINT16 Elbatm;              /* Expected Logical Block Application Tag Mask */\r
-} NVME_COMPARE;\r
-\r
-typedef union {\r
-  NVME_READ                   Read;\r
-  NVME_WRITE                  Write;\r
-  NVME_FLUSH                  Flush;\r
-  NVME_WRITE_UNCORRECTABLE    WriteUncorrectable;\r
-  NVME_WRITE_ZEROES           WriteZeros;\r
-  NVME_COMPARE                Compare;\r
-} NVME_CMD;\r
-\r
-typedef struct {\r
-  UINT16 Mp;                /* Maximum Power */\r
-  UINT8  Rsvd1;             /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8  Mps:1;             /* Max Power Scale */\r
-  UINT8  Nops:1;            /* Non-Operational State */\r
-  UINT8  Rsvd2:6;           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT32 Enlat;             /* Entry Latency */\r
-  UINT32 Exlat;             /* Exit Latency */\r
-  UINT8  Rrt:5;             /* Relative Read Throughput */\r
-  UINT8  Rsvd3:3;           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8  Rrl:5;             /* Relative Read Leatency */\r
-  UINT8  Rsvd4:3;           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8  Rwt:5;             /* Relative Write Throughput */\r
-  UINT8  Rsvd5:3;           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8  Rwl:5;             /* Relative Write Leatency */\r
-  UINT8  Rsvd6:3;           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8  Rsvd7[16];         /* Reserved as of Nvm Express 1.1 Spec */\r
-} NVME_PSDESCRIPTOR;\r
-\r
-//\r
-//  Identify Controller Data\r
-//\r
-typedef struct {\r
-  //\r
-  // Controller Capabilities and Features 0-255\r
-  //\r
-  UINT16 Vid;                 /* PCI Vendor ID */\r
-  UINT16 Ssvid;               /* PCI sub-system vendor ID */\r
-  UINT8  Sn[20];              /* Produce serial number */\r
-\r
-  UINT8  Mn[40];              /* Proeduct model number */\r
-  UINT8  Fr[8];               /* Firmware Revision */\r
-  UINT8  Rab;                 /* Recommended Arbitration Burst */\r
-  UINT8  Ieee_oiu[3];         /* Organization Unique Identifier */\r
-  UINT8  Cmic;                /* Multi-interface Capabilities */\r
-  UINT8  Mdts;                /* Maximum Data Transfer Size */\r
-  UINT8  Cntlid[2];           /* Controller ID */\r
-  UINT8  Rsvd1[176];          /* Reserved as of Nvm Express 1.1 Spec */\r
-  //\r
-  // Admin Command Set Attributes\r
-  //\r
-  UINT16 Oacs;                /* Optional Admin Command Support */\r
-  UINT8  Acl;                 /* Abort Command Limit */\r
-  UINT8  Aerl;                /* Async Event Request Limit */\r
-  UINT8  Frmw;                /* Firmware updates */\r
-  UINT8  Lpa;                 /* Log Page Attributes */\r
-  UINT8  Elpe;                /* Error Log Page Entries */\r
-  UINT8  Npss;                /* Number of Power States Support */\r
-  UINT8  Avscc;               /* Admin Vendor Specific Command Configuration */\r
-  UINT8  Apsta;               /* Autonomous Power State Transition Attributes */\r
-  UINT8  Rsvd2[246];          /* Reserved as of Nvm Express 1.1 Spec */\r
-  //\r
-  // NVM Command Set Attributes\r
-  //\r
-  UINT8  Sqes;                /* Submission Queue Entry Size */\r
-  UINT8  Cqes;                /* Completion Queue Entry Size */\r
-  UINT16 Rsvd3;               /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT32 Nn;                  /* Number of Namespaces */\r
-  UINT16 Oncs;                /* Optional NVM Command Support */\r
-  UINT16 Fuses;               /* Fused Operation Support */\r
-  UINT8  Fna;                 /* Format NVM Attributes */\r
-  UINT8  Vwc;                 /* Volatile Write Cache */\r
-  UINT16 Awun;                /* Atomic Write Unit Normal */\r
-  UINT16 Awupf;               /* Atomic Write Unit Power Fail */\r
-  UINT8  Nvscc;               /* NVM Vendor Specific Command Configuration */\r
-  UINT8  Rsvd4;               /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT16 Acwu;                /* Atomic Compare & Write Unit */\r
-  UINT16 Rsvd5;               /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT32 Sgls;                /* SGL Support  */\r
-  UINT8  Rsvd6[164];          /* Reserved as of Nvm Express 1.1 Spec */\r
-  //\r
-  // I/O Command set Attributes\r
-  //\r
-  UINT8 Rsvd7[1344];          /* Reserved as of Nvm Express 1.1 Spec */\r
-  //\r
-  // Power State Descriptors\r
-  //\r
-  NVME_PSDESCRIPTOR PsDescriptor[32];\r
-\r
-  UINT8  VendorData[1024];    /* Vendor specific Data */\r
-} NVME_ADMIN_CONTROLLER_DATA;\r
-\r
-typedef struct {\r
-  UINT16        Security  : 1;    /* supports security send/receive commands */\r
-  UINT16        Format    : 1;    /* supports format nvm command */\r
-  UINT16        Firmware  : 1;    /* supports firmware activate/download commands */\r
-  UINT16        Oacs_rsvd : 13;\r
- } OACS; // optional admin command support: NVME_ADMIN_CONTROLLER_DATA.Oacs\r
-\r
-typedef struct {\r
-  UINT16 Ms;                /* Metadata Size */\r
-  UINT8  Lbads;             /* LBA Data Size */\r
-  UINT8  Rp:2;              /* Relative Performance */\r
-    #define LBAF_RP_BEST      00b\r
-    #define LBAF_RP_BETTER    01b\r
-    #define LBAF_RP_GOOD      10b\r
-    #define LBAF_RP_DEGRADED  11b\r
-  UINT8  Rsvd1:6;           /* Reserved as of Nvm Express 1.1 Spec */\r
-} NVME_LBAFORMAT;\r
-\r
-//\r
-// Identify Namespace Data\r
-//\r
-typedef struct {\r
-  //\r
-  // NVM Command Set Specific\r
-  //\r
-  UINT64 Nsze;                /* Namespace Size (total number of blocks in formatted namespace) */\r
-  UINT64 Ncap;                /* Namespace Capacity (max number of logical blocks) */\r
-  UINT64 Nuse;                /* Namespace Utilization */\r
-  UINT8  Nsfeat;              /* Namespace Features */\r
-  UINT8  Nlbaf;               /* Number of LBA Formats */\r
-  UINT8  Flbas;               /* Formatted LBA Size */\r
-  UINT8  Mc;                  /* Metadata Capabilities */\r
-  UINT8  Dpc;                 /* End-to-end Data Protection capabilities */\r
-  UINT8  Dps;                 /* End-to-end Data Protection Type Settings */\r
-  UINT8  Nmic;                /* Namespace Multi-path I/O and Namespace Sharing Capabilities */\r
-  UINT8  Rescap;              /* Reservation Capabilities */\r
-  UINT8  Rsvd1[88];           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT64 Eui64;               /* IEEE Extended Unique Identifier */\r
-  //\r
-  // LBA Format\r
-  //\r
-  NVME_LBAFORMAT LbaFormat[16];\r
-\r
-  UINT8 Rsvd2[192];           /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT8 VendorData[3712];     /* Vendor specific Data */\r
-} NVME_ADMIN_NAMESPACE_DATA;\r
-\r
-//\r
-// NvmExpress Admin Identify Cmd\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Cns:2;\r
-  UINT32 Rsvd1:30;\r
-} NVME_ADMIN_IDENTIFY;\r
-\r
-//\r
-// NvmExpress Admin Create I/O Completion Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Qid:16;              /* Queue Identifier */\r
-  UINT32 Qsize:16;            /* Queue Size */\r
-\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Pc:1;                /* Physically Contiguous */\r
-  UINT32 Ien:1;               /* Interrupts Enabled */\r
-  UINT32 Rsvd1:14;            /* reserved as of Nvm Express 1.1 Spec */\r
-  UINT32 Iv:16;               /* Interrupt Vector */\r
-} NVME_ADMIN_CRIOCQ;\r
-\r
-//\r
-// NvmExpress Admin Create I/O Submission Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Qid:16;              /* Queue Identifier */\r
-  UINT32 Qsize:16;            /* Queue Size */\r
-\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Pc:1;                /* Physically Contiguous */\r
-  UINT32 Qprio:2;             /* Queue Priority */\r
-  UINT32 Rsvd1:13;            /* Reserved as of Nvm Express 1.1 Spec */\r
-  UINT32 Cqid:16;             /* Completion Queue ID */\r
-} NVME_ADMIN_CRIOSQ;\r
-\r
-//\r
-// NvmExpress Admin Delete I/O Completion Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT16 Qid;\r
-  UINT16 Rsvd1;\r
-} NVME_ADMIN_DEIOCQ;\r
-\r
-//\r
-// NvmExpress Admin Delete I/O Submission Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT16 Qid;\r
-  UINT16 Rsvd1;\r
-} NVME_ADMIN_DEIOSQ;\r
-\r
-//\r
-// NvmExpress Admin Security Send\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Resv:8;              /* Reserve */\r
-  UINT32 Spsp:16;             /* SP Specific */\r
-  UINT32 Secp:8;              /* Security Protocol */\r
-\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Tl;                  /* Transfer Length */\r
-} NVME_ADMIN_SECSEND;\r
-\r
-//\r
-// NvmExpress Admin Abort Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Sqid:16;             /* Submission Queue identifier */\r
-  UINT32 Cid:16;              /* Command Identifier */\r
-} NVME_ADMIN_ABORT;\r
-\r
-//\r
-// NvmExpress Admin Firmware Activate Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Fs:3;                /* Submission Queue identifier */\r
-  UINT32 Aa:2;                /* Command Identifier */\r
-  UINT32 Rsvd1:27;\r
-} NVME_ADMIN_FIRMWARE_ACTIVATE;\r
-\r
-//\r
-// NvmExpress Admin Firmware Image Download Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Numd;                /* Number of Dwords */\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Ofst;                /* Offset */\r
-} NVME_ADMIN_FIRMWARE_IMAGE_DOWNLOAD;\r
-\r
-//\r
-// NvmExpress Admin Get Features Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Fid:8;                /* Feature Identifier */\r
-  UINT32 Sel:3;                /* Select */\r
-  UINT32 Rsvd1:21;\r
-} NVME_ADMIN_GET_FEATURES;\r
-\r
-//\r
-// NvmExpress Admin Get Log Page Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Lid:8;               /* Log Page Identifier */\r
-    #define LID_ERROR_INFO\r
-    #define LID_SMART_INFO\r
-    #define LID_FW_SLOT_INFO\r
-  UINT32 Rsvd1:8;\r
-  UINT32 Numd:12;             /* Number of Dwords */\r
-  UINT32 Rsvd2:4;             /* Reserved as of Nvm Express 1.1 Spec */\r
-} NVME_ADMIN_GET_LOG_PAGE;\r
-\r
-//\r
-// NvmExpress Admin Set Features Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Fid:8;               /* Feature Identifier */\r
-  UINT32 Rsvd1:23;\r
-  UINT32 Sv:1;                /* Save */\r
-} NVME_ADMIN_SET_FEATURES;\r
-\r
-//\r
-// NvmExpress Admin Format NVM Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Lbaf:4;              /* LBA Format */\r
-  UINT32 Ms:1;                /* Metadata Settings */\r
-  UINT32 Pi:3;                /* Protection Information */\r
-  UINT32 Pil:1;               /* Protection Information Location */\r
-  UINT32 Ses:3;               /* Secure Erase Settings */\r
-  UINT32 Rsvd1:20;\r
-} NVME_ADMIN_FORMAT_NVM;\r
-\r
-//\r
-// NvmExpress Admin Security Receive Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Rsvd1:8;\r
-  UINT32 Spsp:16;             /* SP Specific */\r
-  UINT32 Secp:8;              /* Security Protocol */\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Al;                  /* Allocation Length */\r
-} NVME_ADMIN_SECURITY_RECEIVE;\r
-\r
-//\r
-// NvmExpress Admin Security Send Command\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 10\r
-  //\r
-  UINT32 Rsvd1:8;\r
-  UINT32 Spsp:16;             /* SP Specific */\r
-  UINT32 Secp:8;              /* Security Protocol */\r
-  //\r
-  // CDW 11\r
-  //\r
-  UINT32 Tl;                  /* Transfer Length */\r
-} NVME_ADMIN_SECURITY_SEND;\r
-\r
-typedef union {\r
-  NVME_ADMIN_IDENTIFY                   Identify;\r
-  NVME_ADMIN_CRIOCQ                     CrIoCq;\r
-  NVME_ADMIN_CRIOSQ                     CrIoSq;\r
-  NVME_ADMIN_DEIOCQ                     DeIoCq;\r
-  NVME_ADMIN_DEIOSQ                     DeIoSq;\r
-  NVME_ADMIN_ABORT                      Abort;\r
-  NVME_ADMIN_FIRMWARE_ACTIVATE          Activate;\r
-  NVME_ADMIN_FIRMWARE_IMAGE_DOWNLOAD    FirmwareImageDownload;\r
-  NVME_ADMIN_GET_FEATURES               GetFeatures;\r
-  NVME_ADMIN_GET_LOG_PAGE               GetLogPage;\r
-  NVME_ADMIN_SET_FEATURES               SetFeatures;\r
-  NVME_ADMIN_FORMAT_NVM                 FormatNvm;\r
-  NVME_ADMIN_SECURITY_RECEIVE           SecurityReceive;\r
-  NVME_ADMIN_SECURITY_SEND              SecuritySend;\r
-} NVME_ADMIN_CMD;\r
-\r
-typedef struct {\r
-  UINT32 Cdw10;\r
-  UINT32 Cdw11;\r
-  UINT32 Cdw12;\r
-  UINT32 Cdw13;\r
-  UINT32 Cdw14;\r
-  UINT32 Cdw15;\r
-} NVME_RAW;\r
-\r
-typedef union {\r
-  NVME_ADMIN_CMD Admin;   // Union of Admin commands\r
-  NVME_CMD       Nvm;     // Union of Nvm commands\r
-  NVME_RAW       Raw;\r
-} NVME_PAYLOAD;\r
-\r
-//\r
-// Submission Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 0, Common to all comnmands\r
-  //\r
-  UINT8  Opc;               // Opcode\r
-  UINT8  Fuse:2;            // Fused Operation\r
-  UINT8  Rsvd1:5;\r
-  UINT8  Psdt:1;            // PRP or SGL for Data Transfer\r
-  UINT16 Cid;               // Command Identifier\r
-\r
-  //\r
-  // CDW 1\r
-  //\r
-  UINT32 Nsid;              // Namespace Identifier\r
-\r
-  //\r
-  // CDW 2,3\r
-  //\r
-  UINT64 Rsvd2;\r
-\r
-  //\r
-  // CDW 4,5\r
-  //\r
-  UINT64 Mptr;              // Metadata Pointer\r
-\r
-  //\r
-  // CDW 6-9\r
-  //\r
-  UINT64 Prp[2];            // First and second PRP entries\r
-\r
-  NVME_PAYLOAD Payload;\r
-\r
-} NVME_SQ;\r
-\r
-//\r
-// Completion Queue\r
-//\r
-typedef struct {\r
-  //\r
-  // CDW 0\r
-  //\r
-  UINT32 Dword0;\r
-  //\r
-  // CDW 1\r
-  //\r
-  UINT32 Rsvd1;\r
-  //\r
-  // CDW 2\r
-  //\r
-  UINT16 Sqhd;              // Submission Queue Head Pointer\r
-  UINT16 Sqid;              // Submission Queue Identifier\r
-  //\r
-  // CDW 3\r
-  //\r
-  UINT16 Cid;               // Command Identifier\r
-  UINT16 Pt:1;              // Phase Tag\r
-  UINT16 Sc:8;              // Status Code\r
-  UINT16 Sct:3;             // Status Code Type\r
-  UINT16 Rsvd2:2;\r
-  UINT16 Mo:1;              // More\r
-  UINT16 Dnr:1;             // Retry\r
-} NVME_CQ;\r
-\r
-//\r
-// Nvm Express Admin cmd opcodes\r
-//\r
-#define NVME_ADMIN_DELIOSQ_OPC               0\r
-#define NVME_ADMIN_CRIOSQ_OPC                1\r
-#define NVME_ADMIN_DELIOCQ_OPC               4\r
-#define NVME_ADMIN_CRIOCQ_OPC                5\r
-#define NVME_ADMIN_IDENTIFY_OPC              6\r
-#define NVME_ADMIN_SECURITY_SEND_OPC         0x81\r
-#define NVME_ADMIN_SECURITY_RECV_OPC         0x82\r
-\r
-#define NVME_IO_FLUSH_OPC                    0\r
-#define NVME_IO_WRITE_OPC                    1\r
-#define NVME_IO_READ_OPC                     2\r
-\r
-//\r
-// Offset from the beginning of private Data queue Buffer\r
-//\r
-#define NVME_ASQ_BUF_OFFSET                  EFI_PAGE_SIZE\r
-\r
-#pragma pack()\r
-\r
-#endif\r
-\r
index e10146e46619a8b5e1f388531e565c4055828e0e..f9fdb641373dde18faea740f813fb55fb15d034e 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Opal Password common header file.\r
 \r
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -30,38 +30,15 @@ typedef struct {
 } OPAL_PCI_DEVICE;\r
 \r
 typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-} OPAL_DEVICE_COMMON;\r
-\r
-#define OPAL_DEVICE_ATA_GUID { 0xcb934fe1, 0xb8cd, 0x46b1, { 0xa0, 0x58, 0xdd, 0xcb, 0x7, 0xb7, 0xb4, 0x17 } }\r
-\r
-typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-  UINT16            Port;\r
-  UINT16            PortMultiplierPort;\r
-} OPAL_DEVICE_ATA;\r
-\r
-#define OPAL_DEVICE_NVME_GUID { 0xde116925, 0xaf7f, 0x42d9, { 0x83, 0xc0, 0x7e, 0xd6, 0x26, 0x59, 0x0, 0xfb } }\r
-\r
-typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-  UINT32            NvmeNamespaceId;\r
-  OPAL_PCI_DEVICE   PciBridgeNode[0];\r
-} OPAL_DEVICE_NVME;\r
+  UINT32                      Length;\r
+  OPAL_PCI_DEVICE             Device;\r
+  UINT8                       PasswordLength;\r
+  UINT8                       Password[OPAL_MAX_PASSWORD_SIZE];\r
+  UINT16                      OpalBaseComId;\r
+  UINT32                      DevicePathLength;\r
+  EFI_DEVICE_PATH_PROTOCOL    DevicePath[];\r
+} OPAL_DEVICE_LOCKBOX_DATA;\r
+\r
+#define OPAL_DEVICE_LOCKBOX_GUID  { 0x56a77f0d, 0x6f05, 0x4d47, { 0xb9, 0x11, 0x4f, 0xd, 0xec, 0x5c, 0x58, 0x61 } }\r
 \r
 #endif // _OPAL_PASSWORD_COMMON_H_\r
index 11e58b95cde74420b1a3981390ff389d9d65225b..2e343a4707bc5ab761b825660418722d40f89800 100644 (file)
@@ -4,7 +4,7 @@
 #  This module is used to Management the Opal feature\r
 #  for Opal supported devices.\r
 #\r
-# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r
@@ -62,7 +62,6 @@
   TcgStorageOpalLib\r
   Tcg2PhysicalPresenceLib\r
   PciLib\r
-  S3BootScriptLib\r
   LockBoxLib\r
 \r
 [Protocols]\r
@@ -73,7 +72,8 @@
   gEfiBlockIoProtocolGuid                       ## CONSUMES\r
 \r
 [Guids]\r
-  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES             ## Event\r
+  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES ## Event\r
+  gS3StorageDeviceInitListGuid                  ## SOMETIMES_PRODUCES ## UNDEFINED\r
 \r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalDxeUnlock  ## CONSUMES\r
index edb47ca8bc797f05ff0b6b46e07a5f0839807462..934c65bcee83703135a02d1cf7f8a1f6c44ee2f6 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Opal Password PEI driver which is used to unlock Opal Password for S3.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -14,250 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "OpalPasswordPei.h"\r
 \r
-EFI_GUID mOpalDeviceAtaGuid = OPAL_DEVICE_ATA_GUID;\r
-EFI_GUID mOpalDeviceNvmeGuid = OPAL_DEVICE_NVME_GUID;\r
+EFI_GUID mOpalDeviceLockBoxGuid = OPAL_DEVICE_LOCKBOX_GUID;\r
 \r
-#define OPAL_PCIE_ROOTPORT_SAVESIZE               (0x40)\r
-#define STORE_INVALID_ROOTPORT_INDEX              ((UINT8) -1)\r
-\r
-/**\r
-  Get IOMMU PPI.\r
-\r
-  @return Pointer to IOMMU PPI.\r
-\r
-**/\r
-EDKII_IOMMU_PPI *\r
-GetIoMmu (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  EDKII_IOMMU_PPI           *IoMmu;\r
-\r
-  IoMmu = NULL;\r
-  Status = PeiServicesLocatePpi (\r
-             &gEdkiiIoMmuPpiGuid,\r
-             0,\r
-             NULL,\r
-             (VOID **) &IoMmu\r
-             );\r
-  if (!EFI_ERROR (Status) && (IoMmu != NULL)) {\r
-    return IoMmu;\r
-  }\r
-\r
-  return NULL;\r
-}\r
-\r
-/**\r
-  Allocates pages that are suitable for an OperationBusMasterCommonBuffer or\r
-  OperationBusMasterCommonBuffer64 mapping.\r
-\r
-  @param Pages                  The number of pages to allocate.\r
-  @param HostAddress            A pointer to store the base system memory address of the\r
-                                allocated range.\r
-  @param DeviceAddress          The resulting map address for the bus master PCI controller to use to\r
-                                access the hosts HostAddress.\r
-  @param Mapping                A resulting value to pass to Unmap().\r
-\r
-  @retval EFI_SUCCESS           The requested memory pages were allocated.\r
-  @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r
-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
-  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
-\r
-**/\r
-EFI_STATUS\r
-IoMmuAllocateBuffer (\r
-  IN UINTN                  Pages,\r
-  OUT VOID                  **HostAddress,\r
-  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
-  OUT VOID                  **Mapping\r
-  )\r
-{\r
-  EFI_STATUS            Status;\r
-  UINTN                 NumberOfBytes;\r
-  EFI_PHYSICAL_ADDRESS  HostPhyAddress;\r
-  EDKII_IOMMU_PPI       *IoMmu;\r
-\r
-  *HostAddress = NULL;\r
-  *DeviceAddress = 0;\r
-  *Mapping = NULL;\r
-\r
-  IoMmu = GetIoMmu ();\r
-\r
-  if (IoMmu != NULL) {\r
-    Status = IoMmu->AllocateBuffer (\r
-                      IoMmu,\r
-                      EfiBootServicesData,\r
-                      Pages,\r
-                      HostAddress,\r
-                      0\r
-                      );\r
-    if (EFI_ERROR (Status)) {\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-\r
-    NumberOfBytes = EFI_PAGES_TO_SIZE (Pages);\r
-    Status = IoMmu->Map (\r
-                      IoMmu,\r
-                      EdkiiIoMmuOperationBusMasterCommonBuffer,\r
-                      *HostAddress,\r
-                      &NumberOfBytes,\r
-                      DeviceAddress,\r
-                      Mapping\r
-                      );\r
-    if (EFI_ERROR (Status)) {\r
-      IoMmu->FreeBuffer (IoMmu, Pages, *HostAddress);\r
-      *HostAddress = NULL;\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-    Status = IoMmu->SetAttribute (\r
-                      IoMmu,\r
-                      *Mapping,\r
-                      EDKII_IOMMU_ACCESS_READ | EDKII_IOMMU_ACCESS_WRITE\r
-                      );\r
-    if (EFI_ERROR (Status)) {\r
-      IoMmu->Unmap (IoMmu, *Mapping);\r
-      IoMmu->FreeBuffer (IoMmu, Pages, *HostAddress);\r
-      *Mapping = NULL;\r
-      *HostAddress = NULL;\r
-      return Status;\r
-    }\r
-  } else {\r
-    Status = PeiServicesAllocatePages (\r
-               EfiBootServicesData,\r
-               Pages,\r
-               &HostPhyAddress\r
-               );\r
-    if (EFI_ERROR (Status)) {\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-    *HostAddress = (VOID *) (UINTN) HostPhyAddress;\r
-    *DeviceAddress = HostPhyAddress;\r
-    *Mapping = NULL;\r
-  }\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Frees memory that was allocated with AllocateBuffer().\r
-\r
-  @param Pages              The number of pages to free.\r
-  @param HostAddress        The base system memory address of the allocated range.\r
-  @param Mapping            The mapping value returned from Map().\r
-\r
-**/\r
-VOID\r
-IoMmuFreeBuffer (\r
-  IN UINTN                  Pages,\r
-  IN VOID                   *HostAddress,\r
-  IN VOID                   *Mapping\r
-  )\r
-{\r
-  EDKII_IOMMU_PPI       *IoMmu;\r
-\r
-  IoMmu = GetIoMmu ();\r
-\r
-  if (IoMmu != NULL) {\r
-    IoMmu->SetAttribute (IoMmu, Mapping, 0);\r
-    IoMmu->Unmap (IoMmu, Mapping);\r
-    IoMmu->FreeBuffer (IoMmu, Pages, HostAddress);\r
-  } else {\r
-    PeiServicesFreePages (\r
-      (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress,\r
-      Pages\r
-      );\r
-  }\r
-}\r
-\r
-/**\r
-  Provide IO action support.\r
-\r
-  @param[in]     PeiDev             The opal device need to perform trusted IO.\r
-  @param[in]     IoType             OPAL_IO_TYPE indicating whether to perform a Trusted Send or Trusted Receive.\r
-  @param[in]     SecurityProtocol   Security Protocol\r
-  @param[in]     SpSpecific         Security Protocol Specific\r
-  @param[in]     TransferLength     Transfer Length of Buffer (in bytes) - always a multiple of 512\r
-  @param[in]     Buffer             Address of Data to transfer\r
-\r
-  @retval        EFI_SUCCESS        Perform the IO action success.\r
-  @retval        Others             Perform the IO action failed.\r
-\r
-**/\r
-EFI_STATUS\r
-PerformTrustedIo (\r
-  OPAL_PEI_DEVICE  *PeiDev,\r
-  OPAL_IO_TYPE     IoType,\r
-  UINT8            SecurityProtocol,\r
-  UINT16           SpSpecific,\r
-  UINTN            TransferLength,\r
-  VOID             *Buffer\r
-  )\r
-{\r
-  EFI_STATUS                    Status;\r
-  UINTN                         BufferSizeBlocks;\r
-  EFI_ATA_COMMAND_BLOCK         AtaCommandBlock;\r
-  OPAL_DEVICE_ATA               *DevInfoAta;\r
-  AHCI_CONTEXT                  *AhciContext;\r
-  NVME_CONTEXT                  *NvmeContext;\r
-\r
-  Status = EFI_DEVICE_ERROR;\r
-  if (PeiDev->DeviceType == OPAL_DEVICE_TYPE_ATA) {\r
-    DevInfoAta = (OPAL_DEVICE_ATA *) PeiDev->Device;\r
-    AhciContext = (AHCI_CONTEXT *) PeiDev->Context;\r
-\r
-    BufferSizeBlocks = TransferLength / 512;\r
-\r
-    ZeroMem( &AtaCommandBlock, sizeof( EFI_ATA_COMMAND_BLOCK ) );\r
-    AtaCommandBlock.AtaCommand = ( IoType == OpalSend ) ? ATA_COMMAND_TRUSTED_SEND : ATA_COMMAND_TRUSTED_RECEIVE;\r
-    AtaCommandBlock.AtaSectorCount = ( UINT8 )BufferSizeBlocks;\r
-    AtaCommandBlock.AtaSectorNumber = ( UINT8 )( BufferSizeBlocks >> 8 );\r
-    AtaCommandBlock.AtaFeatures = SecurityProtocol;\r
-    AtaCommandBlock.AtaCylinderLow = ( UINT8 )( SpSpecific >> 8 );\r
-    AtaCommandBlock.AtaCylinderHigh = ( UINT8 )( SpSpecific );\r
-    AtaCommandBlock.AtaDeviceHead = ATA_DEVICE_LBA;\r
-\r
-\r
-    ZeroMem( AhciContext->Buffer, HDD_PAYLOAD );\r
-    ASSERT( TransferLength <= HDD_PAYLOAD );\r
-\r
-    if (IoType == OpalSend) {\r
-      CopyMem( AhciContext->Buffer, Buffer, TransferLength );\r
-    }\r
-\r
-    Status = AhciPioTransfer(\r
-                AhciContext,\r
-                (UINT8) DevInfoAta->Port,\r
-                (UINT8) DevInfoAta->PortMultiplierPort,\r
-                NULL,\r
-                0,\r
-                ( IoType == OpalSend ) ? FALSE : TRUE,   // i/o direction\r
-                &AtaCommandBlock,\r
-                NULL,\r
-                AhciContext->Buffer,\r
-                (UINT32)TransferLength,\r
-                ATA_TIMEOUT\r
-                );\r
-\r
-    if (IoType == OpalRecv) {\r
-      CopyMem( Buffer, AhciContext->Buffer, TransferLength );\r
-    }\r
-  } else if (PeiDev->DeviceType == OPAL_DEVICE_TYPE_NVME) {\r
-    NvmeContext = (NVME_CONTEXT *) PeiDev->Context;\r
-    Status = NvmeSecuritySendReceive (\r
-                NvmeContext,\r
-                IoType == OpalSend,\r
-                SecurityProtocol,\r
-                SwapBytes16(SpSpecific),\r
-                TransferLength,\r
-                Buffer\r
-              );\r
-  } else {\r
-    DEBUG((DEBUG_ERROR, "DeviceType(%x) not support.\n", PeiDev->DeviceType));\r
-  }\r
-\r
-  return Status;\r
-}\r
 \r
 /**\r
   Send a security protocol command to a device that receives data and/or the result\r
@@ -351,14 +109,16 @@ SecurityReceiveData (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  return PerformTrustedIo (\r
-                        PeiDev,\r
-                        OpalRecv,\r
-                        SecurityProtocolId,\r
-                        SecurityProtocolSpecificData,\r
-                        PayloadBufferSize,\r
-                        PayloadBuffer\r
-                        );\r
+  return PeiDev->SscPpi->ReceiveData (\r
+                           PeiDev->SscPpi,\r
+                           PeiDev->DeviceIndex,\r
+                           SSC_PPI_GENERIC_TIMEOUT,\r
+                           SecurityProtocolId,\r
+                           SecurityProtocolSpecificData,\r
+                           PayloadBufferSize,\r
+                           PayloadBuffer,\r
+                           PayloadTransferSize\r
+                           );\r
 }\r
 \r
 /**\r
@@ -441,111 +201,15 @@ SecuritySendData (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  return PerformTrustedIo (\r
-                          PeiDev,\r
-                          OpalSend,\r
-                          SecurityProtocolId,\r
-                          SecurityProtocolSpecificData,\r
-                          PayloadBufferSize,\r
-                          PayloadBuffer\r
-                          );\r
-\r
-}\r
-\r
-/**\r
-  Save/Restore RootPort configuration space.\r
-\r
-  @param[in]     DevInfoNvme            Pointer to NVMe device info.\r
-  @param[in]     SaveAction             TRUE: Save, FALSE: Restore\r
-  @param[in,out] PcieConfBufferList    Configuration space data buffer for save/restore\r
-\r
-  @return PCIE base address of this RootPort\r
-**/\r
-UINTN\r
-SaveRestoreRootportConfSpace (\r
-  IN     OPAL_DEVICE_NVME               *DevInfoNvme,\r
-  IN     BOOLEAN                        SaveAction,\r
-  IN OUT UINT8                          **PcieConfBufferList\r
-  )\r
-{\r
-  UINTN             RpBase;\r
-  UINTN             Length;\r
-  OPAL_PCI_DEVICE   *DevNode;\r
-  UINT8             *StorePcieConfData;\r
-  UINTN             Index;\r
-\r
-  Length = 0;\r
-  Index  = 0;\r
-  RpBase = 0;\r
-\r
-  while (sizeof (OPAL_DEVICE_NVME) + Length < DevInfoNvme->Length) {\r
-    DevNode = (OPAL_PCI_DEVICE *)((UINT8*)DevInfoNvme->PciBridgeNode + Length);\r
-    RpBase = PCI_LIB_ADDRESS (DevNode->Bus, DevNode->Device, DevNode->Function, 0x0);\r
-\r
-    if (PcieConfBufferList != NULL) {\r
-      if (SaveAction) {\r
-        StorePcieConfData = (UINT8 *) AllocateZeroPool (OPAL_PCIE_ROOTPORT_SAVESIZE);\r
-        ASSERT (StorePcieConfData != NULL);\r
-        OpalPciRead (StorePcieConfData, RpBase, OPAL_PCIE_ROOTPORT_SAVESIZE);\r
-        PcieConfBufferList[Index] = StorePcieConfData;\r
-      } else {\r
-        // Skip PCIe Command & Status registers\r
-        StorePcieConfData = PcieConfBufferList[Index];\r
-        OpalPciWrite (RpBase, StorePcieConfData, 4);\r
-        OpalPciWrite (RpBase + 8, StorePcieConfData + 8, OPAL_PCIE_ROOTPORT_SAVESIZE - 8);\r
-\r
-        FreePool (StorePcieConfData);\r
-      }\r
-    }\r
-\r
-    Length += sizeof (OPAL_PCI_DEVICE);\r
-    Index ++;\r
-  }\r
-\r
-  return RpBase;\r
-}\r
-\r
-/**\r
-  Configure RootPort for downstream PCIe NAND devices.\r
-\r
-  @param[in] RpBase             - PCIe configuration space address of this RootPort\r
-  @param[in] BusNumber          - Bus number\r
-  @param[in] MemoryBase         - Memory base address\r
-  @param[in] MemoryLength       - Memory size\r
-\r
-**/\r
-VOID\r
-ConfigureRootPortForPcieNand (\r
-  IN UINTN   RpBase,\r
-  IN UINTN   BusNumber,\r
-  IN UINT32  MemoryBase,\r
-  IN UINT32  MemoryLength\r
-  )\r
-{\r
-  UINT32  MemoryLimit;\r
-\r
-  DEBUG ((DEBUG_INFO, "ConfigureRootPortForPcieNand, BusNumber: %x, MemoryBase: %x, MemoryLength: %x\n",\r
-    BusNumber, MemoryBase, MemoryLength));\r
-\r
-  if (MemoryLength == 0) {\r
-    MemoryLimit = MemoryBase;\r
-  } else {\r
-    MemoryLimit = MemoryBase + MemoryLength + 0xFFFFF; // 1M\r
-  }\r
-\r
-  ///\r
-  /// Configue PCIE configuration space for RootPort\r
-  ///\r
-  PciWrite8  (RpBase + NVME_PCIE_BNUM + 1,  (UINT8) BusNumber);           // Secondary Bus Number registers\r
-  PciWrite8  (RpBase + NVME_PCIE_BNUM + 2,  (UINT8) BusNumber);           // Subordinate Bus Number registers\r
-  PciWrite8  (RpBase + NVME_PCIE_IOBL,      0xFF);                        // I/O Base registers\r
-  PciWrite8  (RpBase + NVME_PCIE_IOBL + 1,  0x00);                        // I/O Limit registers\r
-  PciWrite16 (RpBase + NVME_PCIE_MBL,       (UINT16) RShiftU64 ((UINTN)MemoryBase, 16));  // Memory Base register\r
-  PciWrite16 (RpBase + NVME_PCIE_MBL + 2,   (UINT16) RShiftU64 ((UINTN)MemoryLimit, 16)); // Memory Limit register\r
-  PciWrite16 (RpBase + NVME_PCIE_PMBL,      0xFFFF);                      // Prefetchable Memory Base registers\r
-  PciWrite16 (RpBase + NVME_PCIE_PMBL + 2,  0x0000);                      // Prefetchable Memory Limit registers\r
-  PciWrite32 (RpBase + NVME_PCIE_PMBU32,    0xFFFFFFFF);                  // Prefetchable Memory Upper Base registers\r
-  PciWrite32 (RpBase + NVME_PCIE_PMLU32,    0x00000000);                  // Prefetchable Memory Upper Limit registers\r
+  return PeiDev->SscPpi->SendData (\r
+                           PeiDev->SscPpi,\r
+                           PeiDev->DeviceIndex,\r
+                           SSC_PPI_GENERIC_TIMEOUT,\r
+                           SecurityProtocolId,\r
+                           SecurityProtocolSpecificData,\r
+                           PayloadBufferSize,\r
+                           PayloadBuffer\r
+                           );\r
 }\r
 \r
 /**\r
@@ -651,274 +315,137 @@ UnlockOpalPassword (
 }\r
 \r
 /**\r
-  Unlock ATA OPAL password for S3.\r
+  Unlock the OPAL NVM Express and ATA devices for S3.\r
+\r
+  @param[in] SscPpi    Pointer to the EDKII_PEI_STORAGE_SECURITY_CMD_PPI instance.\r
 \r
 **/\r
 VOID\r
-UnlockOpalPasswordAta (\r
-  VOID\r
+UnlockOpalPasswordDevices (\r
+  IN EDKII_PEI_STORAGE_SECURITY_CMD_PPI    *SscPpi\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  UINT8                         *DevInfo;\r
-  OPAL_DEVICE_ATA               TempDevInfoAta;\r
-  OPAL_DEVICE_ATA               *DevInfoAta;\r
-  UINTN                         DevInfoLengthAta;\r
-  UINT8                         Bus;\r
-  UINT8                         Device;\r
-  UINT8                         Function;\r
-  OPAL_PEI_DEVICE               OpalDev;\r
-  UINT8                         BaseClassCode;\r
-  UINT8                         SubClassCode;\r
-  UINT8                         SataCmdSt;\r
-  AHCI_CONTEXT                  AhciContext;\r
-  UINT32                        AhciBar;\r
-\r
-  DEBUG ((DEBUG_INFO, "%a() - enter\n", __FUNCTION__));\r
+  EFI_STATUS                            Status;\r
+  UINT8                                 *DevInfoBuffer;\r
+  UINT8                                 DummyData;\r
+  OPAL_DEVICE_LOCKBOX_DATA              *DevInfo;\r
+  UINTN                                 DevInfoLength;\r
+  EFI_DEVICE_PATH_PROTOCOL              *SscDevicePath;\r
+  UINTN                                 SscDevicePathLength;\r
+  UINTN                                 SscDeviceNum;\r
+  UINTN                                 SscDeviceIndex;\r
+  OPAL_PEI_DEVICE                       OpalDev;\r
 \r
   //\r
-  // Get ATA OPAL device info from LockBox.\r
+  // Get OPAL devices info from LockBox.\r
   //\r
-  DevInfo = (UINT8 *) &TempDevInfoAta;\r
-  DevInfoLengthAta = sizeof (OPAL_DEVICE_ATA);\r
-  Status = RestoreLockBox (&mOpalDeviceAtaGuid, DevInfo, &DevInfoLengthAta);\r
+  DevInfoBuffer = &DummyData;\r
+  DevInfoLength = sizeof (DummyData);\r
+  Status = RestoreLockBox (&mOpalDeviceLockBoxGuid, DevInfoBuffer, &DevInfoLength);\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    DevInfo = AllocatePages (EFI_SIZE_TO_PAGES (DevInfoLengthAta));\r
-    if (DevInfo != NULL) {\r
-      Status = RestoreLockBox (&mOpalDeviceAtaGuid, DevInfo, &DevInfoLengthAta);\r
+    DevInfoBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DevInfoLength));\r
+    if (DevInfoBuffer != NULL) {\r
+      Status = RestoreLockBox (&mOpalDeviceLockBoxGuid, DevInfoBuffer, &DevInfoLength);\r
     }\r
   }\r
-  if (EFI_ERROR (Status) || (DevInfo == NULL)) {\r
+  if (DevInfoBuffer == NULL || DevInfoBuffer == &DummyData) {\r
+    return;\r
+  } else if (EFI_ERROR (Status)) {\r
+    FreePages (DevInfoBuffer, EFI_SIZE_TO_PAGES (DevInfoLength));\r
     return;\r
   }\r
 \r
-  for (DevInfoAta = (OPAL_DEVICE_ATA *) DevInfo;\r
-       (UINTN) DevInfoAta < ((UINTN) DevInfo + DevInfoLengthAta);\r
-       DevInfoAta = (OPAL_DEVICE_ATA *) ((UINTN) DevInfoAta + DevInfoAta->Length)) {\r
-    Bus = DevInfoAta->Device.Bus;\r
-    Device = DevInfoAta->Device.Device;\r
-    Function = DevInfoAta->Device.Function;\r
-\r
-    SataCmdSt = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, PCI_COMMAND_OFFSET));\r
-    PciWrite8 (PCI_LIB_ADDRESS (Bus, Device, Function, PCI_COMMAND_OFFSET), 0x6);\r
-\r
-    BaseClassCode = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x0B));\r
-    SubClassCode  = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x0A));\r
-    if ((BaseClassCode != PCI_CLASS_MASS_STORAGE) ||\r
-        ((SubClassCode != PCI_CLASS_MASS_STORAGE_SATADPA) && (SubClassCode != PCI_CLASS_MASS_STORAGE_RAID))) {\r
-      DEBUG ((DEBUG_ERROR, "%a() ClassCode/SubClassCode are not supported\n", __FUNCTION__));\r
-    } else {\r
-      AhciBar = PciRead32 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x24));\r
-      PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x24), DevInfoAta->BarAddr);\r
-\r
-      ZeroMem (&AhciContext, sizeof (AHCI_CONTEXT));\r
-      AhciContext.AhciBar = DevInfoAta->BarAddr;\r
-      AhciAllocateResource (&AhciContext);\r
-      Status = AhciModeInitialize (&AhciContext, (UINT8)DevInfoAta->Port);\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
-      AhciFreeResource (&AhciContext);\r
-      PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x24), AhciBar);\r
-    }\r
-    PciWrite8 (PCI_LIB_ADDRESS (Bus, Device, Function, PCI_COMMAND_OFFSET), SataCmdSt);\r
-  }\r
-\r
-  ZeroMem (DevInfo, DevInfoLengthAta);\r
-  if ((UINTN) DevInfo != (UINTN) &TempDevInfoAta) {\r
-    FreePages (DevInfo, EFI_SIZE_TO_PAGES (DevInfoLengthAta));\r
-  }\r
-\r
-  DEBUG ((DEBUG_INFO, "%a() - exit\n", __FUNCTION__));\r
-}\r
-\r
-/**\r
-  Unlock NVMe OPAL password for S3.\r
-\r
-**/\r
-VOID\r
-UnlockOpalPasswordNvme (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS                    Status;\r
-  UINT8                         *DevInfo;\r
-  OPAL_DEVICE_NVME              TempDevInfoNvme;\r
-  OPAL_DEVICE_NVME              *DevInfoNvme;\r
-  UINTN                         DevInfoLengthNvme;\r
-  UINT8                         Bus;\r
-  UINT8                         Device;\r
-  UINT8                         Function;\r
-  OPAL_PEI_DEVICE               OpalDev;\r
-  UINT8                         BaseClassCode;\r
-  UINT8                         SubClassCode;\r
-  UINT8                         ProgInt;\r
-  UINT8                         NvmeCmdSt;\r
-  UINT8                         *StorePcieConfDataList[16];\r
-  UINTN                         RpBase;\r
-  UINTN                         MemoryBase;\r
-  UINTN                         MemoryLength;\r
-  NVME_CONTEXT                  NvmeContext;\r
-\r
-  DEBUG ((DEBUG_INFO, "%a() - enter\n", __FUNCTION__));\r
-\r
   //\r
-  // Get NVMe OPAL device info from LockBox.\r
+  // Go through all the devices managed by the SSC PPI instance.\r
   //\r
-  DevInfo = (UINT8 *) &TempDevInfoNvme;\r
-  DevInfoLengthNvme = sizeof (OPAL_DEVICE_NVME);\r
-  Status = RestoreLockBox (&mOpalDeviceNvmeGuid, DevInfo, &DevInfoLengthNvme);\r
-  if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    DevInfo = AllocatePages (EFI_SIZE_TO_PAGES (DevInfoLengthNvme));\r
-    if (DevInfo != NULL) {\r
-      Status = RestoreLockBox (&mOpalDeviceNvmeGuid, DevInfo, &DevInfoLengthNvme);\r
-    }\r
+  Status = SscPpi->GetNumberofDevices (SscPpi, &SscDeviceNum);\r
+  if (EFI_ERROR (Status)) {\r
+    goto Exit;\r
   }\r
-  if (EFI_ERROR (Status) || (DevInfo == NULL)) {\r
-    return;\r
-  }\r
-\r
-  for (DevInfoNvme = (OPAL_DEVICE_NVME *) DevInfo;\r
-       (UINTN) DevInfoNvme < ((UINTN) DevInfo + DevInfoLengthNvme);\r
-       DevInfoNvme = (OPAL_DEVICE_NVME *) ((UINTN) DevInfoNvme + DevInfoNvme->Length)) {\r
-    Bus = DevInfoNvme->Device.Bus;\r
-    Device = DevInfoNvme->Device.Device;\r
-    Function = DevInfoNvme->Device.Function;\r
-\r
-    RpBase    = 0;\r
-    NvmeCmdSt = 0;\r
-\r
-    ///\r
-    /// Save original RootPort configuration space to heap\r
-    ///\r
-    RpBase = SaveRestoreRootportConfSpace (\r
-                DevInfoNvme,\r
-                TRUE, // save\r
-                StorePcieConfDataList\r
-                );\r
-    MemoryBase = DevInfoNvme->BarAddr;\r
-    MemoryLength = 0;\r
-    ConfigureRootPortForPcieNand (RpBase, Bus, (UINT32) MemoryBase, (UINT32) MemoryLength);\r
-\r
-    ///\r
-    /// Enable PCIE decode for RootPort\r
-    ///\r
-    NvmeCmdSt = PciRead8 (RpBase + NVME_PCIE_PCICMD);\r
-    PciWrite8  (RpBase + NVME_PCIE_PCICMD,  0x6);\r
-\r
-    BaseClassCode = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x0B));\r
-    SubClassCode  = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x0A));\r
-    ProgInt       = PciRead8 (PCI_LIB_ADDRESS (Bus, Device, Function, 0x09));\r
-    if ((BaseClassCode != PCI_CLASS_MASS_STORAGE) ||\r
-        (SubClassCode != PCI_CLASS_MASS_STORAGE_NVM) ||\r
-        (ProgInt != PCI_IF_NVMHCI)) {\r
-      DEBUG ((DEBUG_ERROR, "%a() ClassCode/SubClassCode/PI are not supported\n", __FUNCTION__));\r
-    } else {\r
-      ZeroMem (&NvmeContext, sizeof (NVME_CONTEXT));\r
-      NvmeContext.Nbar = DevInfoNvme->BarAddr;\r
-      NvmeContext.PciBase = PCI_LIB_ADDRESS (Bus, Device, Function, 0x0);\r
-      NvmeContext.NvmeInitWaitTime = 0;\r
-      NvmeContext.Nsid = DevInfoNvme->NvmeNamespaceId;\r
-      NvmeAllocateResource (&NvmeContext);\r
-      Status = NvmeControllerInit (&NvmeContext);\r
-\r
-      OpalDev.Signature = OPAL_PEI_DEVICE_SIGNATURE;\r
-      OpalDev.Sscp.ReceiveData = SecurityReceiveData;\r
-      OpalDev.Sscp.SendData = SecuritySendData;\r
-      OpalDev.DeviceType = OPAL_DEVICE_TYPE_NVME;\r
-      OpalDev.Device = (OPAL_DEVICE_COMMON *) DevInfoNvme;\r
-      OpalDev.Context = &NvmeContext;\r
-\r
-      UnlockOpalPassword (&OpalDev);\r
-\r
-      Status = NvmeControllerExit (&NvmeContext);\r
-      NvmeFreeResource (&NvmeContext);\r
+  for (SscDeviceIndex = 1; SscDeviceIndex <= SscDeviceNum; SscDeviceIndex++) {\r
+    Status = SscPpi->GetDevicePath (\r
+                       SscPpi,\r
+                       SscDeviceIndex,\r
+                       &SscDevicePathLength,\r
+                       &SscDevicePath\r
+                       );\r
+    if (SscDevicePathLength <= sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
+      //\r
+      // Device path validity check.\r
+      //\r
+      continue;\r
     }\r
 \r
-    ASSERT (RpBase != 0);\r
-    PciWrite8  (RpBase + NVME_PCIE_PCICMD, 0);\r
-    RpBase = SaveRestoreRootportConfSpace (\r
-                DevInfoNvme,\r
-                FALSE,  // restore\r
-                StorePcieConfDataList\r
-                );\r
-    PciWrite8  (RpBase + NVME_PCIE_PCICMD, NvmeCmdSt);\r
-  }\r
-\r
-  ZeroMem (DevInfo, DevInfoLengthNvme);\r
-  if ((UINTN) DevInfo != (UINTN) &TempDevInfoNvme) {\r
-    FreePages (DevInfo, EFI_SIZE_TO_PAGES (DevInfoLengthNvme));\r
+    //\r
+    // Search the device in the restored LockBox.\r
+    //\r
+    for (DevInfo = (OPAL_DEVICE_LOCKBOX_DATA *) DevInfoBuffer;\r
+         (UINTN) DevInfo < ((UINTN) DevInfoBuffer + DevInfoLength);\r
+         DevInfo = (OPAL_DEVICE_LOCKBOX_DATA *) ((UINTN) DevInfo + DevInfo->Length)) {\r
+      //\r
+      // Find the matching device.\r
+      //\r
+      if ((DevInfo->DevicePathLength >= SscDevicePathLength) &&\r
+          (CompareMem (\r
+             DevInfo->DevicePath,\r
+             SscDevicePath,\r
+             SscDevicePathLength - sizeof (EFI_DEVICE_PATH_PROTOCOL)) == 0)) {\r
+        OpalDev.Signature        = OPAL_PEI_DEVICE_SIGNATURE;\r
+        OpalDev.Sscp.ReceiveData = SecurityReceiveData;\r
+        OpalDev.Sscp.SendData    = SecuritySendData;\r
+        OpalDev.Device           = DevInfo;\r
+        OpalDev.Context          = NULL;\r
+        OpalDev.SscPpi           = SscPpi;\r
+        OpalDev.DeviceIndex      = SscDeviceIndex;\r
+        UnlockOpalPassword (&OpalDev);\r
+        break;\r
+      }\r
+    }\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "%a() - exit\n", __FUNCTION__));\r
-}\r
-\r
-/**\r
-  Unlock OPAL password for S3.\r
+Exit:\r
+  ZeroMem (DevInfoBuffer, DevInfoLength);\r
+  FreePages (DevInfoBuffer, EFI_SIZE_TO_PAGES (DevInfoLength));\r
 \r
-**/\r
-VOID\r
-OpalPasswordS3 (\r
-  VOID\r
-  )\r
-{\r
-  UnlockOpalPasswordAta ();\r
-  UnlockOpalPasswordNvme ();\r
 }\r
 \r
 /**\r
-  Entry point of the notification callback function itself within the PEIM.\r
+  One notified function at the installation of EDKII_PEI_STORAGE_SECURITY_CMD_PPI.\r
   It is to unlock OPAL password for S3.\r
 \r
-  @param  PeiServices      Indirect reference to the PEI Services Table.\r
-  @param  NotifyDescriptor Address of the notification descriptor data structure.\r
-  @param  Ppi              Address of the PPI that was installed.\r
+  @param[in] PeiServices         Indirect reference to the PEI Services Table.\r
+  @param[in] NotifyDescriptor    Address of the notification descriptor data structure.\r
+  @param[in] Ppi                 Address of the PPI that was installed.\r
 \r
   @return Status of the notification.\r
           The status code returned from this function is ignored.\r
+\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-OpalPasswordEndOfPeiNotify(\r
-  IN EFI_PEI_SERVICES          **PeiServices,\r
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,\r
-  IN VOID                      *Ppi\r
+OpalPasswordStorageSecurityPpiNotify (\r
+  IN EFI_PEI_SERVICES             **PeiServices,\r
+  IN EFI_PEI_NOTIFY_DESCRIPTOR    *NotifyDesc,\r
+  IN VOID                         *Ppi\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_BOOT_MODE                     BootMode;\r
-\r
-  Status = PeiServicesGetBootMode (&BootMode);\r
-  ASSERT_EFI_ERROR (Status);\r
-  if (BootMode != BOOT_ON_S3_RESUME) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  DEBUG ((DEBUG_INFO, "%a() - enter at S3 resume\n", __FUNCTION__));\r
+  DEBUG ((DEBUG_INFO, "%a entered at S3 resume!\n", __FUNCTION__));\r
 \r
-  OpalPasswordS3 ();\r
+  UnlockOpalPasswordDevices ((EDKII_PEI_STORAGE_SECURITY_CMD_PPI *) Ppi);\r
 \r
-  DEBUG ((DEBUG_INFO, "%a() - exit at S3 resume\n", __FUNCTION__));\r
+  DEBUG ((DEBUG_INFO, "%a exit at S3 resume!\n", __FUNCTION__));\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-EFI_PEI_NOTIFY_DESCRIPTOR mOpalPasswordEndOfPeiNotifyDesc = {\r
+\r
+EFI_PEI_NOTIFY_DESCRIPTOR mOpalPasswordStorageSecurityPpiNotifyDesc = {\r
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gEfiEndOfPeiSignalPpiGuid,\r
-  OpalPasswordEndOfPeiNotify\r
+  &gEdkiiPeiStorageSecurityCommandPpiGuid,\r
+  OpalPasswordStorageSecurityPpiNotify\r
 };\r
 \r
+\r
 /**\r
   Main entry for this module.\r
 \r
@@ -935,10 +462,17 @@ OpalPasswordPeiInit (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS       Status;\r
+  EFI_BOOT_MODE    BootMode;\r
+\r
+  Status = PeiServicesGetBootMode (&BootMode);\r
+  if ((EFI_ERROR (Status)) || (BootMode != BOOT_ON_S3_RESUME)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
 \r
-  Status = PeiServicesNotifyPpi (&mOpalPasswordEndOfPeiNotifyDesc);\r
+  DEBUG ((DEBUG_INFO, "%a: Enters in S3 path.\n", __FUNCTION__));\r
+\r
+  Status = PeiServicesNotifyPpi (&mOpalPasswordStorageSecurityPpiNotifyDesc);\r
   ASSERT_EFI_ERROR (Status);\r
   return Status;\r
 }\r
-\r
index 31aab37f5d91bba2248b37bc9408af2c5ada8eba..5c1719b9b78f228a4b358b59d07c666ae8c41817 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Opal Password PEI driver which is used to unlock Opal Password for S3.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _OPAL_PASSWORD_PEI_H_\r
 \r
 #include <PiPei.h>\r
-#include <IndustryStandard/Atapi.h>\r
-#include <IndustryStandard/Pci.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/IoLib.h>\r
@@ -27,107 +25,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/PeiServicesLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/TimerLib.h>\r
 #include <Library/LockBoxLib.h>\r
 #include <Library/TcgStorageOpalLib.h>\r
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
+#include <Library/PeiServicesTablePointerLib.h>\r
 \r
 #include <Protocol/StorageSecurityCommand.h>\r
 \r
 #include <Ppi/IoMmu.h>\r
+#include <Ppi/StorageSecurityCommand.h>\r
 \r
 #include "OpalPasswordCommon.h"\r
-#include "OpalAhciMode.h"\r
-#include "OpalNvmeMode.h"\r
 \r
-//\r
-// Time out Value for ATA pass through protocol\r
-//\r
-#define ATA_TIMEOUT                      30000000\r
 \r
 //\r
-// The payload Length of HDD related ATA commands\r
-//\r
-#define HDD_PAYLOAD                      512\r
-//\r
-// According to ATA spec, the max Length of hdd password is 32 bytes\r
+// The generic command timeout value (unit in us) for Storage Security Command\r
+// PPI ReceiveData/SendData services\r
 //\r
-#define OPAL_PASSWORD_MAX_LENGTH         32\r
+#define SSC_PPI_GENERIC_TIMEOUT                  30000000\r
 \r
 #pragma pack(1)\r
 \r
-/**\r
-* Opal I/O Type utilized by the Trusted IO callback\r
-*\r
-* The type indicates if the I/O is a send or receive\r
-*/\r
-typedef enum {\r
-    //\r
-    // I/O is a TCG Trusted Send command\r
-    //\r
-    OpalSend,\r
-\r
-    //\r
-    // I/O is a TCG Trusted Receive command\r
-    //\r
-    OpalRecv\r
-} OPAL_IO_TYPE;\r
-\r
-#define OPAL_PEI_DEVICE_SIGNATURE SIGNATURE_32 ('o', 'p', 'd', 's')\r
+#define OPAL_PEI_DEVICE_SIGNATURE       SIGNATURE_32 ('o', 'p', 'd', 's')\r
 \r
 typedef struct {\r
-  UINTN                                     Signature;\r
-  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL     Sscp;\r
-  UINT8                                     DeviceType;\r
-  OPAL_DEVICE_COMMON                        *Device;\r
-  VOID                                      *Context;\r
+  UINTN                                    Signature;\r
+  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    Sscp;\r
+  OPAL_DEVICE_LOCKBOX_DATA                 *Device;\r
+  VOID                                     *Context;\r
+  EDKII_PEI_STORAGE_SECURITY_CMD_PPI       *SscPpi;\r
+  UINTN                                    DeviceIndex;\r
 } OPAL_PEI_DEVICE;\r
 \r
-#define OPAL_PEI_DEVICE_FROM_THIS(a)  CR (a, OPAL_PEI_DEVICE, Sscp, OPAL_PEI_DEVICE_SIGNATURE)\r
+#define OPAL_PEI_DEVICE_FROM_THIS(a)    \\r
+  CR (a, OPAL_PEI_DEVICE, Sscp, OPAL_PEI_DEVICE_SIGNATURE)\r
 \r
 #pragma pack()\r
 \r
-/**\r
-  Allocates pages that are suitable for an OperationBusMasterCommonBuffer or\r
-  OperationBusMasterCommonBuffer64 mapping.\r
-\r
-  @param Pages                  The number of pages to allocate.\r
-  @param HostAddress            A pointer to store the base system memory address of the\r
-                                allocated range.\r
-  @param DeviceAddress          The resulting map address for the bus master PCI controller to use to\r
-                                access the hosts HostAddress.\r
-  @param Mapping                A resulting value to pass to Unmap().\r
-\r
-  @retval EFI_SUCCESS           The requested memory pages were allocated.\r
-  @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r
-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
-  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
-\r
-**/\r
-EFI_STATUS\r
-IoMmuAllocateBuffer (\r
-  IN UINTN                  Pages,\r
-  OUT VOID                  **HostAddress,\r
-  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
-  OUT VOID                  **Mapping\r
-  );\r
-\r
-/**\r
-  Frees memory that was allocated with AllocateBuffer().\r
-\r
-  @param Pages              The number of pages to free.\r
-  @param HostAddress        The base system memory address of the allocated range.\r
-  @param Mapping            The mapping value returned from Map().\r
-\r
-**/\r
-VOID\r
-IoMmuFreeBuffer (\r
-  IN UINTN                  Pages,\r
-  IN VOID                   *HostAddress,\r
-  IN VOID                   *Mapping\r
-  );\r
-\r
 #endif // _OPAL_PASSWORD_PEI_H_\r
 \r
index 482b7c25afa1ffea995d85902adb6758e1af7665..5abfc69e805d67b6662b9ceb40ce9da2bec1a931 100644 (file)
@@ -1,7 +1,7 @@
 ## @file\r
 #  This is a Opal Password PEI driver.\r
 #\r
-# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r
   OpalPasswordPei.c\r
   OpalPasswordPei.h\r
   OpalPasswordCommon.h\r
-  OpalAhciMode.c\r
-  OpalAhciMode.h\r
-  OpalNvmeMode.c\r
-  OpalNvmeMode.h\r
-  OpalNvmeReg.h\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   BaseLib\r
   BaseMemoryLib\r
   MemoryAllocationLib\r
-  TimerLib\r
   LockBoxLib\r
   TcgStorageOpalLib\r
   Tcg2PhysicalPresenceLib\r
+  PeiServicesTablePointerLib\r
 \r
 [Ppis]\r
-  gEdkiiIoMmuPpiGuid                            ## SOMETIMES_CONSUMES\r
-  gEfiEndOfPeiSignalPpiGuid                     ## NOTIFY\r
+  gEdkiiPeiStorageSecurityCommandPpiGuid        ## NOTIFY\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid\r