Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08fd8c17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from David Vrabel:
 "Features and fixes for 4.8-rc0:

   - ACPI support for guests on ARM platforms.
   - Generic steal time support for arm and x86.
   - Support cases where kernel cpu is not Xen VCPU number (e.g., if
     in-guest kexec is used).
   - Use the system workqueue instead of a custom workqueue in various
     places"

* tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (47 commits)
  xen: add static initialization of steal_clock op to xen_time_ops
  xen/pvhvm: run xen_vcpu_setup() for the boot CPU
  xen/evtchn: use xen_vcpu_id mapping
  xen/events: fifo: use xen_vcpu_id mapping
  xen/events: use xen_vcpu_id mapping in events_base
  x86/xen: use xen_vcpu_id mapping when pointing vcpu_info to shared_info
  x86/xen: use xen_vcpu_id mapping for HYPERVISOR_vcpu_op
  xen: introduce xen_vcpu_id mapping
  x86/acpi: store ACPI ids from MADT for future usage
  x86/xen: update cpuid.h from Xen-4.7
  xen/evtchn: add IOCTL_EVTCHN_RESTRICT
  xen-blkback: really don't leak mode property
  xen-blkback: constify instance of "struct attribute_group"
  xen-blkfront: prefer xenbus_scanf() over xenbus_gather()
  xen-blkback: prefer xenbus_scanf() over xenbus_gather()
  xen: support runqueue steal time on xen
  arm/xen: add support for vm_assist hypercall
  xen: update xen headers
  xen-pciback: drop superfluous variables
  xen-pciback: short-circuit read path used for merging write values
  ...
parents e831101a d34c30cc

Documentation/devicetree/bindings/arm/xen.txt

+35 −0
Original line number Diff line number Diff line
@@ -11,10 +11,32 @@ the following properties: 
  memory where the grant table should be mapped to, using an

  HYPERVISOR_memory_op hypercall. The memory region is large enough to map

  the whole grant table (it is larger or equal to gnttab_max_grant_frames()).

  This property is unnecessary when booting Dom0 using ACPI.



- interrupts: the interrupt used by Xen to inject event notifications.

  A GIC node is also required.

  This property is unnecessary when booting Dom0 using ACPI.



To support UEFI on Xen ARM virtual platforms, Xen populates the FDT "uefi" node

under /hypervisor with following parameters:



________________________________________________________________________________

Name                      | Size   | Description

================================================================================

xen,uefi-system-table     | 64-bit | Guest physical address of the UEFI System

			  |	   | Table.

--------------------------------------------------------------------------------

xen,uefi-mmap-start       | 64-bit | Guest physical address of the UEFI memory

			  |	   | map.

--------------------------------------------------------------------------------

xen,uefi-mmap-size        | 32-bit | Size in bytes of the UEFI memory map

                          |        | pointed to in previous entry.

--------------------------------------------------------------------------------

xen,uefi-mmap-desc-size   | 32-bit | Size in bytes of each entry in the UEFI

                          |        | memory map.

--------------------------------------------------------------------------------

xen,uefi-mmap-desc-ver    | 32-bit | Version of the mmap descriptor format.

--------------------------------------------------------------------------------



Example (assuming #address-cells = <2> and #size-cells = <2>):
@@ -22,4 +44,17 @@ hypervisor { 
	compatible = "xen,xen-4.3", "xen,xen";

	reg = <0 0xb0000000 0 0x20000>;

	interrupts = <1 15 0xf08>;

	uefi {

		xen,uefi-system-table = <0xXXXXXXXX>;

		xen,uefi-mmap-start = <0xXXXXXXXX>;

		xen,uefi-mmap-size = <0xXXXXXXXX>;

		xen,uefi-mmap-desc-size = <0xXXXXXXXX>;

		xen,uefi-mmap-desc-ver = <0xXXXXXXXX>;

        };

};



The format and meaning of the "xen,uefi-*" parameters are similar to those in

Documentation/arm/uefi.txt, which are provided by the regular UEFI stub. However

they differ because they are provided by the Xen hypervisor, together with a set

of UEFI runtime services implemented via hypercalls, see

http://xenbits.xen.org/docs/unstable/hypercall/x86_64/include,public,platform.h.html.

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

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg); 
int HYPERVISOR_physdev_op(int cmd, void *arg);

int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);

int HYPERVISOR_tmem_op(void *arg);

int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type);

int HYPERVISOR_platform_op_raw(void *arg);

static inline int HYPERVISOR_platform_op(struct xen_platform_op *op)

{

arch/arm/include/asm/xen/xen-ops.h

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

#define _ASM_XEN_OPS_H



void xen_efi_runtime_setup(void);



#endif /* _ASM_XEN_OPS_H */

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ void __init setup_arch(char **cmdline_p) 
	early_paging_init(mdesc);

#endif

	setup_dma_zone(mdesc);

	xen_early_init();

	efi_init();

	sanity_check_meminfo();

	arm_memblock_init(mdesc);
@@ -1080,7 +1081,6 @@ void __init setup_arch(char **cmdline_p) 


	arm_dt_init_cpu_maps();

	psci_dt_init();

	xen_early_init();

#ifdef CONFIG_SMP

	if (is_smp()) {

		if (!mdesc->smp_init || !mdesc->smp_init()) {

arch/arm/xen/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y		:= enlighten.o hypercall.o grant-table.o p2m.o mm.o

obj-$(CONFIG_XEN_EFI) += efi.o