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

Commit 3d1975b5 authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

arm,arm64: do not always merge biovec if we are running on Xen 



This is similar to what it is done on X86: biovecs are prevented from merging
otherwise every dma requests would be forced to bounce on the swiotlb buffer.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>


Changes in v7:
- remove the extra autotranslate check in biomerge.c.
parent 783d0281

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/arm64/include/asm/io.h

+9 −0
Original line number Diff line number Diff line
@@ -22,11 +22,14 @@ 
#ifdef __KERNEL__



#include <linux/types.h>

#include <linux/blk_types.h>



#include <asm/byteorder.h>

#include <asm/barrier.h>

#include <asm/pgtable.h>



#include <xen/xen.h>



/*

 * Generic IO read/write.  These perform native-endian accesses.

 */
@@ -263,5 +266,11 @@ extern int devmem_is_allowed(unsigned long pfn); 
 */

#define xlate_dev_kmem_ptr(p)	p



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)))



#endif	/* __KERNEL__ */

#endif	/* __ASM_IO_H */