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@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>

diff --git a/SecurityPkg/Include/Library/RpmcLib.h b/SecurityPkg/Include/Library/RpmcLib.h
index 3c15bce1ce85f1950e03ec3b8a4bc602524e8d22..5882bfae2f2475d24874ea97f64da5c0d93f57cf 100644 (file)
--- a/SecurityPkg/Include/Library/RpmcLib.h
+++ b/SecurityPkg/Include/Library/RpmcLib.h
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /**\r
   Requests the monotonic counter from the designated RPMC counter.\r
 \r
-  @param[in]    CounterIndex            The RPMC index\r
   @param[out]   CounterValue            A pointer to a buffer to store the RPMC value.\r
 \r
   @retval       EFI_SUCCESS             The operation completed successfully.\r
@@ -24,15 +23,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 RequestMonotonicCounter (\r
-  IN  UINT8   CounterIndex,\r
   OUT UINT32  *CounterValue\r
   );\r
 \r
 /**\r
   Increments the monotonic counter in the SPI flash device by 1.\r
 \r
-  @param[in]    CounterIndex            The RPMC index\r
-\r
   @retval       EFI_SUCCESS             The operation completed successfully.\r
   @retval       EFI_DEVICE_ERROR        A device error occurred while attempting to update the counter.\r
   @retval       EFI_UNSUPPORTED         The operation is un-supported.\r
@@ -40,7 +36,7 @@ RequestMonotonicCounter (
 EFI_STATUS\r
 EFIAPI\r
 IncrementMonotonicCounter (\r
-  IN  UINT8   CounterIndex\r
+  VOID\r
   );\r
 \r
 #endif\r

diff --git a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
index 697e493a7cea8e7802babe7c50fa6e3ceebd3007..e1dd09eb10a0075682babd78b86e13bd873cd363 100644 (file)
--- a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
+++ b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c
@@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /**\r
   Requests the monotonic counter from the designated RPMC counter.\r
 \r
-  @param[in]    CounterIndex            The RPMC index\r
   @param[out]   CounterValue            A pointer to a buffer to store the RPMC value.\r
 \r
   @retval       EFI_SUCCESS             The operation completed successfully.\r
@@ -22,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 RequestMonotonicCounter (\r
-  IN  UINT8   CounterIndex,\r
   OUT UINT32  *CounterValue\r
   )\r
 {\r
@@ -33,8 +31,6 @@ RequestMonotonicCounter (
 /**\r
   Increments the monotonic counter in the SPI flash device by 1.\r
 \r
-  @param[in]    CounterIndex            The RPMC index\r
-\r
   @retval       EFI_SUCCESS             The operation completed successfully.\r
   @retval       EFI_DEVICE_ERROR        A device error occurred while attempting to update the counter.\r
   @retval       EFI_UNSUPPORTED         The operation is un-supported.\r
@@ -42,7 +38,7 @@ RequestMonotonicCounter (
 EFI_STATUS\r
 EFIAPI\r
 IncrementMonotonicCounter (\r
-  IN  UINT8   CounterIndex\r
+  VOID\r
   )\r
 {\r
   ASSERT (FALSE);\r