arm64: add early_ioremap support (bf4b558e) · Commits · 戴 / test

Documentation/arm64/memory.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ ffffffbffa000000 ffffffbffaffffff 16MB PCI I/O space

		ffffffbffb000000 ffffffbffbbfffff 12MB [guard]

		ffffffbffbc00000 ffffffbffbdfffff 2MB earlyprintk device
		ffffffbffbc00000 ffffffbffbdfffff 2MB fixed mappings

		ffffffbffbe00000 ffffffbffbffffff 2MB [guard]

		@@ -66,7 +66,7 @@ fffffdfffa000000 fffffdfffaffffff 16MB PCI I/O space

		fffffdfffb000000 fffffdfffbbfffff 12MB [guard]

		fffffdfffbc00000 fffffdfffbdfffff 2MB earlyprintk device
		fffffdfffbc00000 fffffdfffbdfffff 2MB fixed mappings

		fffffdfffbe00000 fffffdfffbffffff 2MB [guard]

arch/arm64/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ config ARM64
		select GENERIC_CLOCKEVENTS
		select GENERIC_CLOCKEVENTS_BROADCAST if SMP
		select GENERIC_CPU_AUTOPROBE
		select GENERIC_EARLY_IOREMAP
		select GENERIC_IOMAP
		select GENERIC_IRQ_PROBE
		select GENERIC_IRQ_SHOW

arch/arm64/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ generic-y += delay.h
		generic-y += div64.h
		generic-y += dma.h
		generic-y += emergency-restart.h
		generic-y += early_ioremap.h
		generic-y += errno.h
		generic-y += ftrace.h
		generic-y += hash.h

arch/arm64/include/asm/fixmap.h

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* fixmap.h: compile-time virtual memory allocation
		*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 1998 Ingo Molnar
		* Copyright (C) 2013 Mark Salter <msalter@redhat.com>
		*
		* Adapted from arch/x86_64 version.
		*
		*/

		#ifndef _ASM_ARM64_FIXMAP_H
		#define _ASM_ARM64_FIXMAP_H

		#ifndef __ASSEMBLY__
		#include <linux/kernel.h>
		#include <asm/page.h>

		/*
		* Here we define all the compile-time 'special' virtual
		* addresses. The point is to have a constant address at
		* compile time, but to set the physical address only
		* in the boot process.
		*
		* These 'compile-time allocated' memory buffers are
		* page-sized. Use set_fixmap(idx,phys) to associate
		* physical memory with fixmap indices.
		*
		*/
		enum fixed_addresses {
		FIX_EARLYCON_MEM_BASE,
		__end_of_permanent_fixed_addresses,

		/*
		* Temporary boot-time mappings, used by early_ioremap(),
		* before ioremap() is functional.
		*/
		#ifdef CONFIG_ARM64_64K_PAGES
		#define NR_FIX_BTMAPS 4
		#else
		#define NR_FIX_BTMAPS 64
		#endif
		#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
		};

		#define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
		#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)

		#define FIXMAP_PAGE_IO __pgprot(PROT_DEVICE_nGnRE)

		extern void __early_set_fixmap(enum fixed_addresses idx,
		phys_addr_t phys, pgprot_t flags);

		#define __set_fixmap __early_set_fixmap

		#include <asm-generic/fixmap.h>

		#endif /* !__ASSEMBLY__ */
		#endif /* _ASM_ARM64_FIXMAP_H */

arch/arm64/include/asm/io.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <asm/byteorder.h>
		#include <asm/barrier.h>
		#include <asm/pgtable.h>
		#include <asm/early_ioremap.h>

		#include <xen/xen.h>

Admin message