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.

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

Update to MdePkg Versions of ARM/AARCH64 Libs #196

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Conversation

os-d
Copy link
Contributor

@os-d os-d commented Sep 12, 2024

edk2 PR tianocore/edk2#6048 moved some architectural pieces
from ArmPkg to MdePkg. This patch updates all platforms (& etc.) in edk2-platforms
to use the MdePkg versions of these libs.

This patch is dependent on the above edk2 merging and must not be merged before that
goes in.

This is the v2 of https://edk2.groups.io/g/devel/topic/patch_v1_0_3_update_to/108166767 as edk2-platforms has now been moved to PRs instead of the mailing list.

Diff from v1:

  • Change #include <[Arm|AArch64]/AsmMacroLib.h> to #include <AsmMacroLib.h> to follow the change requested in the edk2 PR
  • Drop ArmSoftFloatLib changes here as that is getting removed in a separate PR

edk2 PR tianocore/edk2#6048 moves
AsmMacroIoLib.h and AsmMacroIoLibV8.h to MdePkg and renames
them to Arm/AsmMacroLib.h and AArch64/AsmMacroLib.h, respectively.

This updates all edk2-platforms in one go, as this is a breaking
change and no functional change.

Cc: Ard Biesheuvel <[email protected]>
Cc: Leif Lindholm <[email protected]>
Cc: Michael D Kinney <[email protected]>

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <[email protected]>
edk2 PR tianocore/edk2#6048 moves
ArmCompilerIntrinsicsLib to MdePkg and into MdeLibs.dsc.inc.

This patch drops all of the references to the ArmPkg location as
these platforms are now getting it from MdeLibs.dsc.inc. This is
done in one shot as it is a breaking change and has no functional
impact.

Cc: Ard Biesheuvel <[email protected]>
Cc: Leif Lindholm <[email protected]>
Cc: Michael D Kinney <[email protected]>

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <[email protected]>
@os-d
Copy link
Contributor Author

os-d commented Sep 12, 2024

@ardbiesheuvel here is the updated PR

Copy link
Contributor

@hrw hrw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For SbsaQemu:

Reviewed-by: Marcin Juszkiewicz [email protected]

Copy link
Member

@leiflindholm leiflindholm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy for this to go in, but will give others a chance to speak up.

@os-d
Copy link
Contributor Author

os-d commented Sep 12, 2024

tianocore/edk2#6048 merged, so as soon as folks as satisfied, this can go in.

@ardbiesheuvel
Copy link
Member

@mdkinney @leiflindholm

Please merge this PR. All ARM/AARCH64 builds will remain broken otherwise, and we should not wait for all code owners to sign off on this.

Also, the criteria that it claims to operate by, i.e., Merging can be performed automatically with 1 approving review., seem to be met, as several code owners have already approved, but in spite of that, merging is blocked.

This is another case where maintainers need a button to simply override the CI or GitHub logic when it is not making sense.

@lgao4
Copy link
Contributor

lgao4 commented Sep 13, 2024

@changab , @samimujawar , please approve this change to unblock the platform build failure.

@apalos
Copy link
Contributor

apalos commented Sep 13, 2024

For PlatformStandaloneMmRpmb
Acked-by: Ilias Apalodimas [email protected]

Copy link
Contributor

@samimujawar samimujawar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For Platform/ARM/* and Silicon/ARM/*
These changes look good to me.

@os-d os-d mentioned this pull request Sep 13, 2024
@ardbiesheuvel
Copy link
Member

@mdkinney @leiflindholm

Ping again. All ARM platforms are currently build-broken in edk2-platforms, and due to the GitHub PR policy changes, you are the only persons that can actually do anything about this.

Clearly, managing edk2-platforms in this manner is not ready to be rolled out, so please revert those changes so that people that work with these repositories daily can get their workflow unbroken (I suppose neither of you are actual users of edk2-platforms)

@leiflindholm
Copy link
Member

Clearly, managing edk2-platforms in this manner is not ready to be rolled out, so please revert those changes so that people that work with these repositories daily can get their workflow unbroken (I suppose neither of you are actual users of edk2-platforms)

Not a daily user, certainly.

We've clearly hit a pathological case for edk2-platforms which doesn't affect us on edk2 because of the use of mergify there. All the reviewers assigned by the tianocore-assign-reviewers script need to approve a PR in order to merge it. That would be nigh-unworkable if all our maintainers were super responsive (but illness, holiday, ...).

For now, unless there is some project setting to enable merging with a single approval only, we need to disable tianocore-assign-reviewers and go back to manual assignment.

@mdkinney @bcran

@ghost
Copy link

ghost commented Sep 16, 2024

Agreed, clearly this isn't working so for now we should go back to patch review of changes for edk2-platforms.

I'm also seeing issues in edk2 with regular warnings about non-collaborator reviewers. Personally I'm thinking Github is not the right platform for us, but I realize a lot of time has gone into this so there will be reluctance to try something else.

@hrw
Copy link
Contributor

hrw commented Sep 16, 2024

TBH: I prefer GitHub PR over mailing list. EDK2 with its use of wrong end-of-line markers make merging patchsets from ML painful especially compared to "git checkout origin/pr/196" command.

What we should change is "code owners" requirement.

@ghost
Copy link

ghost commented Sep 16, 2024

TBH: I prefer GitHub PR over mailing list. EDK2 with its use of wrong end-of-line markers make merging patchsets from ML painful especially compared to "git checkout origin/pr/196" command.

What we should change is "code owners" requirement.

I prefer GH over email review too. I'm not sure what configuration is in place wrt who needs to review changes, but something's clearly broken.

@mdkinney
Copy link
Member

edk2 repo is not using CODEOWNERS feature at this time. That is what is preventing this one from being merged. I will disable CODEOWNERS requirement setting and match edk2 settings so the use of the CODEOWNERS feature can be discussed further.

@mdkinney
Copy link
Member

Setting has ben updated with requirements for 1 approving review. This PR is now unblocked.

@hrw hrw merged commit 3bbb17a into tianocore:master Sep 16, 2024
1 check passed
@hrw
Copy link
Contributor

hrw commented Sep 16, 2024

Thanks @mdkinney

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants