* [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe
@ 2020-04-03 11:48 Leif Lindholm
2020-04-06 11:55 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Leif Lindholm @ 2020-04-03 11:48 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel
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>
---
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,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe
2020-04-03 11:48 [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe Leif Lindholm
@ 2020-04-06 11:55 ` Ard Biesheuvel
2020-04-06 12:09 ` Leif Lindholm
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2020-04-06 11:55 UTC (permalink / raw)
To: Leif Lindholm, devel
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,
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe
2020-04-06 11:55 ` Ard Biesheuvel
@ 2020-04-06 12:09 ` Leif Lindholm
0 siblings, 0 replies; 3+ messages in thread
From: Leif Lindholm @ 2020-04-06 12:09 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: devel
On Mon, Apr 06, 2020 at 13:55:44 +0200, Ard Biesheuvel wrote:
> 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>
Thanks!
Pushed as ee026ea78b0e.
> > ---
> > 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,
> >
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-06 12:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-03 11:48 [PATCH 1/1] ArmPkg: rename misleading local #define in CpuDxe Leif Lindholm
2020-04-06 11:55 ` Ard Biesheuvel
2020-04-06 12:09 ` Leif Lindholm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox