p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PCI/P2PDMA: Add attrs argument to pci_p2pdma_map_sg() 

This is to match the dma_map_sg() API which this function will have to call
in an future patch.

Add a pci_p2pdma_map_sg_attrs() function and helper to call it with no
attributes just like the dma_map_sg() function.

Link: https://lore.kernel.org/r/20190730163545.4915-9-logang@deltatee.com
Link: https://lore.kernel.org/r/20190812173048.9186-9-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:42 -06:00 committed by Bjorn Helgaas
parent 494d63b0d5
commit 2b9f4bb2a4
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvme/host/pci.c
View File

@ -832,8 +832,8 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
goto out; goto out;
if (is_pci_p2pdma_page(sg_page(iod->sg))) if (is_pci_p2pdma_page(sg_page(iod->sg)))
nr_mapped = pci_p2pdma_map_sg(dev->dev, iod->sg, iod->nents, nr_mapped = pci_p2pdma_map_sg_attrs(dev->dev, iod->sg,
rq_dma_dir(req)); iod->nents, rq_dma_dir(req), DMA_ATTR_NO_WARN);
else else
nr_mapped = dma_map_sg_attrs(dev->dev, iod->sg, iod->nents, nr_mapped = dma_map_sg_attrs(dev->dev, iod->sg, iod->nents,
rq_dma_dir(req), DMA_ATTR_NO_WARN); rq_dma_dir(req), DMA_ATTR_NO_WARN);

7
drivers/pci/p2pdma.c
View File

@ -798,13 +798,14 @@ EXPORT_SYMBOL_GPL(pci_p2pmem_publish);
* @sg: scatter list to map * @sg: scatter list to map
* @nents: elements in the scatterlist * @nents: elements in the scatterlist
* @dir: DMA direction * @dir: DMA direction
* @attrs: DMA attributes passed to dma_map_sg() (if called)
* *
* Scatterlists mapped with this function should not be unmapped in any way. * Scatterlists mapped with this function should not be unmapped in any way.
* *
* Returns the number of SG entries mapped or 0 on error. * Returns the number of SG entries mapped or 0 on error.
*/ */
int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents, int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
enum dma_data_direction dir) int nents, enum dma_data_direction dir, unsigned long attrs)
{ {
struct pci_p2pdma_pagemap *p2p_pgmap; struct pci_p2pdma_pagemap *p2p_pgmap;
struct scatterlist *s; struct scatterlist *s;
@ -831,7 +832,7 @@ int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
return nents; return nents;
} }
EXPORT_SYMBOL_GPL(pci_p2pdma_map_sg); EXPORT_SYMBOL_GPL(pci_p2pdma_map_sg_attrs);
/** /**
* pci_p2pdma_enable_store - parse a configfs/sysfs attribute store * pci_p2pdma_enable_store - parse a configfs/sysfs attribute store

15
include/linux/pci-p2pdma.h
View File

@ -30,8 +30,8 @@ struct scatterlist *pci_p2pmem_alloc_sgl(struct pci_dev *pdev,
unsigned int *nents, u32 length); unsigned int *nents, u32 length);
void pci_p2pmem_free_sgl(struct pci_dev *pdev, struct scatterlist *sgl); void pci_p2pmem_free_sgl(struct pci_dev *pdev, struct scatterlist *sgl);
void pci_p2pmem_publish(struct pci_dev *pdev, bool publish); void pci_p2pmem_publish(struct pci_dev *pdev, bool publish);
int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg, int nents, int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
enum dma_data_direction dir); int nents, enum dma_data_direction dir, unsigned long attrs);
int pci_p2pdma_enable_store(const char *page, struct pci_dev **p2p_dev, int pci_p2pdma_enable_store(const char *page, struct pci_dev **p2p_dev,
bool *use_p2pdma); bool *use_p2pdma);
ssize_t pci_p2pdma_enable_show(char *page, struct pci_dev *p2p_dev, ssize_t pci_p2pdma_enable_show(char *page, struct pci_dev *p2p_dev,
@ -81,8 +81,9 @@ static inline void pci_p2pmem_free_sgl(struct pci_dev *pdev,
static inline void pci_p2pmem_publish(struct pci_dev *pdev, bool publish) static inline void pci_p2pmem_publish(struct pci_dev *pdev, bool publish)
{ {
} }
static inline int pci_p2pdma_map_sg(struct device *dev, static inline int pci_p2pdma_map_sg_attrs(struct device *dev,
struct scatterlist *sg, int nents, enum dma_data_direction dir) struct scatterlist *sg, int nents, enum dma_data_direction dir,
unsigned long attrs)
{ {
return 0; return 0;
} }
@ -111,4 +112,10 @@ static inline struct pci_dev *pci_p2pmem_find(struct device *client)
return pci_p2pmem_find_many(&client, 1); return pci_p2pmem_find_many(&client, 1);
} }
static inline int pci_p2pdma_map_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction dir)
{
return pci_p2pdma_map_sg_attrs(dev, sg, nents, dir, 0);
}
#endif /* _LINUX_PCI_P2P_H */ #endif /* _LINUX_PCI_P2P_H */