Skip to content

Commit 3690492

Browse files
xhackerustcpalmer-dabbelt
authored andcommitted
riscv: errata: thead: use pa based instructions for CMO
T-HEAD CPUs such as C906/C910/C920 support phy address based CMO, use them so that we don't need to convert to virt address. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Reviewed-by: Guo Ren <guoren@kernel.org> Link: https://lore.kernel.org/r/20231114143338.2406-3-jszhang@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent a4ff64e commit 3690492

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

arch/riscv/errata/thead/errata.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ static bool errata_probe_pbmt(unsigned int stage,
5858
* | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 |
5959
* 0000000 11001 00000 000 00000 0001011
6060
*/
61-
#define THEAD_INVAL_A0 ".long 0x0265000b"
62-
#define THEAD_CLEAN_A0 ".long 0x0255000b"
63-
#define THEAD_FLUSH_A0 ".long 0x0275000b"
61+
#define THEAD_INVAL_A0 ".long 0x02a5000b"
62+
#define THEAD_CLEAN_A0 ".long 0x0295000b"
63+
#define THEAD_FLUSH_A0 ".long 0x02b5000b"
6464
#define THEAD_SYNC_S ".long 0x0190000b"
6565

6666
#define THEAD_CMO_OP(_op, _start, _size, _cachesize) \
@@ -79,23 +79,17 @@ asm volatile("mv a0, %1\n\t" \
7979

8080
static void thead_errata_cache_inv(phys_addr_t paddr, size_t size)
8181
{
82-
void *vaddr = phys_to_virt(paddr);
83-
84-
THEAD_CMO_OP(INVAL, vaddr, size, riscv_cbom_block_size);
82+
THEAD_CMO_OP(INVAL, paddr, size, riscv_cbom_block_size);
8583
}
8684

8785
static void thead_errata_cache_wback(phys_addr_t paddr, size_t size)
8886
{
89-
void *vaddr = phys_to_virt(paddr);
90-
91-
THEAD_CMO_OP(CLEAN, vaddr, size, riscv_cbom_block_size);
87+
THEAD_CMO_OP(CLEAN, paddr, size, riscv_cbom_block_size);
9288
}
9389

9490
static void thead_errata_cache_wback_inv(phys_addr_t paddr, size_t size)
9591
{
96-
void *vaddr = phys_to_virt(paddr);
97-
98-
THEAD_CMO_OP(FLUSH, vaddr, size, riscv_cbom_block_size);
92+
THEAD_CMO_OP(FLUSH, paddr, size, riscv_cbom_block_size);
9993
}
10094

10195
static const struct riscv_nonstd_cache_ops thead_errata_cmo_ops = {

0 commit comments

Comments
 (0)