Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CHERRY-PICK][REBASE & FF] Revert Mu Commits In Favor of edk2 Commits #327

Merged
merged 7 commits into from
Aug 29, 2024
Merged

[CHERRY-PICK][REBASE & FF] Revert Mu Commits In Favor of edk2 Commits #327

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a5b9fd1
Revert "FmpDevicePkg: Assert on PcdFmpDeviceImageTypeIdGuid Size Mism…
os-d Aug 29, 2024
ac69f3c
[CHERRY-PICK] FmpDevicePkg: Assert on PcdFmpDeviceImageTypeIdGuid Siz…
Nov 6, 2018
883e9dc
Revert "EmbeddedPkg: Mark DMA Memory Allocations XP By Default"
os-d Aug 29, 2024
2087426
[CHERRY-PICK] EmbeddedPkg: Mark DMA Memory Allocations XP By Default
os-d Jul 3, 2024
34ab0f7
Revert "PrmPkg: Don't Set Access Attributes of Runtime MMIO Ranges (#…
os-d Aug 29, 2024
b6598e5
[CHERRY-PICK] PrmPkg: Don't Set Access Attributes of Runtime MMIO Ranges
TaylorBeebe Nov 8, 2022
264ed6d
[CHERRY-PICK] EmbeddedPkg: NonCoherentDmaLib: Set EFI_MEMORY_XP Capab…
Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,11 +553,11 @@ DmaAllocateAlignedBuffer (

InsertHeadList (&UncachedAllocationList, &Alloc->Link);

// Remap the region with the new attributes
// Remap the region with the new attributes and mark it non-executable
Status = gDS->SetMemorySpaceAttributes (
(PHYSICAL_ADDRESS)(UINTN)Allocation,
EFI_PAGES_TO_SIZE (Pages),
MemType | EFI_MEMORY_XP // MU_CHANGE: Allocate DMA memory XP by default
MemType | EFI_MEMORY_XP
);
if (EFI_ERROR (Status)) {
goto FreeAlloc;
Expand Down
8 changes: 5 additions & 3 deletions FmpDevicePkg/FmpDxe/FmpDxe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,12 @@ GetImageTypeIdGuid (
if (ImageTypeIdGuidSize == sizeof (EFI_GUID)) {
FmpDeviceLibGuid = (EFI_GUID *)PcdGetPtr (PcdFmpDeviceImageTypeIdGuid);
} else {
// MU_CHANGE start - this is a misconfiguration error, we should assert
DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Fall back to ImageTypeIdGuid of gEfiCallerIdGuid. FmpDxe error: misconfiguration\n", mImageIdName));
DEBUG ((
DEBUG_ERROR,
"FmpDxe(%s): Fall back to ImageTypeIdGuid of gEfiCallerIdGuid. FmpDxe error: misconfiguration\n",
mImageIdName
));
ASSERT (FALSE);
// MU_CHANGE end
FmpDeviceLibGuid = &gEfiCallerIdGuid;
}
}
Expand Down
9 changes: 1 addition & 8 deletions PrmPkg/PrmConfigDxe/PrmConfigDxe.c
View file
Open in desktop
os-d marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,7 @@ SetRuntimeMemoryRangeAttributes (
Status = gDS->SetMemorySpaceAttributes (
RuntimeMmioRanges->Range[Index].PhysicalBaseAddress,
(UINT64)RuntimeMmioRanges->Range[Index].Length,
// MU_CHANGE START: The memory space descriptor access attributes are not accurate. Don't pass
// in access attributes so SetMemorySpaceAttributes() doesn't update them.
// EFI_MEMORY_RUNTIME is not a CPU arch attribute, so calling
// SetMemorySpaceAttributes() with only it set will not clear existing page table
// attributes for this region, such as EFI_MEMORY_XP
// Descriptor.Attributes | EFI_MEMORY_RUNTIME
EFI_MEMORY_RUNTIME
// MU_CHANGE END
Descriptor.Attributes | EFI_MEMORY_RUNTIME
);
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
Expand Down