diff mbox series

[v2,1/2] riscv: errata: sifive: Use SYM_*() assembly macros

Message ID 20240709160536.3690-2-jszhang@kernel.org (mailing list archive)
State Accepted
Commit 6868d12e0205765c1296c7c5e81e515ec015ab89
Headers show
Series riscv: select ARCH_USE_SYM_ANNOTATIONS | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR success PR summary
conchuod/patch-1-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh
conchuod/patch-1-test-2 success .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh
conchuod/patch-1-test-3 success .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh
conchuod/patch-1-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh
conchuod/patch-1-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh
conchuod/patch-1-test-6 warning .github/scripts/patches/tests/checkpatch.sh
conchuod/patch-1-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh
conchuod/patch-1-test-8 success .github/scripts/patches/tests/header_inline.sh
conchuod/patch-1-test-9 success .github/scripts/patches/tests/kdoc.sh
conchuod/patch-1-test-10 success .github/scripts/patches/tests/module_param.sh
conchuod/patch-1-test-11 success .github/scripts/patches/tests/verify_fixes.sh
conchuod/patch-1-test-12 success .github/scripts/patches/tests/verify_signedoff.sh

Commit Message

Jisheng Zhang July 9, 2024, 4:05 p.m. UTC
ENTRY()/END() macros are deprecated and we should make use of the
new SYM_*() macros [1] for better annotation of symbols. Replace the
deprecated ones with the new ones.

[1] https://docs.kernel.org/core-api/asm-annotations.html

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
 arch/riscv/errata/sifive/errata_cip_453.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Clément Léger July 10, 2024, 8:11 a.m. UTC | #1
On 09/07/2024 18:05, Jisheng Zhang wrote:
> ENTRY()/END() macros are deprecated and we should make use of the
> new SYM_*() macros [1] for better annotation of symbols. Replace the
> deprecated ones with the new ones.
> 
> [1] https://docs.kernel.org/core-api/asm-annotations.html
> 
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
>  arch/riscv/errata/sifive/errata_cip_453.S | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/riscv/errata/sifive/errata_cip_453.S b/arch/riscv/errata/sifive/errata_cip_453.S
> index f1b9623fe1de..b1f7b636fe9a 100644
> --- a/arch/riscv/errata/sifive/errata_cip_453.S
> +++ b/arch/riscv/errata/sifive/errata_cip_453.S
> @@ -21,7 +21,7 @@
>  1:
>  .endm
>  
> -ENTRY(sifive_cip_453_page_fault_trp)
> +SYM_FUNC_START(sifive_cip_453_page_fault_trp)
>  	ADD_SIGN_EXT a0, t0, t1
>  #ifdef CONFIG_MMU
>  	la t0, do_page_fault
> @@ -29,10 +29,10 @@ ENTRY(sifive_cip_453_page_fault_trp)
>  	la t0, do_trap_unknown
>  #endif
>  	jr t0
> -END(sifive_cip_453_page_fault_trp)
> +SYM_FUNC_END(sifive_cip_453_page_fault_trp)
>  
> -ENTRY(sifive_cip_453_insn_fault_trp)
> +SYM_FUNC_START(sifive_cip_453_insn_fault_trp)
>  	ADD_SIGN_EXT a0, t0, t1
>  	la t0, do_trap_insn_fault
>  	jr t0
> -END(sifive_cip_453_insn_fault_trp)
> +SYM_FUNC_END(sifive_cip_453_insn_fault_trp)

Hi Jisheng,

Reviewed-By: Clément Léger <cleger@rivosinc.com>

Thanks !

Clément
diff mbox series

Patch

diff --git a/arch/riscv/errata/sifive/errata_cip_453.S b/arch/riscv/errata/sifive/errata_cip_453.S
index f1b9623fe1de..b1f7b636fe9a 100644
--- a/arch/riscv/errata/sifive/errata_cip_453.S
+++ b/arch/riscv/errata/sifive/errata_cip_453.S
@@ -21,7 +21,7 @@ 
 1:
 .endm
 
-ENTRY(sifive_cip_453_page_fault_trp)
+SYM_FUNC_START(sifive_cip_453_page_fault_trp)
 	ADD_SIGN_EXT a0, t0, t1
 #ifdef CONFIG_MMU
 	la t0, do_page_fault
@@ -29,10 +29,10 @@  ENTRY(sifive_cip_453_page_fault_trp)
 	la t0, do_trap_unknown
 #endif
 	jr t0
-END(sifive_cip_453_page_fault_trp)
+SYM_FUNC_END(sifive_cip_453_page_fault_trp)
 
-ENTRY(sifive_cip_453_insn_fault_trp)
+SYM_FUNC_START(sifive_cip_453_insn_fault_trp)
 	ADD_SIGN_EXT a0, t0, t1
 	la t0, do_trap_insn_fault
 	jr t0
-END(sifive_cip_453_insn_fault_trp)
+SYM_FUNC_END(sifive_cip_453_insn_fault_trp)