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

Commit e1d8f62a authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

Merge remote-tracking branch 'stefano/swiotlb-xen-9.1' into stable/for-linus-3.13 



* stefano/swiotlb-xen-9.1:
  swiotlb-xen: fix error code returned by xen_swiotlb_map_sg_attrs
  swiotlb-xen: static inline xen_phys_to_bus, xen_bus_to_phys, xen_virt_to_bus and range_straddles_page_boundary
  grant-table: call set_phys_to_machine after mapping grant refs
  arm,arm64: do not always merge biovec if we are running on Xen
  swiotlb: print a warning when the swiotlb is full
  swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device
  xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device
  swiotlb-xen: use xen_alloc/free_coherent_pages
  xen: introduce xen_alloc/free_coherent_pages
  arm64/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain
  arm/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain
  swiotlb-xen: introduce xen_swiotlb_set_dma_mask
  xen/arm,arm64: enable SWIOTLB_XEN
  xen: make xen_create_contiguous_region return the dma address
  xen/x86: allow __set_phys_to_machine for autotranslate guests
  arm/xen,arm64/xen: introduce p2m
  arm64: define DMA_ERROR_CODE
  arm: make SWIOTLB available

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Conflicts:
	arch/arm/include/asm/dma-mapping.h
	drivers/xen/swiotlb-xen.c

[Conflicts arose b/c "arm: make SWIOTLB available" v8 was in Stefano's
branch, while I had v9 + Ack from Russel. I also fixed up white-space
issues]
parents bad97817 15177608

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1888,6 +1888,7 @@ config XEN 
	depends on CPU_V7 && !CPU_V6

	depends on !GENERIC_ATOMIC64

	select ARM_PSCI

	select SWIOTLB_XEN

	help

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

arch/arm/include/asm/dma-mapping.h

+12 −1
Original line number Diff line number Diff line
@@ -11,17 +11,28 @@ 
#include <asm-generic/dma-coherent.h>

#include <asm/memory.h>



#include <xen/xen.h>

#include <asm/xen/hypervisor.h>



#define DMA_ERROR_CODE	(~0)

extern struct dma_map_ops arm_dma_ops;

extern struct dma_map_ops arm_coherent_dma_ops;



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)

{

	if (dev && dev->archdata.dma_ops)

		return dev->archdata.dma_ops;

	return &arm_dma_ops;

}



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

	if (xen_initial_domain())

		return xen_dma_ops;

	else

		return __generic_dma_ops(dev);

}



static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)

{

	BUG_ON(!dev);

arch/arm/include/asm/io.h

+8 −0
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ 
#ifdef __KERNEL__



#include <linux/types.h>

#include <linux/blk_types.h>

#include <asm/byteorder.h>

#include <asm/memory.h>

#include <asm-generic/pci_iomap.h>

#include <xen/xen.h>



/*

 * ISA I/O bus memory addresses are 1:1 with the physical address.
@@ -372,6 +374,12 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); 
#define BIOVEC_MERGEABLE(vec1, vec2)	\

	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))



extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,

				      const struct bio_vec *vec2);

#define BIOVEC_PHYS_MERGEABLE(vec1, vec2)				\

	(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&				\

	 (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))



#ifdef CONFIG_MMU

#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

extern int valid_phys_addr_range(phys_addr_t addr, size_t size);

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

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void) 
	return PARAVIRT_LAZY_NONE;

}



extern struct dma_map_ops *xen_dma_ops;



#endif /* _ASM_ARM_XEN_HYPERVISOR_H */

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

0 → 100644
+50 −0
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_XEN_PAGE_COHERENT_H

#define _ASM_ARM_XEN_PAGE_COHERENT_H



#include <asm/page.h>

#include <linux/dma-attrs.h>

#include <linux/dma-mapping.h>



static inline void *xen_alloc_coherent_pages(struct device *hwdev, size_t size,

		dma_addr_t *dma_handle, gfp_t flags,

		struct dma_attrs *attrs)

{

	return __generic_dma_ops(hwdev)->alloc(hwdev, size, dma_handle, flags, attrs);

}



static inline void xen_free_coherent_pages(struct device *hwdev, size_t size,

		void *cpu_addr, dma_addr_t dma_handle,

		struct dma_attrs *attrs)

{

	__generic_dma_ops(hwdev)->free(hwdev, size, cpu_addr, dma_handle, attrs);

}



static inline void xen_dma_map_page(struct device *hwdev, struct page *page,

	     unsigned long offset, size_t size, enum dma_data_direction dir,

	     struct dma_attrs *attrs)

{

	__generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs);

}



static inline void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle,

		size_t size, enum dma_data_direction dir,

		struct dma_attrs *attrs)

{

	if (__generic_dma_ops(hwdev)->unmap_page)

		__generic_dma_ops(hwdev)->unmap_page(hwdev, handle, size, dir, attrs);

}



static inline void xen_dma_sync_single_for_cpu(struct device *hwdev,

		dma_addr_t handle, size_t size, enum dma_data_direction dir)

{

	if (__generic_dma_ops(hwdev)->sync_single_for_cpu)

		__generic_dma_ops(hwdev)->sync_single_for_cpu(hwdev, handle, size, dir);

}



static inline void xen_dma_sync_single_for_device(struct device *hwdev,

		dma_addr_t handle, size_t size, enum dma_data_direction dir)

{

	if (__generic_dma_ops(hwdev)->sync_single_for_device)

		__generic_dma_ops(hwdev)->sync_single_for_device(hwdev, handle, size, dir);

}

#endif /* _ASM_ARM_XEN_PAGE_COHERENT_H */