Commit 8ff059b8 authored by Ard Biesheuvel's avatar Ard Biesheuvel

efi: ia64: move IA64-only declarations to new asm/efi.h header

Move some EFI related declarations that are only referenced on IA64 to
a new asm/efi.h arch header.

Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 5c8fe583
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_EFI_H
#define _ASM_EFI_H
typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);
void *efi_get_pal_addr(void);
void efi_map_pal_code(void);
void efi_memmap_walk(efi_freemem_callback_t, void *);
void efi_memmap_walk_uc(efi_freemem_callback_t, void *);
void efi_gettimeofday(struct timespec64 *ts);
#endif
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/efi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/kregs.h> #include <asm/kregs.h>
#include <asm/meminit.h> #include <asm/meminit.h>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/numa.h> #include <linux/numa.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <asm/efi.h>
#include <asm/numa.h> #include <asm/numa.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/setup.h> #include <asm/setup.h>
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
#include <linux/gfp.h> #include <linux/gfp.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/efi.h>
#include <asm/meminit.h> #include <asm/meminit.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/efi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mca.h> #include <asm/mca.h>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/sched/cputime.h> #include <linux/sched/cputime.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/efi.h>
#include <asm/hw_irq.h> #include <asm/hw_irq.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/sal.h> #include <asm/sal.h>
......
...@@ -20,14 +20,12 @@ ...@@ -20,14 +20,12 @@
#include <linux/genalloc.h> #include <linux/genalloc.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm/efi.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pal.h> #include <asm/pal.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
extern void __init efi_memmap_walk_uc(efi_freemem_callback_t, void *);
struct uncached_pool { struct uncached_pool {
struct gen_pool *pool; struct gen_pool *pool;
struct mutex add_chunk_mutex; /* serialize adding a converted chunk */ struct mutex add_chunk_mutex; /* serialize adding a converted chunk */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/efi.h>
#include <asm/meminit.h> #include <asm/meminit.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/mca.h> #include <asm/mca.h>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/efi.h> #include <linux/efi.h>
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/efi.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/meminit.h> #include <asm/meminit.h>
#include <asm/numa.h> #include <asm/numa.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/swiotlb.h> #include <linux/swiotlb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/efi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/numa.h> #include <asm/numa.h>
#include <asm/patch.h> #include <asm/patch.h>
......
...@@ -167,8 +167,6 @@ struct capsule_info { ...@@ -167,8 +167,6 @@ struct capsule_info {
int __efi_capsule_setup_info(struct capsule_info *cap_info); int __efi_capsule_setup_info(struct capsule_info *cap_info);
typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);
/* /*
* Types and defines for Time Services * Types and defines for Time Services
*/ */
...@@ -605,10 +603,6 @@ efi_guid_to_str(efi_guid_t *guid, char *out) ...@@ -605,10 +603,6 @@ efi_guid_to_str(efi_guid_t *guid, char *out)
} }
extern void efi_init (void); extern void efi_init (void);
extern void *efi_get_pal_addr (void);
extern void efi_map_pal_code (void);
extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
extern void efi_gettimeofday (struct timespec64 *ts);
#ifdef CONFIG_EFI #ifdef CONFIG_EFI
extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment