Re: [edk2] [PATCH] SecurityPkg: Remove dead code and inf redundant definitions.

2018-11-28 Thread Dong, Eric 
Reviewed-by: Eric Dong   for Opal part.

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Chen A Chen
> Sent: Wednesday, November 28, 2018 2:27 PM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Chao B 
> Subject: [edk2] [PATCH] SecurityPkg: Remove dead code and inf redundant
> definitions.
> 
> Fix BZ1065, https://bugzilla.tianocore.org/show_bug.cgi?id=1065
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Chen A Chen 
> Cc: Zhang Chao B 
> ---
>  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf  |   1 -
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c   |  52 
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h   |  23 --
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h|  11 -
>  .../Tcg/Opal/OpalPassword/OpalHiiCallbacks.c   |  87 --
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.c   | 321 
> -
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.h   | 128 
>  .../Tcg/Opal/OpalPassword/OpalPasswordDxe.inf  |   2 -
>  .../Tcg/Opal/OpalPassword/OpalPasswordPei.inf  |   1 -
>  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf   |   1 -
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf|   1 -
>  SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf|   1 -
>  SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf  |   1 -
>  .../SecureBootConfigDxe/SecureBootConfigDxe.inf|   2 -
>  14 files changed, 632 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
> b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
> index 6f9a77b868..a17fa4046d 100644
> --- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
> +++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
> @@ -43,7 +43,6 @@
>UefiDriverEntryPoint
>UefiBootServicesTableLib
>UefiRuntimeServicesTableLib
> -  ReportStatusCodeLib
>DebugLib
>UefiLib
>MemoryAllocationLib
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
> index d51865380f..0c4edd5346 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
> @@ -969,58 +969,6 @@ AhciReset (
> 
>  }
> 
> -/**
> -  Send Buffer cmd to specific device.
> -
> -  @param[in]  AhciContext The pointer to the AHCI_CONTEXT.
> -  @param[in]  PortThe port number of attached ATA device.
> -  @param[in]  PortMultiplier  The port number of port multiplier of
> attached ATA device.
> -  @param[in, out]  Buffer The Data Buffer to store IDENTIFY PACKET 
> Data.
> -
> -  @retval EFI_DEVICE_ERRORThe cmd abort with error occurs.
> -  @retval EFI_TIMEOUT The operation is time out.
> -  @retval EFI_UNSUPPORTED The device is not ready for executing.
> -  @retval EFI_SUCCESS The cmd executes successfully.
> -
> -**/
> -EFI_STATUS
> -EFIAPI
> -AhciIdentify (
> -  IN AHCI_CONTEXT *AhciContext,
> -  IN UINT8Port,
> -  IN UINT8PortMultiplier,
> -  IN OUT ATA_IDENTIFY_DATA*Buffer
> -  )
> -{
> -  EFI_STATUS   Status;
> -  EFI_ATA_COMMAND_BLOCKAtaCommandBlock;
> -
> -  if (AhciContext == NULL || Buffer == NULL) {
> -return EFI_INVALID_PARAMETER;
> -  }
> -
> -  ZeroMem (, sizeof (EFI_ATA_COMMAND_BLOCK));
> -
> -  AtaCommandBlock.AtaCommand = ATA_CMD_IDENTIFY_DRIVE;
> -  AtaCommandBlock.AtaSectorCount = 1;
> -
> -  Status = AhciPioTransfer (
> - AhciContext,
> - Port,
> - PortMultiplier,
> - NULL,
> - 0,
> - TRUE,
> - ,
> - NULL,
> - Buffer,
> - sizeof (ATA_IDENTIFY_DATA),
> - ATA_TIMEOUT
> - );
> -
> -  return Status;
> -}
> -
>  /**
>Allocate transfer-related data struct which is used at AHCI mode.
> 
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
> index 037f81ac24..2076b0411b 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
> @@ -293,29 +293,6 @@ typedef struct {
>UINT32AhciBar;
>  } AHCI_CONTEXT;
> 
> -/**
> -  Send Buffer cmd to specific device.
> -
> -  @param  AhciContext The pointer to the AHCI_CONTEXT.
> -  @param  PortThe number of port.
> -  @param  PortMultiplier  The timeout Value of stop.
> -  @param  Buffer  The Data Buffer to store IDENTIFY PACKET Data.
> -
> -  @retval EFI_DEVICE_ERRORThe cmd abort with error occurs.
> -  @retval EFI_TIMEOUT The operation is time out.
> -  @retval EFI_UNSUPPORTED The device is not ready for executing.
> -  @retval EFI_SUCCESS The cmd executes successfully.
> -
> -**/
> -EFI_STATUS
> -EFIAPI
> -AhciIdentify (
> -  IN AHCI_CONTEXT *AhciContext,
> -  IN

Re: [edk2] [PATCH] SecurityPkg: Remove dead code and inf redundant definitions.

2018-11-28 Thread Zhang, Chao B 
Hi Chen Chen:
   TCG part is good to me. For Opal part, please include Eric Dong as reviewer.

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Chen A 
Chen
Sent: Wednesday, November 28, 2018 2:27 PM
To: edk2-devel@lists.01.org
Cc: Zhang, Chao B 
Subject: [edk2] [PATCH] SecurityPkg: Remove dead code and inf redundant 
definitions.

Fix BZ1065, https://bugzilla.tianocore.org/show_bug.cgi?id=1065

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chen A Chen 
Cc: Zhang Chao B 
---
 SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf  |   1 -
 SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c   |  52 
 SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h   |  23 --
 SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h|  11 -
 .../Tcg/Opal/OpalPassword/OpalHiiCallbacks.c   |  87 --
 SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.c   | 321 -
 SecurityPkg/Tcg/Opal/OpalPassword/OpalNvmeMode.h   | 128 
 .../Tcg/Opal/OpalPassword/OpalPasswordDxe.inf  |   2 -
 .../Tcg/Opal/OpalPassword/OpalPasswordPei.inf  |   1 -
 SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf   |   1 -
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf|   1 -
 SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf|   1 -
 SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf  |   1 -
 .../SecureBootConfigDxe/SecureBootConfigDxe.inf|   2 -
 14 files changed, 632 deletions(-)

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf 
b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index 6f9a77b868..a17fa4046d 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -43,7 +43,6 @@
   UefiDriverEntryPoint
   UefiBootServicesTableLib
   UefiRuntimeServicesTableLib
-  ReportStatusCodeLib
   DebugLib
   UefiLib
   MemoryAllocationLib
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
index d51865380f..0c4edd5346 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.c
@@ -969,58 +969,6 @@ AhciReset (
 
 }
 
-/**
-  Send Buffer cmd to specific device.
-
-  @param[in]  AhciContext The pointer to the AHCI_CONTEXT.
-  @param[in]  PortThe port number of attached ATA device.
-  @param[in]  PortMultiplier  The port number of port multiplier of 
attached ATA device.
-  @param[in, out]  Buffer The Data Buffer to store IDENTIFY PACKET 
Data.
-
-  @retval EFI_DEVICE_ERRORThe cmd abort with error occurs.
-  @retval EFI_TIMEOUT The operation is time out.
-  @retval EFI_UNSUPPORTED The device is not ready for executing.
-  @retval EFI_SUCCESS The cmd executes successfully.
-
-**/
-EFI_STATUS
-EFIAPI
-AhciIdentify (
-  IN AHCI_CONTEXT *AhciContext,
-  IN UINT8Port,
-  IN UINT8PortMultiplier,
-  IN OUT ATA_IDENTIFY_DATA*Buffer
-  )
-{
-  EFI_STATUS   Status;
-  EFI_ATA_COMMAND_BLOCKAtaCommandBlock;
-
-  if (AhciContext == NULL || Buffer == NULL) {
-return EFI_INVALID_PARAMETER;
-  }
-
-  ZeroMem (, sizeof (EFI_ATA_COMMAND_BLOCK));
-
-  AtaCommandBlock.AtaCommand = ATA_CMD_IDENTIFY_DRIVE;
-  AtaCommandBlock.AtaSectorCount = 1;
-
-  Status = AhciPioTransfer (
- AhciContext,
- Port,
- PortMultiplier,
- NULL,
- 0,
- TRUE,
- ,
- NULL,
- Buffer,
- sizeof (ATA_IDENTIFY_DATA),
- ATA_TIMEOUT
- );
-
-  return Status;
-}
-
 /**
   Allocate transfer-related data struct which is used at AHCI mode.
 
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
index 037f81ac24..2076b0411b 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalAhciMode.h
@@ -293,29 +293,6 @@ typedef struct {
   UINT32AhciBar;
 } AHCI_CONTEXT;
 
-/**
-  Send Buffer cmd to specific device.
-
-  @param  AhciContext The pointer to the AHCI_CONTEXT.
-  @param  PortThe number of port.
-  @param  PortMultiplier  The timeout Value of stop.
-  @param  Buffer  The Data Buffer to store IDENTIFY PACKET Data.
-
-  @retval EFI_DEVICE_ERRORThe cmd abort with error occurs.
-  @retval EFI_TIMEOUT The operation is time out.
-  @retval EFI_UNSUPPORTED The device is not ready for executing.
-  @retval EFI_SUCCESS The cmd executes successfully.
-
-**/
-EFI_STATUS
-EFIAPI
-AhciIdentify (
-  IN AHCI_CONTEXT *AhciContext,
-  IN UINT8Port,
-  IN UINT8PortMultiplier,
-  IN OUT ATA_IDENTIFY_DATA*Buffer
-  );
-
 /**
   Allocate transfer-related data struct which is used at AHCI mode.
 
diff --git