From: "Ard Biesheuvel" <ard.biesheuvel@arm.com>
To: Leif Lindholm <leif@nuviainc.com>, devel@edk2.groups.io
Subject: Re: [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe
Date: Mon, 6 Apr 2020 13:55:44 +0200 [thread overview]
Message-ID: <4ac2f00a-f51c-073d-de13-86e9d4cee565@arm.com> (raw)
In-Reply-To: <20200403114847.15760-1-leif@nuviainc.com>
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@nuviainc.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@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,
>
next prev parent reply other threads:[~2020-04-06 11:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 11:48 [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe Leif Lindholm
2020-04-06 11:55 ` Ard Biesheuvel [this message]
2020-04-06 12:09 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ac2f00a-f51c-073d-de13-86e9d4cee565@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox