Unverified Commit 6262f661 authored by Atish Patra's avatar Atish Patra Committed by Palmer Dabbelt
Browse files

RISC-V: Add early ioremap support 



UEFI uses early IO or memory mappings for runtime services before
normal ioremap() is usable. Add the necessary fixmap bindings and
pmd mappings for generic ioremap support to work.

Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 8f3a2b4a

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ config RISCV 
	select GENERIC_ARCH_TOPOLOGY if SMP

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_CLOCKEVENTS

	select GENERIC_EARLY_IOREMAP

	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO

	select GENERIC_IOREMAP

	select GENERIC_IRQ_MULTI_HANDLER

arch/riscv/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += early_ioremap.h

generic-y += extable.h

generic-y += flat.h

generic-y += kvm_para.h

arch/riscv/include/asm/fixmap.h

+13 −0
Original line number Diff line number Diff line
@@ -27,6 +27,19 @@ enum fixed_addresses { 
	FIX_TEXT_POKE1,

	FIX_TEXT_POKE0,

	FIX_EARLYCON_MEM_BASE,



	__end_of_permanent_fixed_addresses,

	/*

	 * Temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.

	 */

#define NR_FIX_BTMAPS		(SZ_256K / PAGE_SIZE)

#define FIX_BTMAPS_SLOTS	7

#define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)



	FIX_BTMAP_END = __end_of_permanent_fixed_addresses,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,



	__end_of_fixed_addresses

};

arch/riscv/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/types.h>

#include <linux/pgtable.h>

#include <asm/mmiowb.h>

#include <asm/early_ioremap.h>



/*

 * MMIO access functions are separated out to break dependency cycles

arch/riscv/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/smp.h>



#include <asm/cpu_ops.h>

#include <asm/early_ioremap.h>

#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/sbi.h>
@@ -71,6 +72,7 @@ void __init setup_arch(char **cmdline_p) 


	*cmdline_p = boot_command_line;



	early_ioremap_setup();

	parse_early_param();



	setup_bootmem();

CRA Git | Maintained and supported by SUSTech CRA and CCSE