Merge tag 'iommu-updates-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 83a55df17dfe48891762a9a1ce2974adc5bd3db8..688e77576e5a50b3f2f137eec72cd721d6bf96fa 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -54,6 +54,8 @@
 #include "amd_iommu_types.h"
 #include "irq_remapping.h"
 
+#define AMD_IOMMU_MAPPING_ERROR        0
+
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 
 #define LOOP_TIMEOUT   100000
@@ -2549,7 +2551,7 @@ static dma_addr_t __map_single(struct device *dev,
        paddr &= PAGE_MASK;
 
        address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
-       if (address == DMA_ERROR_CODE)
+       if (address == AMD_IOMMU_MAPPING_ERROR)
                goto out;
 
        prot = dir2prot(direction);
@@ -2586,7 +2588,7 @@ out_unmap:
 
        dma_ops_free_iova(dma_dom, address, pages);
 
-       return DMA_ERROR_CODE;
+       return AMD_IOMMU_MAPPING_ERROR;
 }
 
 /*
@@ -2638,7 +2640,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
        if (PTR_ERR(domain) == -EINVAL)
                return (dma_addr_t)paddr;
        else if (IS_ERR(domain))
-               return DMA_ERROR_CODE;
+               return AMD_IOMMU_MAPPING_ERROR;
 
        dma_mask = *dev->dma_mask;
        dma_dom = to_dma_ops_domain(domain);
@@ -2715,7 +2717,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
        npages = sg_num_pages(dev, sglist, nelems);
 
        address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
-       if (address == DMA_ERROR_CODE)
+       if (address == AMD_IOMMU_MAPPING_ERROR)
                goto out_err;
 
        prot = dir2prot(direction);
@@ -2838,7 +2840,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
        *dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
                                 size, DMA_BIDIRECTIONAL, dma_mask);
 
-       if (*dma_addr == DMA_ERROR_CODE)
+       if (*dma_addr == AMD_IOMMU_MAPPING_ERROR)
                goto out_free;
 
        return page_address(page);
@@ -2884,9 +2886,16 @@ free_mem:
  */
 static int amd_iommu_dma_supported(struct device *dev, u64 mask)
 {
+       if (!x86_dma_supported(dev, mask))
+               return 0;
        return check_device(dev);
 }
 
+static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
+{
+       return dma_addr == AMD_IOMMU_MAPPING_ERROR;
+}
+
 static const struct dma_map_ops amd_iommu_dma_ops = {
        .alloc          = alloc_coherent,
        .free           = free_coherent,
@@ -2895,6 +2904,7 @@ static const struct dma_map_ops amd_iommu_dma_ops = {
        .map_sg         = map_sg,
        .unmap_sg       = unmap_sg,
        .dma_supported  = amd_iommu_dma_supported,
+       .mapping_error  = amd_iommu_mapping_error,
 };
 
 static int init_reserved_iova_ranges(void)
@@ -4510,21 +4520,29 @@ static void ir_compose_msi_msg(struct irq_data *irq_data, struct msi_msg *msg)
 }
 
 static struct irq_chip amd_ir_chip = {
-       .irq_ack = ir_ack_apic_edge,
-       .irq_set_affinity = amd_ir_set_affinity,
-       .irq_set_vcpu_affinity = amd_ir_set_vcpu_affinity,
-       .irq_compose_msi_msg = ir_compose_msi_msg,
+       .name                   = "AMD-IR",
+       .irq_ack                = ir_ack_apic_edge,
+       .irq_set_affinity       = amd_ir_set_affinity,
+       .irq_set_vcpu_affinity  = amd_ir_set_vcpu_affinity,
+       .irq_compose_msi_msg    = ir_compose_msi_msg,
 };
 
 int amd_iommu_create_irq_domain(struct amd_iommu *iommu)
 {
-       iommu->ir_domain = irq_domain_add_tree(NULL, &amd_ir_domain_ops, iommu);
+       struct fwnode_handle *fn;
+
+       fn = irq_domain_alloc_named_id_fwnode("AMD-IR", iommu->index);
+       if (!fn)
+               return -ENOMEM;
+       iommu->ir_domain = irq_domain_create_tree(fn, &amd_ir_domain_ops, iommu);
+       irq_domain_free_fwnode(fn);
        if (!iommu->ir_domain)
                return -ENOMEM;
 
        iommu->ir_domain->parent = arch_get_ir_parent_domain();
-       iommu->msi_domain = arch_create_msi_irq_domain(iommu->ir_domain);
-
+       iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,
+                                                            "AMD-IR-MSI",
+                                                            iommu->index);
        return 0;
 }