Skip to content

Fix: Add SP recovery in UEFI and disable SERR forwarding - #644

Merged
gowthamsiddarthd merged 2 commits into
ARM-software:mainfrom
SapthagiriP:main
Oct 16, 2026
Merged

gowthamsiddarthd merged 2 commits into
ARM-software:mainfrom
SapthagiriP:main

Conversation

@SapthagiriP

Copy link
Copy Markdown
Contributor
  • disable SERR forwarding during disable reporting
  • restore SP through ACS restore mechanism

    SERR reporting is enable during val_pcie_enable_eru
therefore disable it during val_pcie_disable_eru

Signed-off-by: sapthagiri padmanabhan <sapthagiri.padmanabhan@arm.com>
Change-Id: I0a37d08edd20ce9a31254917445f018e71f7c092
- Add an ACS exception return handler for UEFI ACPI and UEFI DT.
- Copy saved recovery GPRs into EFI_SYSTEM_CONTEXT_AARCH64 before returning from the ESR handler.
- Store the saved recovery SP in EFI_SYSTEM_CONTEXT_AARCH64.SP.
- Redirect EFI_SYSTEM_CONTEXT_AARCH64.ELR to the ACS handler when SP-aware recovery is requested.
- Program ELR_EL2 in the handler with the actual test recovery branch.
- Restore SP from EFI_SYSTEM_CONTEXT_AARCH64.SP before the final eret.
- Restore x16 and x17 before returning to avoid clobbering interrupted state.
- Keep normal ELR-only updates unchanged when SP-aware recovery is not armed.

Signed-off-by: sapthagiri padmanabhan <sapthagiri.padmanabhan@arm.com>
Change-Id: Ic2f86ad5492840d5e14758e75a284898e9286ab1
@gowthamsiddarthd
gowthamsiddarthd merged commit fed391e into ARM-software:main Oct 16, 2026
29 checks passed
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.

2 participants