2 files changed, 7 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8e0777fae3ce..627e4c89328e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3928,8 +3928,6 @@ M:	bootc@bootc.net
 S:      Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
-P:      Ingo Molnar
-M:      mingo@redhat.com
 P:      Neil Brown
 M:      neilb@suse.de
 L:      linux-raid@vger.kernel.org
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 78330c37a61b..5f6c629a924d 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -467,9 +467,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
         dma_addr_t dev_addr;
         void *ret;
         int order = get_order(size);
+        u64 dma_mask = DMA_32BIT_MASK;
+
+        if (hwdev && hwdev->coherent_dma_mask)
+                dma_mask = hwdev->coherent_dma_mask;
 
         ret = (void *)__get_free_pages(flags, order);
-        if (ret && address_needs_mapping(hwdev, virt_to_bus(ret), size)) {
+        if (ret && !is_buffer_dma_capable(dma_mask, virt_to_bus(ret), size)) {
                 /*
                  * The allocated memory isn't reachable by the device.
                  * Fall back on swiotlb_map_single().
@@ -493,9 +497,9 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
         dev_addr = virt_to_bus(ret);
 
         /* Confirm address can be DMA'd by device */
-        if (address_needs_mapping(hwdev, dev_addr, size)) {
+        if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) {
                 printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
-                       (unsigned long long)*hwdev->dma_mask,
+                       (unsigned long long)dma_mask,
                        (unsigned long long)dev_addr);
 
                 /* DMA_TO_DEVICE to avoid memcpy in unmap_single */