* [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS
@ 2024-07-09 16:05 Jisheng Zhang
2024-07-09 16:05 ` [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros Jisheng Zhang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jisheng Zhang @ 2024-07-09 16:05 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: Clément Léger, linux-riscv, linux-kernel
commit 76329c693924 ("riscv: Use SYM_*() assembly macros instead
of deprecated ones"), most riscv has been to converted the new style
SYM_ assembler annotations. The remaining one is sifive's
errata_cip_453.S, so convert to new style SYM_ annotations as well.
After that select ARCH_USE_SYM_ANNOTATIONS.
Since v1:
- add new patch to convert sifive's errata_cip_453.S, thank Clément
- update patch2 commit msg
Jisheng Zhang (2):
riscv: errata: sifive: Use SYM_*() assembly macros
riscv: select ARCH_USE_SYM_ANNOTATIONS
arch/riscv/Kconfig | 1 +
arch/riscv/errata/sifive/errata_cip_453.S | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
--
2.43.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros
2024-07-09 16:05 [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
@ 2024-07-09 16:05 ` Jisheng Zhang
2024-07-10 8:11 ` Clément Léger
2024-07-09 16:05 ` [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
2024-09-17 13:00 ` [PATCH v2 0/2] " patchwork-bot+linux-riscv
2 siblings, 1 reply; 6+ messages in thread
From: Jisheng Zhang @ 2024-07-09 16:05 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: Clément Léger, linux-riscv, linux-kernel
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)
--
2.43.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros
2024-07-09 16:05 ` [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros Jisheng Zhang
@ 2024-07-10 8:11 ` Clément Léger
0 siblings, 0 replies; 6+ messages in thread
From: Clément Léger @ 2024-07-10 8:11 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: linux-riscv, linux-kernel
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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS
2024-07-09 16:05 [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
2024-07-09 16:05 ` [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros Jisheng Zhang
@ 2024-07-09 16:05 ` Jisheng Zhang
2024-07-10 8:13 ` Clément Léger
2024-09-17 13:00 ` [PATCH v2 0/2] " patchwork-bot+linux-riscv
2 siblings, 1 reply; 6+ messages in thread
From: Jisheng Zhang @ 2024-07-09 16:05 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: Clément Léger, linux-riscv, linux-kernel
Now, riscv has been converted to the new style SYM_ assembler
annotations. So select ARCH_USE_SYM_ANNOTATIONS to ensure the
deprecated macros such as ENTRY(), END(), WEAK() and so on are not
available and we don't regress.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 0525ee2d63c7..c51b32a8ddff 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -62,6 +62,7 @@ config RISCV
select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
select ARCH_USE_MEMTEST
select ARCH_USE_QUEUED_RWLOCKS
+ select ARCH_USE_SYM_ANNOTATIONS
select ARCH_USES_CFI_TRAPS if CFI_CLANG
select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
--
2.43.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS
2024-07-09 16:05 ` [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
@ 2024-07-10 8:13 ` Clément Léger
0 siblings, 0 replies; 6+ messages in thread
From: Clément Léger @ 2024-07-10 8:13 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou
Cc: linux-riscv, linux-kernel
On 09/07/2024 18:05, Jisheng Zhang wrote:
> Now, riscv has been converted to the new style SYM_ assembler
> annotations. So select ARCH_USE_SYM_ANNOTATIONS to ensure the
> deprecated macros such as ENTRY(), END(), WEAK() and so on are not
> available and we don't regress.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 0525ee2d63c7..c51b32a8ddff 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -62,6 +62,7 @@ config RISCV
> select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
> select ARCH_USE_MEMTEST
> select ARCH_USE_QUEUED_RWLOCKS
> + select ARCH_USE_SYM_ANNOTATIONS
> select ARCH_USES_CFI_TRAPS if CFI_CLANG
> select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU
> select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
Hi Jisheng,
It now compiles with the previous patch (using the defconfig).
Reviewed-By: Clément Léger <cleger@rivosinc.com>
Thanks !
Clément
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS
2024-07-09 16:05 [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
2024-07-09 16:05 ` [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros Jisheng Zhang
2024-07-09 16:05 ` [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
@ 2024-09-17 13:00 ` patchwork-bot+linux-riscv
2 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+linux-riscv @ 2024-09-17 13:00 UTC (permalink / raw)
To: Jisheng Zhang
Cc: linux-riscv, paul.walmsley, palmer, aou, cleger, linux-kernel
Hello:
This series was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:
On Wed, 10 Jul 2024 00:05:20 +0800 you wrote:
> commit 76329c693924 ("riscv: Use SYM_*() assembly macros instead
> of deprecated ones"), most riscv has been to converted the new style
> SYM_ assembler annotations. The remaining one is sifive's
> errata_cip_453.S, so convert to new style SYM_ annotations as well.
> After that select ARCH_USE_SYM_ANNOTATIONS.
>
>
> [...]
Here is the summary with links:
- [v2,1/2] riscv: errata: sifive: Use SYM_*() assembly macros
https://git.kernel.org/riscv/c/6868d12e0205
- [v2,2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS
https://git.kernel.org/riscv/c/7c9d980e4670
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-17 13:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-09 16:05 [PATCH v2 0/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
2024-07-09 16:05 ` [PATCH v2 1/2] riscv: errata: sifive: Use SYM_*() assembly macros Jisheng Zhang
2024-07-10 8:11 ` Clément Léger
2024-07-09 16:05 ` [PATCH v2 2/2] riscv: select ARCH_USE_SYM_ANNOTATIONS Jisheng Zhang
2024-07-10 8:13 ` Clément Léger
2024-09-17 13:00 ` [PATCH v2 0/2] " patchwork-bot+linux-riscv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox