aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

PCI/P2PDMA: Introduce private pagemap structure

Browse Source 
Move the PCI bus offset from the generic dev_pagemap structure to a
specific pci_p2pdma_pagemap structure.

This structure will grow in subsequent patches.

Link: https://lore.kernel.org/r/20190730163545.4915-2-logang@deltatee.com
Link: https://lore.kernel.org/r/20190812173048.9186-2-logang@deltatee.com
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Logan Gunthorpe
2019-08-12 11:30:35 -06:00
committed by Bjorn Helgaas
parent 5f9e832c13
commit a6e6fe6549
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pci/p2pdma.c
View File

@@ -25,6 +25,16 @@ struct pci_p2pdma {
bool p2pmem_published; bool p2pmem_published;
}; };
struct pci_p2pdma_pagemap {
struct dev_pagemap pgmap;
u64 bus_offset;
};
static struct pci_p2pdma_pagemap *to_p2p_pgmap(struct dev_pagemap *pgmap)
{
return container_of(pgmap, struct pci_p2pdma_pagemap, pgmap);
}
static ssize_t size_show(struct device *dev, struct device_attribute *attr, static ssize_t size_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
@@ -135,6 +145,7 @@ out:
int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size, int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
u64 offset) u64 offset)
{ {
struct pci_p2pdma_pagemap *p2p_pgmap;
struct dev_pagemap *pgmap; struct dev_pagemap *pgmap;
void *addr; void *addr;
int error; int error;
@@ -157,14 +168,17 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
return error; return error;
} }
pgmap = devm_kzalloc(&pdev->dev, sizeof(*pgmap), GFP_KERNEL); p2p_pgmap = devm_kzalloc(&pdev->dev, sizeof(*p2p_pgmap), GFP_KERNEL);
if (!pgmap) if (!p2p_pgmap)
return -ENOMEM; return -ENOMEM;
pgmap = &p2p_pgmap->pgmap;
pgmap->res.start = pci_resource_start(pdev, bar) + offset; pgmap->res.start = pci_resource_start(pdev, bar) + offset;
pgmap->res.end = pgmap->res.start + size - 1; pgmap->res.end = pgmap->res.start + size - 1;
pgmap->res.flags = pci_resource_flags(pdev, bar); pgmap->res.flags = pci_resource_flags(pdev, bar);
pgmap->type = MEMORY_DEVICE_PCI_P2PDMA; pgmap->type = MEMORY_DEVICE_PCI_P2PDMA;
pgmap->pci_p2pdma_bus_offset = pci_bus_address(pdev, bar) -
p2p_pgmap->bus_offset = pci_bus_address(pdev, bar) -
pci_resource_start(pdev, bar); pci_resource_start(pdev, bar);
addr = devm_memremap_pages(&pdev->dev, pgmap); addr = devm_memremap_pages(&pdev->dev, pgmap);
@@ -720,7 +734,7 @@ EXPORT_SYMBOL_GPL(pci_p2pmem_publish);
int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents, int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
struct dev_pagemap *pgmap; struct pci_p2pdma_pagemap *p2p_pgmap;
struct scatterlist *s; struct scatterlist *s;
phys_addr_t paddr; phys_addr_t paddr;
int i; int i;
@@ -736,10 +750,10 @@ int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
return 0; return 0;
for_each_sg(sg, s, nents, i) { for_each_sg(sg, s, nents, i) {
pgmap = sg_page(s)->pgmap; p2p_pgmap = to_p2p_pgmap(sg_page(s)->pgmap);
paddr = sg_phys(s); paddr = sg_phys(s);
s->dma_address = paddr - pgmap->pci_p2pdma_bus_offset; s->dma_address = paddr - p2p_pgmap->bus_offset;
sg_dma_len(s) = s->length; sg_dma_len(s) = s->length;
} }

1
include/linux/memremap.h
View File

@@ -112,7 +112,6 @@ struct dev_pagemap {
struct device *dev; struct device *dev;
enum memory_type type; enum memory_type type;
unsigned int flags; unsigned int flags;
u64 pci_p2pdma_bus_offset;
const struct dev_pagemap_ops *ops; const struct dev_pagemap_ops *ops;
}; };