提交 b9187984 编写于 作者: Z Zheng Zengkai

efi/libstub: Fix build error in efi-stub.c for riscv

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I66G0M

-----------------------------------------------

Commit 36a1a891 ("efi/loongarch: Add efistub booting support")
introduced the following macro definition for riscv in file
drivers/firmware/efi/libstub/efi-stub.c

 # define EFI_RT_VIRTUAL_LIMIT  DEFAULT_MAP_WINDOW_64
 # define EFI_RT_VIRTUAL_LIMIT  TASK_SIZE_MIN
 # define EFI_RT_VIRTUAL_LIMIT  TASK_SIZE

but related patches have not been merged for riscv, like
e8a62cc2 ("riscv: Implement sv48 support"),
01abdfea ("riscv: compat: Support TASK_SIZE for compat mode"),

Causing build error in riscv:

build failed: riscv, allmodconfig

<line too long ...>
n this function); did you mean ‘TASK_SIZE_MAX’?
  # define EFI_RT_VIRTUAL_LIMIT TASK_SIZE_MIN
                                ^
drivers/firmware/efi/libstub/efi-stub.c:289:31: note: in expansion of macro ‘EFI_RT_VIRTUAL_LIMIT’
   static const u64 headroom = EFI_RT_VIRTUAL_LIMIT -
                               ^~~~~~~~~~~~~~~~~~~~
drivers/firmware/efi/libstub/efi-stub.c:44:32: note: each undeclared identifier is reported only once for each function it appears in
  # define EFI_RT_VIRTUAL_LIMIT TASK_SIZE_MIN
                                ^
drivers/firmware/efi/libstub/efi-stub.c:289:31: note: in expansion of macro ‘EFI_RT_VIRTUAL_LIMIT’
   static const u64 headroom = EFI_RT_VIRTUAL_LIMIT -
                               ^~~~~~~~~~~~~~~~~~~~
make[4]: *** [drivers/firmware/efi/libstub/efi-stub.o] Error 1
make[3]: *** [drivers/firmware/efi/libstub] Error 2
make[2]: *** [drivers/firmware/efi] Error 2
make[1]: *** [drivers/firmware] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2

Fix it by removing the CONFIG_RISCV condition for EFI_RT_VIRTUAL_LIMIT definition.

Fixes: 36a1a891 ("efi/loongarch: Add efistub booting support")
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 363c0c87
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
# define EFI_RT_VIRTUAL_LIMIT DEFAULT_MAP_WINDOW_64 # define EFI_RT_VIRTUAL_LIMIT DEFAULT_MAP_WINDOW_64
#elif defined(CONFIG_RISCV) || defined(CONFIG_LOONGARCH) #elif defined(CONFIG_LOONGARCH)
# define EFI_RT_VIRTUAL_LIMIT TASK_SIZE_MIN # define EFI_RT_VIRTUAL_LIMIT TASK_SIZE_MIN
#else #else
# define EFI_RT_VIRTUAL_LIMIT TASK_SIZE # define EFI_RT_VIRTUAL_LIMIT TASK_SIZE
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册