Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

[platform/kernel/linux-rpi.git] / drivers / pci / p2pdma.c

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index f357f9a..9d53c16 100644 (file)
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -185,9 +185,9 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
                return -ENOMEM;
 
        pgmap = &p2p_pgmap->pgmap;
-       pgmap->res.start = pci_resource_start(pdev, bar) + offset;
-       pgmap->res.end = pgmap->res.start + size - 1;
-       pgmap->res.flags = pci_resource_flags(pdev, bar);
+       pgmap->range.start = pci_resource_start(pdev, bar) + offset;
+       pgmap->range.end = pgmap->range.start + size - 1;
+       pgmap->nr_range = 1;
        pgmap->type = MEMORY_DEVICE_PCI_P2PDMA;
 
        p2p_pgmap->provider = pdev;
@@ -202,13 +202,13 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
 
        error = gen_pool_add_owner(pdev->p2pdma->pool, (unsigned long)addr,
                        pci_bus_address(pdev, bar) + offset,
-                       resource_size(&pgmap->res), dev_to_node(&pdev->dev),
+                       range_len(&pgmap->range), dev_to_node(&pdev->dev),
                        pgmap->ref);
        if (error)
                goto pages_free;
 
-       pci_info(pdev, "added peer-to-peer DMA memory %pR\n",
-                &pgmap->res);
+       pci_info(pdev, "added peer-to-peer DMA memory %#llx-%#llx\n",
+                pgmap->range.start, pgmap->range.end);
 
        return 0;