Unverified Commit 61b2f0bd authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "riscv: Fix crash during early errata patching" 

These are fixes, but due to the possible early boot fallout they're
going in the merge window to get a bit more time to bake on linux-next.

* b4-shazam-merge
  riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a
  riscv: Fix crash during early errata patching

Link: https://lore.kernel.org/r/20221126060920.65009-1-samuel@sholland.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents de59b6ed 583286e2

arch/riscv/include/asm/page.h

+9 −9
Original line number Diff line number Diff line
@@ -124,19 +124,19 @@ extern phys_addr_t phys_ram_base; 


#define linear_mapping_pa_to_va(x)	((void *)((unsigned long)(x) + kernel_map.va_pa_offset))

#define kernel_mapping_pa_to_va(y)	({					\

	unsigned long _y = y;								\

	unsigned long _y = (unsigned long)(y);					\

	(IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ?			\

		(void *)((unsigned long)(_y) + kernel_map.va_kernel_xip_pa_offset) :		\

		(void *)((unsigned long)(_y) + kernel_map.va_kernel_pa_offset + XIP_OFFSET);	\

		(void *)(_y + kernel_map.va_kernel_xip_pa_offset) :		\

		(void *)(_y + kernel_map.va_kernel_pa_offset + XIP_OFFSET);	\

	})

#define __pa_to_va_nodebug(x)		linear_mapping_pa_to_va(x)



#define linear_mapping_va_to_pa(x)	((unsigned long)(x) - kernel_map.va_pa_offset)

#define kernel_mapping_va_to_pa(y) ({						\

	unsigned long _y = y;							\

	unsigned long _y = (unsigned long)(y);					\

	(IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \

		((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) :		\

		((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET);	\

		(_y - kernel_map.va_kernel_xip_pa_offset) :			\

		(_y - kernel_map.va_kernel_pa_offset - XIP_OFFSET);		\

	})



#define __va_to_pa_nodebug(x)	({						\

arch/riscv/mm/init.c

+8 −8
Original line number Diff line number Diff line
@@ -927,15 +927,15 @@ static void __init pt_ops_set_early(void) 
 */

static void __init pt_ops_set_fixmap(void)

{

	pt_ops.alloc_pte = kernel_mapping_pa_to_va((uintptr_t)alloc_pte_fixmap);

	pt_ops.get_pte_virt = kernel_mapping_pa_to_va((uintptr_t)get_pte_virt_fixmap);

	pt_ops.alloc_pte = kernel_mapping_pa_to_va(alloc_pte_fixmap);

	pt_ops.get_pte_virt = kernel_mapping_pa_to_va(get_pte_virt_fixmap);

#ifndef __PAGETABLE_PMD_FOLDED

	pt_ops.alloc_pmd = kernel_mapping_pa_to_va((uintptr_t)alloc_pmd_fixmap);

	pt_ops.get_pmd_virt = kernel_mapping_pa_to_va((uintptr_t)get_pmd_virt_fixmap);

	pt_ops.alloc_pud = kernel_mapping_pa_to_va((uintptr_t)alloc_pud_fixmap);

	pt_ops.get_pud_virt = kernel_mapping_pa_to_va((uintptr_t)get_pud_virt_fixmap);

	pt_ops.alloc_p4d = kernel_mapping_pa_to_va((uintptr_t)alloc_p4d_fixmap);

	pt_ops.get_p4d_virt = kernel_mapping_pa_to_va((uintptr_t)get_p4d_virt_fixmap);

	pt_ops.alloc_pmd = kernel_mapping_pa_to_va(alloc_pmd_fixmap);

	pt_ops.get_pmd_virt = kernel_mapping_pa_to_va(get_pmd_virt_fixmap);

	pt_ops.alloc_pud = kernel_mapping_pa_to_va(alloc_pud_fixmap);

	pt_ops.get_pud_virt = kernel_mapping_pa_to_va(get_pud_virt_fixmap);

	pt_ops.alloc_p4d = kernel_mapping_pa_to_va(alloc_p4d_fixmap);

	pt_ops.get_p4d_virt = kernel_mapping_pa_to_va(get_p4d_virt_fixmap);

#endif

}

arch/riscv/mm/physaddr.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ EXPORT_SYMBOL(__virt_to_phys); 
phys_addr_t __phys_addr_symbol(unsigned long x)

{

	unsigned long kernel_start = kernel_map.virt_addr;

	unsigned long kernel_end = (unsigned long)_end;

	unsigned long kernel_end = kernel_start + kernel_map.size;



	/*

	 * Boundary checking aginst the kernel image mapping.