Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Tidy up EFI code in interrupt_init()

Browse source 
The ll_boot_init() check handles the EFI case so we don't need the rest
of the code. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2023-07-15 21:38:40 -06:00 committed by Bin Meng
parent 70f2030f02
commit b73dba7a83
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/x86/cpu/i386/interrupt.c
View file

@ -266,6 +266,10 @@ int interrupt_init(void)
struct udevice *dev; struct udevice *dev;
int ret; int ret;
/*
* When running as an EFI application we are not in control of
* interrupts and should leave them alone.
*/
if (!ll_boot_init()) if (!ll_boot_init())
return 0; return 0;
@ -274,11 +278,6 @@ int interrupt_init(void)
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
return ret; return ret;
/*
* When running as an EFI application we are not in control of
* interrupts and should leave them alone.
*/
#ifndef CONFIG_EFI_APP
/* Just in case... */ /* Just in case... */
disable_interrupts(); disable_interrupts();
@ -294,14 +293,8 @@ int interrupt_init(void)
/* Initialize core interrupt and exception functionality of CPU */ /* Initialize core interrupt and exception functionality of CPU */
cpu_init_interrupts(); cpu_init_interrupts();
/* /* It is now safe to enable interrupts */
* It is now safe to enable interrupts.
*
* TODO(sjg@chromium.org): But we don't handle these correctly when
* booted from EFI.
*/
enable_interrupts(); enable_interrupts();
#endif
return 0; return 0;
} }