[PATCH v3 1/4] ArmPkg/ArmTrngLib: Remove ASSERTs in ArmTrngLibConstructor()


PierreGondois
 

From: Pierre Gondois <pierre.gondois@...>

Remove ASSERTs in ArmTrngLibConstructor() that prevent from
booting on DEBUG builds.

Signed-off-by: Pierre Gondois <Pierre.Gondois@...>
---
ArmPkg/Library/ArmTrngLib/ArmTrngLib.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c b/ArmPkg/Library/ArmT=
rngLib/ArmTrngLib.c
index 3278722320c8..c2555f3ea6fe 100644
--- a/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
+++ b/ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
@@ -331,14 +331,12 @@ ArmTrngLibConstructor (
ArmMonitorCall (&Parameters);
Status =3D TrngStatusToReturnStatus ((INT32)Parameters.Arg0);
if (RETURN_ERROR (Status)) {
- ASSERT_RETURN_ERROR (Status);
goto ErrorHandler;
}
=20
// Cf [1] s2.1.3 'Caller responsibilities',
// SMCCC version must be greater or equal than 1.1
if ((INT32)Parameters.Arg0 < 0x10001) {
- ASSERT_RETURN_ERROR (RETURN_UNSUPPORTED);
goto ErrorHandler;
}
=20
@@ -350,14 +348,12 @@ ArmTrngLibConstructor (
// Check that the required features are present.
Status =3D GetArmTrngFeatures (ARM_SMC_ID_TRNG_RND, NULL);
if (RETURN_ERROR (Status)) {
- ASSERT_RETURN_ERROR (Status);
goto ErrorHandler;
}
=20
// Check if TRNG UUID is supported and if so trace the GUID.
Status =3D GetArmTrngFeatures (ARM_SMC_ID_TRNG_GET_UUID, NULL);
if (RETURN_ERROR (Status)) {
- ASSERT_RETURN_ERROR (Status);
goto ErrorHandler;
}
=20
@@ -365,7 +361,6 @@ ArmTrngLibConstructor (
=20
Status =3D GetArmTrngUuid (&Guid);
if (RETURN_ERROR (Status)) {
- ASSERT_RETURN_ERROR (Status);
goto ErrorHandler;
}
=20
--=20
2.25.1

Join devel@edk2.groups.io to automatically receive all group messages.