diff options
| author | Girish Pathak <girish.pathak at arm.com> | 2017-09-26 21:15:14 +0100 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2018-04-23 18:04:08 +0100 |
| commit | 3b6ad3339be2cb14ddc2e4d55e683a2d9bd978b1 (patch) | |
| tree | 35d4137f6ed13e3c26e50bd0128f82b52705204d | |
| parent | 4d979e9537d8d6e3f861ca589d1a03e56cb0049b (diff) | |
| download | edk2-platforms-3b6ad3339be2cb14ddc2e4d55e683a2d9bd978b1.tar.xz | |
ARM/VExpressPkg: Add and update debug ASSERTS
This change adds some debug assertions e.g to catch NULL pointer errors
missing in PL11Lcd and HdLcd platform libraries.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Girish Pathak <girish.pathak@arm.com>
Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
| -rw-r--r-- | Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c | 22 | ||||
| -rw-r--r-- | Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c | 24 |
2 files changed, 44 insertions, 2 deletions
diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c index 80603f04df..5247b8e038 100644 --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c @@ -153,6 +153,9 @@ LcdPlatformGetVram ( EFI_STATUS Status;
EFI_ALLOCATE_TYPE AllocationType;
+ ASSERT (VramBaseAddress != NULL);
+ ASSERT (VramSize != NULL);
+
// Set the vram size
*VramSize = LCD_VRAM_SIZE;
@@ -171,6 +174,7 @@ LcdPlatformGetVram ( VramBaseAddress
);
if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
return Status;
}
@@ -181,8 +185,8 @@ LcdPlatformGetVram ( *VramSize,
EFI_MEMORY_WC
);
- ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
gBS->FreePages (*VramBaseAddress, EFI_SIZE_TO_PAGES (*VramSize));
return Status;
}
@@ -221,6 +225,7 @@ LcdPlatformSetMode ( EFI_STATUS Status;
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -279,7 +284,10 @@ LcdPlatformQueryMode ( OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info
)
{
+ ASSERT (Info != NULL);
+
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -343,7 +351,18 @@ LcdPlatformGetTimings ( OUT UINT32* VFrontPorch
)
{
+ // One of the pointers is NULL
+ ASSERT (HRes != NULL);
+ ASSERT (HSync != NULL);
+ ASSERT (HBackPorch != NULL);
+ ASSERT (HFrontPorch != NULL);
+ ASSERT (VRes != NULL);
+ ASSERT (VSync != NULL);
+ ASSERT (VBackPorch != NULL);
+ ASSERT (VFrontPorch != NULL);
+
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -376,6 +395,7 @@ LcdPlatformGetBpp ( )
{
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c index 3e3102623e..3d2ec7b1bf 100644 --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c @@ -205,6 +205,9 @@ LcdPlatformGetVram ( Status = EFI_SUCCESS;
+ ASSERT (VramBaseAddress != NULL);
+ ASSERT (VramSize != NULL);
+
// Is it on the motherboard or on the daughterboard?
switch (PL111_CLCD_SITE) {
@@ -225,6 +228,7 @@ LcdPlatformGetVram ( VramBaseAddress
);
if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
return Status;
}
@@ -235,8 +239,8 @@ LcdPlatformGetVram ( *VramSize,
EFI_MEMORY_WC
);
- ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
gBS->FreePages (*VramBaseAddress, EFI_SIZE_TO_PAGES (*VramSize));
return Status;
}
@@ -294,6 +298,7 @@ LcdPlatformSetMode ( UINT32 SysId;
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -369,7 +374,10 @@ LcdPlatformQueryMode ( OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info
)
{
+ ASSERT (Info != NULL);
+
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -433,7 +441,18 @@ LcdPlatformGetTimings ( OUT UINT32* VFrontPorch
)
{
+ // One of the pointers is NULL
+ ASSERT (HRes != NULL);
+ ASSERT (HSync != NULL);
+ ASSERT (HBackPorch != NULL);
+ ASSERT (HFrontPorch != NULL);
+ ASSERT (VRes != NULL);
+ ASSERT (VSync != NULL);
+ ASSERT (VBackPorch != NULL);
+ ASSERT (VFrontPorch != NULL);
+
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
@@ -465,7 +484,10 @@ LcdPlatformGetBpp ( OUT LCD_BPP * Bpp
)
{
+ ASSERT (Bpp != NULL);
+
if (ModeNumber >= LcdPlatformGetMaxMode ()) {
+ ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
}
|