archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2026-02-01 15:59:39 +00:00
Code Issues Projects Releases Wiki Activity

ocvalidate: Add checks for UIScale (#299)

Browse Source
This commit is contained in:
PMheart 2021-11-07 22:52:47 +01:00 committed by GitHub
parent b11e643c23
commit a8db83acea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 75 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/ocvalidate/Makefile
View File

@ -16,7 +16,7 @@ OBJS = $(PROJECT).o \
ValidateMisc.o \
ValidateNvram.o \
ValidatePlatformInfo.o \
ValidateUEFI.o
ValidateUefi.o
#
# OcConfigurationLib targets.
#

2
Utilities/ocvalidate/NvramKeyInfo.c
View File

@ -186,3 +186,5 @@ NVRAM_GUID_MAP mGUIDMaps[] = {
{ &gAppleVendorVariableGuid, &mAppleVendorVariableGuidKeyMaps[0], ARRAY_SIZE (mAppleVendorVariableGuidKeyMaps) },
};
UINTN mGUIDMapsCount = ARRAY_SIZE (mGUIDMaps);
BOOLEAN mHasNvramUIScale = FALSE;

5
Utilities/ocvalidate/NvramKeyInfo.h
View File

@ -48,4 +48,9 @@ typedef struct NVRAM_GUID_MAP_ {
extern NVRAM_GUID_MAP mGUIDMaps[];
extern UINTN mGUIDMapsCount;
/**
Special check for UIScale under NVRAM and UEFI->Output.
**/
extern BOOLEAN mHasNvramUIScale;
#endif // OC_USER_UTILITIES_OCVALIDATE_NVRAM_KEY_INFO_H

7
Utilities/ocvalidate/ValidateNvram.c
View File

@ -140,6 +140,13 @@ ValidateNvramKeyByGuid (
OC_BLOB_GET (VariableMap->Keys[VariableIndex])
));
++ErrorCount;
} else {
//
// Special check for UIScale when it is valid.
//
if (AsciiStrCmp (OC_BLOB_GET (VariableMap->Keys[VariableIndex]), "UIScale") == 0) {
mHasNvramUIScale = TRUE;
}
}
}
}

106
Utilities/ocvalidate/ValidateUEFI.c → Utilities/ocvalidate/ValidateUefi.c
View File

