Merge "ARM: dma-mapping: convert DMA direction into IOMMU protection attributes"

{

	struct dma_iommu_mapping *mapping = dev->archdata.mapping;

	dma_addr_t dma_addr;

	int ret, len = PAGE_ALIGN(size + offset);

	int ret, prot, len = PAGE_ALIGN(size + offset);

	dma_addr = __alloc_iova(mapping, len);

	if (dma_addr == DMA_ERROR_CODE)

		return dma_addr;

	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, 0);

	switch (dir) {

	case DMA_BIDIRECTIONAL:

		prot = IOMMU_READ | IOMMU_WRITE;

		break;

	case DMA_TO_DEVICE:

		prot = IOMMU_READ;

		break;

	case DMA_FROM_DEVICE:

		prot = IOMMU_WRITE;

		break;

	default:

		prot = 0;

	}

	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot);

	if (ret < 0)

		goto fail;