From: "Guo Ren (Alibaba DAMO Academy)" <guoren@kernel.org>
Move vendor errata definitions into errata_list_vendors.h.
Signed-off-by: Guo Ren (Alibaba DAMO Academy) <guoren@kernel.org>
---
arch/riscv/include/asm/errata_list.h | 19 +---------------
arch/riscv/include/asm/errata_list_vendors.h | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 18 deletions(-)
create mode 100644 arch/riscv/include/asm/errata_list_vendors.h
diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h
index 6e426ed7919a..18c9f7ee9b7c 100644
--- a/arch/riscv/include/asm/errata_list.h
+++ b/arch/riscv/include/asm/errata_list.h
@@ -10,24 +10,7 @@
#include <asm/insn-def.h>
#include <asm/hwcap.h>
#include <asm/vendorid_list.h>
-
-#ifdef CONFIG_ERRATA_ANDES
-#define ERRATA_ANDES_NO_IOCP 0
-#define ERRATA_ANDES_NUMBER 1
-#endif
-
-#ifdef CONFIG_ERRATA_SIFIVE
-#define ERRATA_SIFIVE_CIP_453 0
-#define ERRATA_SIFIVE_CIP_1200 1
-#define ERRATA_SIFIVE_NUMBER 2
-#endif
-
-#ifdef CONFIG_ERRATA_THEAD
-#define ERRATA_THEAD_MAE 0
-#define ERRATA_THEAD_PMU 1
-#define ERRATA_THEAD_GHOSTWRITE 2
-#define ERRATA_THEAD_NUMBER 3
-#endif
+#include <asm/errata_list_vendors.h>
#ifdef __ASSEMBLY__
diff --git a/arch/riscv/include/asm/errata_list_vendors.h b/arch/riscv/include/asm/errata_list_vendors.h
new file mode 100644
index 000000000000..a37d1558f39f
--- /dev/null
+++ b/arch/riscv/include/asm/errata_list_vendors.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef ASM_ERRATA_LIST_VENDORS_H
+#define ASM_ERRATA_LIST_VENDORS_H
+
+#ifdef CONFIG_ERRATA_ANDES
+#define ERRATA_ANDES_NO_IOCP 0
+#define ERRATA_ANDES_NUMBER 1
+#endif
+
+#ifdef CONFIG_ERRATA_SIFIVE
+#define ERRATA_SIFIVE_CIP_453 0
+#define ERRATA_SIFIVE_CIP_1200 1
+#define ERRATA_SIFIVE_NUMBER 2
+#endif
+
+#ifdef CONFIG_ERRATA_THEAD
+#define ERRATA_THEAD_MAE 0
+#define ERRATA_THEAD_PMU 1
+#define ERRATA_THEAD_GHOSTWRITE 2
+#define ERRATA_THEAD_NUMBER 3
+#endif
+
+#endif
--
2.40.1
Hi Guo, On 7/13/25 17:53, guoren@kernel.org wrote: > From: "Guo Ren (Alibaba DAMO Academy)" <guoren@kernel.org> > > Move vendor errata definitions into errata_list_vendors.h. > > Signed-off-by: Guo Ren (Alibaba DAMO Academy) <guoren@kernel.org> > --- > arch/riscv/include/asm/errata_list.h | 19 +--------------- > arch/riscv/include/asm/errata_list_vendors.h | 24 ++++++++++++++++++++ > 2 files changed, 25 insertions(+), 18 deletions(-) > create mode 100644 arch/riscv/include/asm/errata_list_vendors.h > > diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h > index 6e426ed7919a..18c9f7ee9b7c 100644 > --- a/arch/riscv/include/asm/errata_list.h > +++ b/arch/riscv/include/asm/errata_list.h > @@ -10,24 +10,7 @@ > #include <asm/insn-def.h> > #include <asm/hwcap.h> > #include <asm/vendorid_list.h> > - > -#ifdef CONFIG_ERRATA_ANDES > -#define ERRATA_ANDES_NO_IOCP 0 > -#define ERRATA_ANDES_NUMBER 1 > -#endif > - > -#ifdef CONFIG_ERRATA_SIFIVE > -#define ERRATA_SIFIVE_CIP_453 0 > -#define ERRATA_SIFIVE_CIP_1200 1 > -#define ERRATA_SIFIVE_NUMBER 2 > -#endif > - > -#ifdef CONFIG_ERRATA_THEAD > -#define ERRATA_THEAD_MAE 0 > -#define ERRATA_THEAD_PMU 1 > -#define ERRATA_THEAD_GHOSTWRITE 2 > -#define ERRATA_THEAD_NUMBER 3 > -#endif > +#include <asm/errata_list_vendors.h> > > #ifdef __ASSEMBLY__ > > diff --git a/arch/riscv/include/asm/errata_list_vendors.h b/arch/riscv/include/asm/errata_list_vendors.h > new file mode 100644 > index 000000000000..a37d1558f39f > --- /dev/null > +++ b/arch/riscv/include/asm/errata_list_vendors.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef ASM_ERRATA_LIST_VENDORS_H > +#define ASM_ERRATA_LIST_VENDORS_H > + > +#ifdef CONFIG_ERRATA_ANDES > +#define ERRATA_ANDES_NO_IOCP 0 > +#define ERRATA_ANDES_NUMBER 1 > +#endif > + > +#ifdef CONFIG_ERRATA_SIFIVE > +#define ERRATA_SIFIVE_CIP_453 0 > +#define ERRATA_SIFIVE_CIP_1200 1 > +#define ERRATA_SIFIVE_NUMBER 2 > +#endif > + > +#ifdef CONFIG_ERRATA_THEAD > +#define ERRATA_THEAD_MAE 0 > +#define ERRATA_THEAD_PMU 1 > +#define ERRATA_THEAD_GHOSTWRITE 2 > +#define ERRATA_THEAD_NUMBER 3 > +#endif > + > +#endif Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks, Alex
On Sun, Jul 13, 2025 at 11:53 PM <guoren@kernel.org> wrote: > > From: "Guo Ren (Alibaba DAMO Academy)" <guoren@kernel.org> > > Move vendor errata definitions into errata_list_vendors.h. > > Signed-off-by: Guo Ren (Alibaba DAMO Academy) <guoren@kernel.org> > --- > arch/riscv/include/asm/errata_list.h | 19 +--------------- > arch/riscv/include/asm/errata_list_vendors.h | 24 ++++++++++++++++++++ > 2 files changed, 25 insertions(+), 18 deletions(-) > create mode 100644 arch/riscv/include/asm/errata_list_vendors.h > > diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h > index 6e426ed7919a..18c9f7ee9b7c 100644 > --- a/arch/riscv/include/asm/errata_list.h > +++ b/arch/riscv/include/asm/errata_list.h > @@ -10,24 +10,7 @@ > #include <asm/insn-def.h> > #include <asm/hwcap.h> > #include <asm/vendorid_list.h> > - > -#ifdef CONFIG_ERRATA_ANDES > -#define ERRATA_ANDES_NO_IOCP 0 > -#define ERRATA_ANDES_NUMBER 1 > -#endif > - > -#ifdef CONFIG_ERRATA_SIFIVE > -#define ERRATA_SIFIVE_CIP_453 0 > -#define ERRATA_SIFIVE_CIP_1200 1 > -#define ERRATA_SIFIVE_NUMBER 2 > -#endif > - > -#ifdef CONFIG_ERRATA_THEAD > -#define ERRATA_THEAD_MAE 0 > -#define ERRATA_THEAD_PMU 1 > -#define ERRATA_THEAD_GHOSTWRITE 2 > -#define ERRATA_THEAD_NUMBER 3 > -#endif > +#include <asm/errata_list_vendors.h> > > #ifdef __ASSEMBLY__ > > diff --git a/arch/riscv/include/asm/errata_list_vendors.h b/arch/riscv/include/asm/errata_list_vendors.h > new file mode 100644 > index 000000000000..a37d1558f39f > --- /dev/null > +++ b/arch/riscv/include/asm/errata_list_vendors.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef ASM_ERRATA_LIST_VENDORS_H > +#define ASM_ERRATA_LIST_VENDORS_H > + > +#ifdef CONFIG_ERRATA_ANDES > +#define ERRATA_ANDES_NO_IOCP 0 > +#define ERRATA_ANDES_NUMBER 1 > +#endif > + > +#ifdef CONFIG_ERRATA_SIFIVE > +#define ERRATA_SIFIVE_CIP_453 0 > +#define ERRATA_SIFIVE_CIP_1200 1 > +#define ERRATA_SIFIVE_NUMBER 2 > +#endif > + > +#ifdef CONFIG_ERRATA_THEAD > +#define ERRATA_THEAD_MAE 0 > +#define ERRATA_THEAD_PMU 1 > +#define ERRATA_THEAD_GHOSTWRITE 2 > +#define ERRATA_THEAD_NUMBER 3 > +#endif > + > +#endif > -- > 2.40.1 > Tested-by: Han Gao <rabenda.cn@gmail.com>
© 2016 - 2025 Red Hat, Inc.