@ -13,6 +13,7 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include "NvramKeyInfo.h"
#include "ocvalidate.h"
#include "OcValidateLib.h"
@ -29,22 +30,22 @@
**/
STATIC
BOOLEAN
UEFIDriverHasDuplication (
UefiDriverHasDuplication (
IN CONST VOID *PrimaryDriver,
IN CONST VOID *SecondaryDriver
)
{
CONST OC_UEFI_DRIVER_ENTRY *UEFIPrimaryDriver;
CONST OC_UEFI_DRIVER_ENTRY *UEFISecondaryDriver;
CONST CHAR8 *UEFIDriverPrimaryString;
CONST CHAR8 *UEFIDriverSecondaryString;
CONST OC_UEFI_DRIVER_ENTRY *UefiPrimaryDriver;
CONST OC_UEFI_DRIVER_ENTRY *UefiSecondaryDriver;
CONST CHAR8 *UefiDriverPrimaryString;
CONST CHAR8 *UefiDriverSecondaryString;
UEFIPrimaryDriver = *(CONST OC_UEFI_DRIVER_ENTRY **) PrimaryDriver;
UEFISecondaryDriver = *(CONST OC_UEFI_DRIVER_ENTRY **) SecondaryDriver;
UEFIDriverPrimaryString = OC_BLOB_GET (&UEFIPrimaryDriver->Path);
UEFIDriverSecondaryString = OC_BLOB_GET (&UEFISecondaryDriver->Path);
UefiPrimaryDriver = *(CONST OC_UEFI_DRIVER_ENTRY **) PrimaryDriver;
UefiSecondaryDriver = *(CONST OC_UEFI_DRIVER_ENTRY **) SecondaryDriver;
UefiDriverPrimaryString = OC_BLOB_GET (&UefiPrimaryDriver->Path);
UefiDriverSecondaryString = OC_BLOB_GET (&UefiSecondaryDriver->Path);
return StringIsDuplicated ("UEFI->Drivers", UEFIDriverPrimaryString, UEFIDriverSecondaryString);
return StringIsDuplicated ("UEFI->Drivers", UefiDriverPrimaryString, UefiDriverSecondaryString);
}
/**
@ -58,31 +59,31 @@ UEFIDriverHasDuplication (
**/
STATIC
BOOLEAN
UEFIReservedMemoryHasOverlap (
UefiReservedMemoryHasOverlap (
IN CONST VOID *PrimaryEntry,
IN CONST VOID *SecondaryEntry
)
{
CONST OC_UEFI_RSVD_ENTRY *UEFIReservedMemoryPrimaryEntry;
CONST OC_UEFI_RSVD_ENTRY *UEFIReservedMemorySecondaryEntry;
UINT64 UEFIReservedMemoryPrimaryAddress;
UINT64 UEFIReservedMemoryPrimarySize;
UINT64 UEFIReservedMemorySecondaryAddress;
UINT64 UEFIReservedMemorySecondarySize;
CONST OC_UEFI_RSVD_ENTRY *UefiReservedMemoryPrimaryEntry;
CONST OC_UEFI_RSVD_ENTRY *UefiReservedMemorySecondaryEntry;
UINT64 UefiReservedMemoryPrimaryAddress;
UINT64 UefiReservedMemoryPrimarySize;
UINT64 UefiReservedMemorySecondaryAddress;
UINT64 UefiReservedMemorySecondarySize;
UEFIReservedMemoryPrimaryEntry = *(CONST OC_UEFI_RSVD_ENTRY **) PrimaryEntry;
UEFIReservedMemorySecondaryEntry = *(CONST OC_UEFI_RSVD_ENTRY **) SecondaryEntry;
UEFIReservedMemoryPrimaryAddress = UEFIReservedMemoryPrimaryEntry->Address;
UEFIReservedMemoryPrimarySize = UEFIReservedMemoryPrimaryEntry->Size;
UEFIReservedMemorySecondaryAddress = UEFIReservedMemorySecondaryEntry->Address;
UEFIReservedMemorySecondarySize = UEFIReservedMemorySecondaryEntry->Size;
UefiReservedMemoryPrimaryEntry = *(CONST OC_UEFI_RSVD_ENTRY **) PrimaryEntry;
UefiReservedMemorySecondaryEntry = *(CONST OC_UEFI_RSVD_ENTRY **) SecondaryEntry;
UefiReservedMemoryPrimaryAddress = UefiReservedMemoryPrimaryEntry->Address;
UefiReservedMemoryPrimarySize = UefiReservedMemoryPrimaryEntry->Size;
UefiReservedMemorySecondaryAddress = UefiReservedMemorySecondaryEntry->Address;
UefiReservedMemorySecondarySize = UefiReservedMemorySecondaryEntry->Size;
if (!UEFIReservedMemoryPrimaryEntry->Enabled || !UEFIReservedMemorySecondaryEntry->Enabled) {
if (!UefiReservedMemoryPrimaryEntry->Enabled || !UefiReservedMemorySecondaryEntry->Enabled) {
return FALSE;
}
if (UEFIReservedMemoryPrimaryAddress < UEFIReservedMemorySecondaryAddress + UEFIReservedMemorySecondarySize
&& UEFIReservedMemorySecondaryAddress < UEFIReservedMemoryPrimaryAddress + UEFIReservedMemoryPrimarySize) {
if (UefiReservedMemoryPrimaryAddress < UefiReservedMemorySecondaryAddress + UefiReservedMemorySecondarySize
&& UefiReservedMemorySecondaryAddress < UefiReservedMemoryPrimaryAddress + UefiReservedMemoryPrimarySize) {
DEBUG ((DEBUG_WARN, "UEFI->ReservedMemory: Entries have overlapped Address and Size "));
return TRUE;
}
@ -114,7 +115,7 @@ ValidateReservedMemoryType (
STATIC
UINT32
CheckUEFIAPFS (
CheckUefiAPFS (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -145,7 +146,7 @@ CheckUEFIAPFS (
STATIC
UINT32
CheckUEFIAppleInput (
CheckUefiAppleInput (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -183,7 +184,7 @@ CheckUEFIAppleInput (
STATIC
UINT32
CheckUEFIAudio (
CheckUefiAudio (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -224,7 +225,7 @@ CheckUEFIAudio (
STATIC
UINT32
CheckUEFIDrivers (
CheckUefiDrivers (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -320,7 +321,7 @@ CheckUEFIDrivers (
UserUefi->Drivers.Values,
UserUefi->Drivers.Count,
sizeof (UserUefi->Drivers.Values[0]),
UEFIDriverHasDuplication
UefiDriverHasDuplication
);
IsRequestBootVarRoutingEnabled = UserUefi->Quirks.RequestBootVarRouting;
@ -371,7 +372,7 @@ CheckUEFIDrivers (
STATIC
UINT32
CheckUEFIInput (
CheckUefiInput (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -405,7 +406,7 @@ CheckUEFIInput (
STATIC
UINT32
CheckUEFIOutput (
CheckUefiOutput (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -425,10 +426,12 @@ CheckUEFIOutput (
UINT32 UserBpp;
BOOLEAN UserSetMax;
INT8 UIScale;
BOOLEAN HasUefiOutputUIScale;
ErrorCount = 0;
UserUefi = &Config->Uefi;
IsTextRendererSystem = FALSE;
HasUefiOutputUIScale = FALSE;
//
// Sanitise strings.
@ -521,6 +524,13 @@ CheckUEFIOutput (
if (UIScale < -1 || UIScale > 2) {
DEBUG ((DEBUG_WARN, "UEFI->Output->UIScale is borked (Can only be between -1 and 2)!\n"));
++ErrorCount;
} else if (UIScale != -1) {
HasUefiOutputUIScale = TRUE;
}
if (HasUefiOutputUIScale && mHasNvramUIScale) {
DEBUG ((DEBUG_WARN, "UIScale is set under both NVRAM and UEFI->Output!\n"));
++ErrorCount;
}
return ErrorCount;
@ -531,7 +541,7 @@ CheckUEFIOutput (
//
STATIC
UINT32
CheckUEFIQuirks (
CheckUefiQuirks (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -553,7 +563,7 @@ CheckUEFIQuirks (
STATIC
UINT32
CheckUEFIReservedMemory (
CheckUefiReservedMemory (
IN OC_GLOBAL_CONFIG *Config
)
{
@ -600,36 +610,36 @@ CheckUEFIReservedMemory (
UserUefi->ReservedMemory.Values,
UserUefi->ReservedMemory.Count,
sizeof (UserUefi->ReservedMemory.Values[0]),
UEFIReservedMemoryHasOverlap
UefiReservedMemoryHasOverlap
);
return ErrorCount;
}
UINT32
CheckUEFI (
CheckUefi (
IN OC_GLOBAL_CONFIG *Config
)
{
UINT32 ErrorCount;
UINTN Index;
STATIC CONFIG_CHECK UEFICheckers[] = {
&CheckUEFIAPFS,
&CheckUEFIAppleInput,
&CheckUEFIAudio,
&CheckUEFIDrivers,
&CheckUEFIInput,
&CheckUEFIOutput,
&CheckUEFIQuirks,
&CheckUEFIReservedMemory
STATIC CONFIG_CHECK UefiCheckers[] = {
&CheckUefiAPFS,
&CheckUefiAppleInput,
&CheckUefiAudio,
&CheckUefiDrivers,
&CheckUefiInput,
&CheckUefiOutput,
&CheckUefiQuirks,
&CheckUefiReservedMemory
};
DEBUG ((DEBUG_VERBOSE, "config loaded into %a!\n", __func__));
ErrorCount = 0;
for (Index = 0; Index < ARRAY_SIZE (UEFICheckers); ++Index) {
ErrorCount += UEFICheckers[Index] (Config);
for (Index = 0; Index < ARRAY_SIZE (UefiCheckers); ++Index) {
ErrorCount += UefiCheckers[Index] (Config);
}
return ReportError (__func__, ErrorCount);

2
Utilities/ocvalidate/ocvalidate.c
View File

@ -36,7 +36,7 @@ CheckConfig (
&CheckMisc,
&CheckNvram,
&CheckPlatformInfo,
&CheckUEFI
&CheckUefi
};
ErrorCount = 0;

2
Utilities/ocvalidate/ocvalidate.h
View File

@ -120,7 +120,7 @@ CheckPlatformInfo (
@return Number of errors detected in UEFI Section.
**/
UINT32
CheckUEFI (
CheckUefi (
IN OC_GLOBAL_CONFIG *Config
);