Skip to content

Commit

Permalink
Revert "SecurityPkg: Add RPMC Index to the RpmcLib"
Browse files Browse the repository at this point in the history
This reverts commit 6c8dd15.

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@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Nishant C Mistry <nishant.c.mistry@intel.com>
Signed-off-by: Liming Gao <gaoliming@byosoft.com.cn>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
  • Loading branch information
lgao4 authored and mergify[bot] committed Nov 26, 2020
1 parent 388f9a9 commit e9d62ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 1 addition & 5 deletions SecurityPkg/Include/Library/RpmcLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,23 +23,20 @@ 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.
**/
EFI_STATUS
EFIAPI
IncrementMonotonicCounter (
IN UINT8 CounterIndex
VOID
);

#endif
Expand Down
6 changes: 1 addition & 5 deletions SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -22,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
EFI_STATUS
EFIAPI
RequestMonotonicCounter (
IN UINT8 CounterIndex,
OUT UINT32 *CounterValue
)
{
Expand All @@ -33,16 +31,14 @@ 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.
**/
EFI_STATUS
EFIAPI
IncrementMonotonicCounter (
IN UINT8 CounterIndex
VOID
)
{
ASSERT (FALSE);
Expand Down

0 comments on commit e9d62ef

Please sign in to comment.