[edk2-devel] [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe
Ard Biesheuvel
ard.biesheuvel at arm.com
Mon Apr 6 11:55:44 UTC 2020
On 4/3/20 1:48 PM, Leif Lindholm wrote:
> The local #define TT_ATTR_INDX_INVALID is used as a local error code
> in the AArch64 implementation, but is misleadingly named to match the
> definitions in ArmPkg/Include/Chipset/AArch64Mmu.h.
>
> Rename it INVALID_ENTRY to reduce confusion and improve readability.
>
> Signed-off-by: Leif Lindholm <leif at nuviainc.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel at arm.com>
> ---
> ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c b/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
> index 29fa08f9e07c..fca2d4f7638a 100644
> --- a/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
> +++ b/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
> @@ -13,7 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> #include <Library/MemoryAllocationLib.h>
> #include "CpuDxe.h"
>
> -#define TT_ATTR_INDX_INVALID ((UINT32)~0)
> +#define INVALID_ENTRY ((UINT32)~0)
>
> #define MIN_T0SZ 16
> #define BITS_PER_LEVEL 9
> @@ -98,7 +98,7 @@ GetFirstPageAttribute (
> {
> return FirstEntry & TT_ATTR_INDX_MASK;
> } else {
> - return TT_ATTR_INDX_INVALID;
> + return INVALID_ENTRY;
> }
> }
>
> @@ -139,8 +139,8 @@ GetNextEntryAttribute (
> // If Entry is a Table Descriptor type entry then go through the sub-level table
> if ((EntryType == TT_TYPE_BLOCK_ENTRY) ||
> ((TableLevel == 3) && (EntryType == TT_TYPE_BLOCK_ENTRY_LEVEL3))) {
> - if ((*PrevEntryAttribute == TT_ATTR_INDX_INVALID) || (EntryAttribute != *PrevEntryAttribute)) {
> - if (*PrevEntryAttribute != TT_ATTR_INDX_INVALID) {
> + if ((*PrevEntryAttribute == INVALID_ENTRY) || (EntryAttribute != *PrevEntryAttribute)) {
> + if (*PrevEntryAttribute != INVALID_ENTRY) {
> // Update GCD with the last region
> SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,
> *StartGcdRegion,
> @@ -164,7 +164,7 @@ GetNextEntryAttribute (
> (BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel))),
> PrevEntryAttribute, StartGcdRegion);
> } else {
> - if (*PrevEntryAttribute != TT_ATTR_INDX_INVALID) {
> + if (*PrevEntryAttribute != INVALID_ENTRY) {
> // Update GCD with the last region
> SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,
> *StartGcdRegion,
> @@ -173,7 +173,7 @@ GetNextEntryAttribute (
>
> // Start of the new region
> *StartGcdRegion = BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel));
> - *PrevEntryAttribute = TT_ATTR_INDX_INVALID;
> + *PrevEntryAttribute = INVALID_ENTRY;
> }
> }
> }
> @@ -238,7 +238,7 @@ SyncCacheConfig (
> &PageAttribute, &BaseAddressGcdRegion);
>
> // Update GCD with the last region if valid
> - if (PageAttribute != TT_ATTR_INDX_INVALID) {
> + if (PageAttribute != INVALID_ENTRY) {
> SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,
> BaseAddressGcdRegion,
> EndAddressGcdRegion - BaseAddressGcdRegion,
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#56983): https://edk2.groups.io/g/devel/message/56983
Mute This Topic: https://groups.io/mt/72746432/1813853
Mute #define: https://groups.io/mk?hashtag=define&subid=3943202
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list