[edk2-devel] [PATCH 1/1] Revert "SecurityPkg: Add RPMC Index to the RpmcLib"

[Yao, Jiewen]

Acked-by: Jiewen Yao <Jiewen.yao at intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao at intel.com>

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of
> gaoliming
> Sent: Tuesday, November 24, 2020 9:23 AM
> To: devel at edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao at intel.com>; Wang, Jian J
> <jian.j.wang at intel.com>; Mistry, Nishant C <nishant.c.mistry at intel.com>
> Subject: [edk2-devel] [PATCH 1/1] Revert "SecurityPkg: Add RPMC Index to
> the RpmcLib"
> 
> This reverts commit 6c8dd15c4ae42501438a525ec41299f365f223cb.
> 
> Based on the discussion https://edk2.groups.io/g/devel/message/67764,
> this change is regarded as the feature request. But, it doesn't pass
> reviewed before 202011 stable tag soft feature freeze. So, it should
> not be merged into 202011 stable tag.
> 
> Cc: Jiewen Yao <jiewen.yao at intel.com>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Nishant C Mistry <nishant.c.mistry at intel.com>
> Signed-off-by: Liming Gao <gaoliming at byosoft.com.cn>
> ---
>  This patch targets for 202011 stable tag.
> 
>  SecurityPkg/Include/Library/RpmcLib.h         | 6 +-----
>  SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c | 6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/SecurityPkg/Include/Library/RpmcLib.h
> b/SecurityPkg/Include/Library/RpmcLib.h
> index 3c15bce1ce85..5882bfae2f24 100644
> --- a/SecurityPkg/Include/Library/RpmcLib.h
> +++ b/SecurityPkg/Include/Library/RpmcLib.h
> @@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  /**
>    Requests the monotonic counter from the designated RPMC counter.
> 
> -  @param[in]    CounterIndex            The RPMC index
>    @param[out]   CounterValue            A pointer to a buffer to store the RPMC
> value.
> 
>    @retval       EFI_SUCCESS             The operation completed successfully.
> @@ -24,15 +23,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  EFI_STATUS
>  EFIAPI
>  RequestMonotonicCounter (
> -  IN  UINT8   CounterIndex,
>    OUT UINT32  *CounterValue
>    );
> 
>  /**
>    Increments the monotonic counter in the SPI flash device by 1.
> 
> -  @param[in]    CounterIndex            The RPMC index
> -
>    @retval       EFI_SUCCESS             The operation completed successfully.
>    @retval       EFI_DEVICE_ERROR        A device error occurred while
> attempting to update the counter.
>    @retval       EFI_UNSUPPORTED         The operation is un-supported.
> @@ -40,7 +36,7 @@ RequestMonotonicCounter (
>  EFI_STATUS
>  EFIAPI
>  IncrementMonotonicCounter (
> -  IN  UINT8   CounterIndex
> +  VOID
>    );
> 
>  #endif
> diff --git a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
> b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
> index 697e493a7cea..e1dd09eb10a0 100644
> --- a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
> +++ b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
> @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  /**
>    Requests the monotonic counter from the designated RPMC counter.
> 
> -  @param[in]    CounterIndex            The RPMC index
>    @param[out]   CounterValue            A pointer to a buffer to store the RPMC
> value.
> 
>    @retval       EFI_SUCCESS             The operation completed successfully.
> @@ -22,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  EFI_STATUS
>  EFIAPI
>  RequestMonotonicCounter (
> -  IN  UINT8   CounterIndex,
>    OUT UINT32  *CounterValue
>    )
>  {
> @@ -33,8 +31,6 @@ RequestMonotonicCounter (
>  /**
>    Increments the monotonic counter in the SPI flash device by 1.
> 
> -  @param[in]    CounterIndex            The RPMC index
> -
>    @retval       EFI_SUCCESS             The operation completed successfully.
>    @retval       EFI_DEVICE_ERROR        A device error occurred while
> attempting to update the counter.
>    @retval       EFI_UNSUPPORTED         The operation is un-supported.
> @@ -42,7 +38,7 @@ RequestMonotonicCounter (
>  EFI_STATUS
>  EFIAPI
>  IncrementMonotonicCounter (
> -  IN  UINT8   CounterIndex
> +  VOID
>    )
>  {
>    ASSERT (FALSE);
> --
> 2.27.0.windows.1
> 
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67855): https://edk2.groups.io/g/devel/message/67855
Mute This Topic: https://groups.io/mt/78468601/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-