From 9c2ea4a36364bfb5cf068c6fbea5c40292b119a5 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Tue, 7 Jun 2022 16:30:59 +0200 Subject: [PATCH] riscv: convert the t-head pbmt errata to use the __nops macro Instead of manually inserting the list of nops, use the recently introduced __nops(n) macro to make everything more readable. Signed-off-by: Heiko Stuebner Signed-off-by: Palmer Dabbelt --- arch/riscv/include/asm/errata_list.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h index 9e2888d..e4ee535 100644 --- a/arch/riscv/include/asm/errata_list.h +++ b/arch/riscv/include/asm/errata_list.h @@ -68,13 +68,7 @@ asm(ALTERNATIVE_2("li %0, 0\t\nnop", \ */ #define ALT_THEAD_PMA(_val) \ asm volatile(ALTERNATIVE( \ - "nop\n\t" \ - "nop\n\t" \ - "nop\n\t" \ - "nop\n\t" \ - "nop\n\t" \ - "nop\n\t" \ - "nop", \ + __nops(7), \ "li t3, %2\n\t" \ "slli t3, t3, %4\n\t" \ "and t3, %0, t3\n\t" \ -- 2.7.4