From: Leif Lindholm <leif.lindholm@linaro.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: edk2-devel@lists.01.org, lersek@redhat.com
Subject: Re: [PATCH 3/5] ArmPkg/ArmMmuLib: remove VirtualMask arg from ArmSetMemoryAttributes
Date: Mon, 6 Mar 2017 16:06:12 +0000 [thread overview]
Message-ID: <20170306160612.GY16034@bivouac.eciton.net> (raw)
In-Reply-To: <1488385903-30267-4-git-send-email-ard.biesheuvel@linaro.org>
On Wed, Mar 01, 2017 at 04:31:41PM +0000, Ard Biesheuvel wrote:
> We no longer make use of the ArmMmuLib 'feature' to create aliased
> memory ranges with mismatched attributes, and in fact, it was only
> wired up in the ARM version to begin with.
>
> So remove the VirtualMask argument from ArmSetMemoryAttributes()'s
> prototype, and remove the dead code that referred to it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c | 2 +-
> ArmPkg/Include/Library/ArmMmuLib.h | 3 +--
> ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 3 +--
> ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 25 +++++---------------
> 4 files changed, 9 insertions(+), 24 deletions(-)
>
> diff --git a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
> index d0a3fedd3aa7..8150486217cf 100644
> --- a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
> +++ b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
> @@ -210,7 +210,7 @@ CpuSetMemoryAttributes (
> if (EFI_ERROR (Status) || (RegionArmAttributes != ArmAttributes) ||
> ((BaseAddress + Length) > (RegionBaseAddress + RegionLength)))
> {
> - return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes, 0);
> + return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes);
> } else {
> return EFI_SUCCESS;
> }
> diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h
> index d3a302fa8125..fb7fd006417c 100644
> --- a/ArmPkg/Include/Library/ArmMmuLib.h
> +++ b/ArmPkg/Include/Library/ArmMmuLib.h
> @@ -66,8 +66,7 @@ EFI_STATUS
> ArmSetMemoryAttributes (
> IN EFI_PHYSICAL_ADDRESS BaseAddress,
> IN UINT64 Length,
> - IN UINT64 Attributes,
> - IN EFI_PHYSICAL_ADDRESS VirtualMask
> + IN UINT64 Attributes
> );
>
> #endif
> diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> index 77f108971f3e..8bd1c6fad95f 100644
> --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> @@ -450,8 +450,7 @@ EFI_STATUS
> ArmSetMemoryAttributes (
> IN EFI_PHYSICAL_ADDRESS BaseAddress,
> IN UINT64 Length,
> - IN UINT64 Attributes,
> - IN EFI_PHYSICAL_ADDRESS VirtualMask
> + IN UINT64 Attributes
> )
> {
> EFI_STATUS Status;
> diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
> index 93980d6d12db..1112660b434e 100644
> --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
> +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
> @@ -469,8 +469,7 @@ EFI_STATUS
> UpdatePageEntries (
> IN EFI_PHYSICAL_ADDRESS BaseAddress,
> IN UINT64 Length,
> - IN UINT64 Attributes,
> - IN EFI_PHYSICAL_ADDRESS VirtualMask
> + IN UINT64 Attributes
> )
> {
> EFI_STATUS Status;
> @@ -575,11 +574,6 @@ UpdatePageEntries (
> // Mask in new attributes and/or permissions
> PageTableEntry |= EntryValue;
>
> - if (VirtualMask != 0) {
> - // Make this virtual address point at a physical page
> - PageTableEntry &= ~VirtualMask;
> - }
> -
> if (CurrentPageTableEntry != PageTableEntry) {
> Mva = (VOID *)(UINTN)((((UINTN)FirstLevelIdx) << TT_DESCRIPTOR_SECTION_BASE_SHIFT) + (PageTableIndex << TT_DESCRIPTOR_PAGE_BASE_SHIFT));
> if ((CurrentPageTableEntry & TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) == TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) {
> @@ -606,8 +600,7 @@ EFI_STATUS
> UpdateSectionEntries (
> IN EFI_PHYSICAL_ADDRESS BaseAddress,
> IN UINT64 Length,
> - IN UINT64 Attributes,
> - IN EFI_PHYSICAL_ADDRESS VirtualMask
> + IN UINT64 Attributes
> )
> {
> EFI_STATUS Status = EFI_SUCCESS;
> @@ -680,7 +673,7 @@ UpdateSectionEntries (
> // has this descriptor already been coverted to pages?
> if (TT_DESCRIPTOR_SECTION_TYPE_IS_PAGE_TABLE(CurrentDescriptor)) {
> // forward this 1MB range to page table function instead
> - Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes, VirtualMask);
> + Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes);
> } else {
> // still a section entry
>
> @@ -689,9 +682,6 @@ UpdateSectionEntries (
>
> // mask in new attributes and/or permissions
> Descriptor |= EntryValue;
> - if (VirtualMask != 0) {
> - Descriptor &= ~VirtualMask;
> - }
>
> if (CurrentDescriptor != Descriptor) {
> Mva = (VOID *)(UINTN)(((UINTN)FirstLevelTable) << TT_DESCRIPTOR_SECTION_BASE_SHIFT);
> @@ -717,8 +707,7 @@ EFI_STATUS
> ArmSetMemoryAttributes (
> IN EFI_PHYSICAL_ADDRESS BaseAddress,
> IN UINT64 Length,
> - IN UINT64 Attributes,
> - IN EFI_PHYSICAL_ADDRESS VirtualMask
> + IN UINT64 Attributes
> )
> {
> EFI_STATUS Status;
> @@ -736,8 +725,7 @@ ArmSetMemoryAttributes (
> "SetMemoryAttributes(): MMU section 0x%lx length 0x%lx to %lx\n",
> BaseAddress, ChunkLength, Attributes));
>
> - Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes,
> - VirtualMask);
> + Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes);
>
> FlushTlbs = TRUE;
> } else {
> @@ -756,8 +744,7 @@ ArmSetMemoryAttributes (
> "SetMemoryAttributes(): MMU page 0x%lx length 0x%lx to %lx\n",
> BaseAddress, ChunkLength, Attributes));
>
> - Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes,
> - VirtualMask);
> + Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes);
> }
>
> if (EFI_ERROR (Status)) {
> --
> 2.7.4
>
next prev parent reply other threads:[~2017-03-06 16:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-01 16:31 [PATCH 0/5] ArmPkg, ArmVirtPkg ARM: enable non-executable stack Ard Biesheuvel
2017-03-01 16:31 ` [PATCH 1/5] ArmPkg/ArmMmuLib AARCH64: use correct return type for exported functions Ard Biesheuvel
2017-03-06 14:57 ` Leif Lindholm
2017-03-01 16:31 ` [PATCH 2/5] ArmPkg: move ARM version of SetMemoryAttributes to ArmMmuLib Ard Biesheuvel
2017-03-06 16:03 ` Leif Lindholm
2017-03-06 16:05 ` Ard Biesheuvel
2017-03-06 16:21 ` Leif Lindholm
2017-03-01 16:31 ` [PATCH 3/5] ArmPkg/ArmMmuLib: remove VirtualMask arg from ArmSetMemoryAttributes Ard Biesheuvel
2017-03-06 16:06 ` Leif Lindholm [this message]
2017-03-01 16:31 ` [PATCH 4/5] ArmPkg/ArmMmuLib ARM: implement memory permission control routines Ard Biesheuvel
2017-03-06 16:11 ` Leif Lindholm
2017-03-01 16:31 ` [PATCH 5/5] ArmVirtPkg: enable non-executable DXE stack for all platforms Ard Biesheuvel
2017-03-01 19:10 ` Laszlo Ersek
2017-03-01 19:10 ` Ard Biesheuvel
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=20170306160612.GY16034@bivouac.eciton.net \
--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