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

Commit 9f888b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.16-rc0-tag' of... 

Merge tag 'stable/for-linus-3.16-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into next

Pull Xen updates from David Vrabel:
 "xen: features and fixes for 3.16-rc0
   - support foreign mappings in PVH domains (needed when dom0 is PVH)

   - fix mapping high MMIO regions in x86 PV guests (this is also the
     first half of removing the PAGE_IOMAP PTE flag).

   - ARM suspend/resume support.

   - ARM multicall support"

* tag 'stable/for-linus-3.16-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: map foreign pfns for autotranslated guests
  xen-acpi-processor: Don't display errors when we get -ENOSYS
  xen/pciback: Document the entry points for 'pcistub_put_pci_dev'
  xen/pciback: Document when the 'unbind' and 'bind' functions are called.
  xen-pciback: Document when we FLR an PCI device.
  xen-pciback: First reset, then free.
  xen-pciback: Cleanup up pcistub_put_pci_dev
  x86/xen: do not use _PAGE_IOMAP in xen_remap_domain_mfn_range()
  x86/xen: set regions above the end of RAM as 1:1
  x86/xen: only warn once if bad MFNs are found during setup
  x86/xen: compactly store large identity ranges in the p2m
  x86/xen: fix set_phys_range_identity() if pfn_e > MAX_P2M_PFN
  x86/xen: rename early_p2m_alloc() and early_p2m_alloc_middle()
  xen/x86: set panic notifier priority to minimum
  arm,arm64/xen: introduce HYPERVISOR_suspend()
  xen: refactor suspend pre/post hooks
  arm: xen: export HYPERVISOR_multicall to modules.
  arm64: introduce virt_to_pfn
  arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
  arm: xen: implement multicall hypercall support.
parents 5d70dacd 77945ca7

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

+11 −5
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define _ASM_ARM_XEN_HYPERCALL_H

#define _ASM_ARM_XEN_HYPERCALL_H





#include <xen/interface/xen.h>

#include <xen/interface/xen.h>

#include <xen/interface/sched.h>





long privcmd_call(unsigned call, unsigned long a1,

long privcmd_call(unsigned call, unsigned long a1,

		unsigned long a2, unsigned long a3,

		unsigned long a2, unsigned long a3,
@@ -48,6 +49,16 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg); 
int HYPERVISOR_physdev_op(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_vcpu_op(int cmd, int vcpuid, void *extra_args);

int HYPERVISOR_tmem_op(void *arg);

int HYPERVISOR_tmem_op(void *arg);

int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr);



static inline int

HYPERVISOR_suspend(unsigned long start_info_mfn)

{

	struct sched_shutdown r = { .reason = SHUTDOWN_suspend };



	/* start_info_mfn is unused on ARM */

	return HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

}





static inline void

static inline void

MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,

MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
@@ -63,9 +74,4 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, 
	BUG();

	BUG();

}

}





static inline int

HYPERVISOR_multicall(void *call_list, int nr_calls)

{

	BUG();

}

#endif /* _ASM_ARM_XEN_HYPERCALL_H */
 
#endif /* _ASM_ARM_XEN_HYPERCALL_H */

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,8 @@ typedef uint64_t xen_pfn_t; 
#define PRI_xen_pfn "llx"

#define PRI_xen_pfn "llx"

typedef uint64_t xen_ulong_t;

typedef uint64_t xen_ulong_t;

#define PRI_xen_ulong "llx"

#define PRI_xen_ulong "llx"

typedef int64_t xen_long_t;

#define PRI_xen_long "llx"

/* Guest handles for primitive C types. */

/* Guest handles for primitive C types. */

__DEFINE_GUEST_HANDLE(uchar, unsigned char);

__DEFINE_GUEST_HANDLE(uchar, unsigned char);

__DEFINE_GUEST_HANDLE(uint,  unsigned int);

__DEFINE_GUEST_HANDLE(uint,  unsigned int);

arch/arm/xen/enlighten.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -339,6 +339,14 @@ static int __init xen_pm_init(void) 
}

}

late_initcall(xen_pm_init);

late_initcall(xen_pm_init);







/* empty stubs */

void xen_arch_pre_suspend(void) { }

void xen_arch_post_suspend(int suspend_cancelled) { }

void xen_timer_resume(void) { }

void xen_arch_resume(void) { }





/* In the hypervisor.S file. */

/* In the hypervisor.S file. */

EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);
@@ -350,4 +358,5 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);

EXPORT_SYMBOL_GPL(privcmd_call);
 
EXPORT_SYMBOL_GPL(privcmd_call);

arch/arm/xen/hypercall.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ HYPERCALL2(memory_op); 
HYPERCALL2(physdev_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(tmem_op);

HYPERCALL2(multicall);





ENTRY(privcmd_call)

ENTRY(privcmd_call)

	stmdb sp!, {r4}

	stmdb sp!, {r4}

arch/arm64/xen/hypercall.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ HYPERCALL2(memory_op); 
HYPERCALL2(physdev_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(tmem_op);

HYPERCALL2(multicall);





ENTRY(privcmd_call)

ENTRY(privcmd_call)

	mov x16, x0

	mov x16, x0