diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-28 08:26:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-28 08:26:49 -0400 |
| commit | d44d46e9fafaae85b0ebbcdc53999537a199fa2f (patch) | |
| tree | 219ad9e33b8755b5188c39d063b097506d6117ff /arch/riscv | |
| parent | 114c0ebcc10b8a0118d388adcb028b89fbde0eff (diff) | |
| parent | c48e9f310b950e39a91cea74b6708dd4fe2eb39c (diff) | |
Merge tag 'efi-2020-10-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc6
The following UEFI related issues are fixed:
* restore the global data pointer in the RISC-V trap handler
* install EFI_RNG_PROTOCOL only if we have a random number generator
* display human readable string for EFI_RNG_PROTOCOL in efidebug command
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/lib/interrupts.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index cd47e64487..8ff40f0f36 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -111,6 +111,9 @@ ulong handle_trap(ulong cause, ulong epc, ulong tval, struct pt_regs *regs) { ulong is_irq, irq; + /* An UEFI application may have changed gd. Restore U-Boot's gd. */ + efi_restore_gd(); + is_irq = (cause & MCAUSE_INT); irq = (cause & ~MCAUSE_INT); |