From: Heiko Stuebner <heiko@sntech.de>
Date: Tue, 7 Jun 2022 14:30:59 +0000 (+0200)
Subject: riscv: convert the t-head pbmt errata to use the __nops macro
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c2ea4a36364bfb5cf068c6fbea5c40292b119a5;p=linux.git

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 <heiko@sntech.de>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h
index 9e2888dbb5b1..e4ee53551343 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"					\