Commit 82210979 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix to align kexec'd kernels to PMD boundries

 - The T-Head dcache.cva encoding was incorrect, it has been fixed to
   invalidate all caches (as opposed to just the L1)

* tag 'riscv-for-linus-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: errata: fix T-Head dcache.cva encoding
  riscv: kexec: Align the kexeced kernel entry
parents 9fdfb15a 8eb8fe67

arch/riscv/include/asm/errata_list.h

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ asm volatile(ALTERNATIVE( \ 
 * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 |

 *   0000001    01001      rs1       000      00000  0001011

 * dcache.cva rs1 (clean, virtual address)

 *   0000001    00100      rs1       000      00000  0001011

 *   0000001    00101      rs1       000      00000  0001011

 *

 * dcache.cipa rs1 (clean then invalidate, physical address)

 * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 |
@@ -118,7 +118,7 @@ asm volatile(ALTERNATIVE( \ 
 *   0000000    11001     00000      000      00000  0001011

 */

#define THEAD_inval_A0	".long 0x0265000b"

#define THEAD_clean_A0	".long 0x0245000b"

#define THEAD_clean_A0	".long 0x0255000b"

#define THEAD_flush_A0	".long 0x0275000b"

#define THEAD_SYNC_S	".long 0x0190000b"

arch/riscv/kernel/elf_kexec.c

+7 −1
Original line number Diff line number Diff line
@@ -98,7 +98,13 @@ static int elf_find_pbase(struct kimage *image, unsigned long kernel_len, 
	kbuf.image = image;

	kbuf.buf_min = lowest_paddr;

	kbuf.buf_max = ULONG_MAX;

	kbuf.buf_align = PAGE_SIZE;



	/*

	 * Current riscv boot protocol requires 2MB alignment for

	 * RV64 and 4MB alignment for RV32

	 *

	 */

	kbuf.buf_align = PMD_SIZE;

	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;

	kbuf.memsz = ALIGN(kernel_len, PAGE_SIZE);

	kbuf.top_down = false;