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

Commit 0e1dc427 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.1b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen bug fixes from David Vrabel:

 - fix blkback regression if using persistent grants

 - fix various event channel related suspend/resume bugs

 - fix AMD x86 regression with X86_BUG_SYSRET_SS_ATTRS

 - SWIOTLB on ARM now uses frames <4 GiB (if available) so device only
   capable of 32-bit DMA work.

* tag 'for-linus-4.1b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM
  hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests
  xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq()
  xen/console: Update console event channel on resume
  xen/xenbus: Update xenbus event channel on resume
  xen/events: Clear cpu_evtchn_mask before resuming
  xen-pciback: Add name prefix to global 'permissive' variable
  xen: Suspend ticks on all CPUs during suspend
  xen/grant: introduce func gnttab_unmap_refs_sync()
  xen/blkback: safely unmap purge persistent grants
parents 3d54ac9e 8746515d

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

+1 −0
Original line number Diff line number Diff line
@@ -110,5 +110,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
bool xen_arch_need_swiotlb(struct device *dev,

			   unsigned long pfn,

			   unsigned long mfn);

unsigned long xen_get_swiotlb_free_pages(unsigned int order);



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/xen/mm.c

+15 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/gfp.h>

#include <linux/highmem.h>

#include <linux/export.h>

#include <linux/memblock.h>

#include <linux/of_address.h>

#include <linux/slab.h>

#include <linux/types.h>
@@ -21,6 +22,20 @@ 
#include <asm/xen/hypercall.h>

#include <asm/xen/interface.h>



unsigned long xen_get_swiotlb_free_pages(unsigned int order)

{

	struct memblock_region *reg;

	gfp_t flags = __GFP_NOWARN;



	for_each_memblock(memory, reg) {

		if (reg->base < (phys_addr_t)0xffffffff) {

			flags |= __GFP_DMA;

			break;

		}

	}

	return __get_free_pages(flags, order);

}



enum dma_cache_op {

       DMA_UNMAP,

       DMA_MAP,

arch/x86/include/asm/hypervisor.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ extern const struct hypervisor_x86 *x86_hyper; 
/* Recognized hypervisors */

extern const struct hypervisor_x86 x86_hyper_vmware;

extern const struct hypervisor_x86 x86_hyper_ms_hyperv;

extern const struct hypervisor_x86 x86_hyper_xen_hvm;

extern const struct hypervisor_x86 x86_hyper_xen;

extern const struct hypervisor_x86 x86_hyper_kvm;



extern void init_hypervisor(struct cpuinfo_x86 *c);

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

+5 −0
Original line number Diff line number Diff line
@@ -269,4 +269,9 @@ static inline bool xen_arch_need_swiotlb(struct device *dev, 
	return false;

}



static inline unsigned long xen_get_swiotlb_free_pages(unsigned int order)

{

	return __get_free_pages(__GFP_NOWARN, order);

}



#endif /* _ASM_X86_XEN_PAGE_H */

arch/x86/kernel/cpu/hypervisor.c

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 


static const __initconst struct hypervisor_x86 * const hypervisors[] =

{

#ifdef CONFIG_XEN_PVHVM

	&x86_hyper_xen_hvm,

#ifdef CONFIG_XEN

	&x86_hyper_xen,

#endif

	&x86_hyper_vmware,

	&x86_hyper_ms_hyperv,