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

Commit 69908907 authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

xen: make xen_create_contiguous_region return the dma address 



Modify xen_create_contiguous_region to return the dma address of the
newly contiguous buffer.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>


Changes in v4:
- use virt_to_machine instead of virt_to_bus.
parent 2f558d40

arch/x86/xen/mmu.c

+3 −1
Original line number Diff line number Diff line
@@ -2329,7 +2329,8 @@ static int xen_exchange_memory(unsigned long extents_in, unsigned int order_in, 
}



int xen_create_contiguous_region(unsigned long vstart, unsigned int order,

				 unsigned int address_bits)

				 unsigned int address_bits,

				 dma_addr_t *dma_handle)

{

	unsigned long *in_frames = discontig_frames, out_frame;

	unsigned long  flags;
@@ -2368,6 +2369,7 @@ int xen_create_contiguous_region(unsigned long vstart, unsigned int order, 


	spin_unlock_irqrestore(&xen_reservation_lock, flags);



	*dma_handle = virt_to_machine(vstart).maddr;

	return success ? 0 : -ENOMEM;

}

EXPORT_SYMBOL_GPL(xen_create_contiguous_region);

drivers/xen/swiotlb-xen.c

+3 −3
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs) 
{

	int i, rc;

	int dma_bits;

	dma_addr_t dma_handle;



	dma_bits = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT) + PAGE_SHIFT;
@@ -137,7 +138,7 @@ xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs) 
			rc = xen_create_contiguous_region(

				(unsigned long)buf + (i << IO_TLB_SHIFT),

				get_order(slabs << IO_TLB_SHIFT),

				dma_bits);

				dma_bits, &dma_handle);

		} while (rc && dma_bits++ < max_dma_bits);

		if (rc)

			return rc;
@@ -294,11 +295,10 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, 
		*dma_handle = dev_addr;

	else {

		if (xen_create_contiguous_region(vstart, order,

						 fls64(dma_mask)) != 0) {

						 fls64(dma_mask), dma_handle) != 0) {

			free_pages(vstart, order);

			return NULL;

		}

		*dma_handle = virt_to_machine(ret).maddr;

	}

	memset(ret, 0, size);

	return ret;

include/xen/xen-ops.h

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ int xen_setup_shutdown_event(void); 


extern unsigned long *xen_contiguous_bitmap;

int xen_create_contiguous_region(unsigned long vstart, unsigned int order,

				unsigned int address_bits);

				unsigned int address_bits,

				dma_addr_t *dma_handle);



void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);