Commit d822d2a1 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge tag 'xen-arm64-3.1-tag' of... 

Merge tag 'xen-arm64-3.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into upstream

Introduce Xen support to ARM64

* tag 'xen-arm64-3.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
  MAINTAINERS: add myself as arm64/xen maintainer
  arm64/xen: introduce CONFIG_XEN and hypercall.S on ARM64
  arm64/xen: use XEN_IO_PROTO_ABI_ARM on ARM64
  arm64/xen: implement ioremap_cached on arm64
  arm64/xen: introduce asm/xen header files on arm64
  arm/xen: define xen_remap as ioremap_cached
parents 1442b6ed b475e83f

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -9105,6 +9105,13 @@ S: Supported 
F:	arch/arm/xen/

F:	arch/arm/include/asm/xen/



XEN HYPERVISOR ARM64

M:	Stefano Stabellini <stefano.stabellini@eu.citrix.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

S:	Supported

F:	arch/arm64/xen/

F:	arch/arm64/include/asm/xen/



XEN NETWORK BACKEND DRIVER

M:	Ian Campbell <ian.campbell@citrix.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

arch/arm/include/asm/xen/page.h

+1 −2
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_XEN_PAGE_H

#define _ASM_ARM_XEN_PAGE_H



#include <asm/mach/map.h>

#include <asm/page.h>

#include <asm/pgtable.h>
@@ -88,6 +87,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	return __set_phys_to_machine(pfn, mfn);

}



#define xen_remap(cookie, size) __arm_ioremap((cookie), (size), MT_MEMORY);

#define xen_remap(cookie, size) ioremap_cached((cookie), (size));



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm64/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -183,6 +183,16 @@ config HW_PERF_EVENTS 


source "mm/Kconfig"



config XEN_DOM0

	def_bool y

	depends on XEN



config XEN

	bool "Xen guest support on ARM64 (EXPERIMENTAL)"

	depends on ARM64 && OF

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64.



endmenu



menu "Boot options"

arch/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ TEXT_OFFSET := 0x00080000 
export	TEXT_OFFSET GZFLAGS



core-y		+= arch/arm64/kernel/ arch/arm64/mm/

core-$(CONFIG_XEN)		+= arch/arm64/xen/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		+= $(LIBGCC)

arch/arm64/include/asm/hypervisor.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _ASM_ARM64_HYPERVISOR_H

#define _ASM_ARM64_HYPERVISOR_H



#include <asm/xen/hypervisor.h>



#endif