tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 16:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/ArmTrngLib: Remove ASSERTs in ArmTrngLibConstructor()

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

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Pierre Gondois 2022-11-24 17:17:53 +01:00 committed by mergify[bot]
parent fff6d81270
commit 6ae2b6648e
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArmPkg/Library/ArmTrngLib/ArmTrngLib.c
View File

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