Skip to content

Commit be5e887

Browse files
lyctwpalmer-dabbelt
authored andcommitted
riscv: errata: Rename defines for Andes
Use "ANDES" rather than "ANDESTECH" to unify the naming convention with directory, file names, Kconfig options and other definitions. Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com> Reviewed-by: Charles Ci-Jyun Wu <dminus@andestech.com> Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com> Acked-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Link: https://lore.kernel.org/r/20240222083946.3977135-2-peterlin@andestech.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent f4cc33e commit be5e887

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

arch/riscv/errata/andes/errata.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <asm/sbi.h>
1919
#include <asm/vendorid_list.h>
2020

21-
#define ANDESTECH_AX45MP_MARCHID 0x8000000000008a45UL
22-
#define ANDESTECH_AX45MP_MIMPID 0x500UL
23-
#define ANDESTECH_SBI_EXT_ANDES 0x0900031E
21+
#define ANDES_AX45MP_MARCHID 0x8000000000008a45UL
22+
#define ANDES_AX45MP_MIMPID 0x500UL
23+
#define ANDES_SBI_EXT_ANDES 0x0900031E
2424

2525
#define ANDES_SBI_EXT_IOCP_SW_WORKAROUND 1
2626

@@ -32,7 +32,7 @@ static long ax45mp_iocp_sw_workaround(void)
3232
* ANDES_SBI_EXT_IOCP_SW_WORKAROUND SBI EXT checks if the IOCP is missing and
3333
* cache is controllable only then CMO will be applied to the platform.
3434
*/
35-
ret = sbi_ecall(ANDESTECH_SBI_EXT_ANDES, ANDES_SBI_EXT_IOCP_SW_WORKAROUND,
35+
ret = sbi_ecall(ANDES_SBI_EXT_ANDES, ANDES_SBI_EXT_IOCP_SW_WORKAROUND,
3636
0, 0, 0, 0, 0, 0);
3737

3838
return ret.error ? 0 : ret.value;
@@ -50,7 +50,7 @@ static void errata_probe_iocp(unsigned int stage, unsigned long arch_id, unsigne
5050

5151
done = true;
5252

53-
if (arch_id != ANDESTECH_AX45MP_MARCHID || impid != ANDESTECH_AX45MP_MIMPID)
53+
if (arch_id != ANDES_AX45MP_MARCHID || impid != ANDES_AX45MP_MIMPID)
5454
return;
5555

5656
if (!ax45mp_iocp_sw_workaround())

arch/riscv/include/asm/errata_list.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <asm/vendorid_list.h>
1313

1414
#ifdef CONFIG_ERRATA_ANDES
15-
#define ERRATA_ANDESTECH_NO_IOCP 0
16-
#define ERRATA_ANDESTECH_NUMBER 1
15+
#define ERRATA_ANDES_NO_IOCP 0
16+
#define ERRATA_ANDES_NUMBER 1
1717
#endif
1818

1919
#ifdef CONFIG_ERRATA_SIFIVE

arch/riscv/include/asm/vendorid_list.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef ASM_VENDOR_LIST_H
66
#define ASM_VENDOR_LIST_H
77

8-
#define ANDESTECH_VENDOR_ID 0x31e
8+
#define ANDES_VENDOR_ID 0x31e
99
#define SIFIVE_VENDOR_ID 0x489
1010
#define THEAD_VENDOR_ID 0x5b7
1111

arch/riscv/kernel/alternative.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void riscv_fill_cpu_mfr_info(struct cpu_manufacturer_info_t *cpu_mfr_info
4343

4444
switch (cpu_mfr_info->vendor_id) {
4545
#ifdef CONFIG_ERRATA_ANDES
46-
case ANDESTECH_VENDOR_ID:
46+
case ANDES_VENDOR_ID:
4747
cpu_mfr_info->patch_func = andes_errata_patch_func;
4848
break;
4949
#endif

0 commit comments

Comments
 (0)