* [PATCH] iommu: move sg_table wrapper out of CONFIG_IOMMU_SUPPORT [not found] <CGME20200630081806eucas1p2a9a0ecae69dfe3306092aff30e21cb5c@eucas1p2.samsung.com> @ 2020-06-30 8:17 ` Marek Szyprowski 0 siblings, 0 replies; 4+ messages in thread From: Marek Szyprowski @ 2020-06-30 8:17 UTC (permalink / raw) To: iommu, linux-kernel; +Cc: Bartlomiej Zolnierkiewicz Move the recently added sg_table wrapper out of CONFIG_IOMMU_SUPPORT to let the client code copile also when IOMMU support is disabled. Fixes: 48530d9fab0d ("iommu: add generic helper for mapping sgtable objects") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- include/linux/iommu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 5f0b7859d2eb..5657d4fef9f2 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -457,22 +457,6 @@ extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t io extern void iommu_set_fault_handler(struct iommu_domain *domain, iommu_fault_handler_t handler, void *token); -/** - * iommu_map_sgtable - Map the given buffer to the IOMMU domain - * @domain: The IOMMU domain to perform the mapping - * @iova: The start address to map the buffer - * @sgt: The sg_table object describing the buffer - * @prot: IOMMU protection bits - * - * Creates a mapping at @iova for the buffer described by a scatterlist - * stored in the given sg_table object in the provided IOMMU domain. - */ -static inline size_t iommu_map_sgtable(struct iommu_domain *domain, - unsigned long iova, struct sg_table *sgt, int prot) -{ - return iommu_map_sg(domain, iova, sgt->sgl, sgt->orig_nents, prot); -} - extern void iommu_get_resv_regions(struct device *dev, struct list_head *list); extern void iommu_put_resv_regions(struct device *dev, struct list_head *list); extern void generic_iommu_put_resv_regions(struct device *dev, @@ -1079,6 +1063,22 @@ static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev) } #endif /* CONFIG_IOMMU_API */ +/** + * iommu_map_sgtable - Map the given buffer to the IOMMU domain + * @domain: The IOMMU domain to perform the mapping + * @iova: The start address to map the buffer + * @sgt: The sg_table object describing the buffer + * @prot: IOMMU protection bits + * + * Creates a mapping at @iova for the buffer described by a scatterlist + * stored in the given sg_table object in the provided IOMMU domain. + */ +static inline size_t iommu_map_sgtable(struct iommu_domain *domain, + unsigned long iova, struct sg_table *sgt, int prot) +{ + return iommu_map_sg(domain, iova, sgt->sgl, sgt->orig_nents, prot); +} + #ifdef CONFIG_IOMMU_DEBUGFS extern struct dentry *iommu_debugfs_dir; void iommu_debugfs_setup(void); -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] iommu: move sg_table wrapper out of CONFIG_IOMMU_SUPPORT @ 2020-06-30 8:17 ` Marek Szyprowski 0 siblings, 0 replies; 4+ messages in thread From: Marek Szyprowski @ 2020-06-30 8:17 UTC (permalink / raw) To: iommu, linux-kernel Cc: Marek Szyprowski, Joerg Roedel, Bartlomiej Zolnierkiewicz Move the recently added sg_table wrapper out of CONFIG_IOMMU_SUPPORT to let the client code copile also when IOMMU support is disabled. Fixes: 48530d9fab0d ("iommu: add generic helper for mapping sgtable objects") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- include/linux/iommu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 5f0b7859d2eb..5657d4fef9f2 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -457,22 +457,6 @@ extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t io extern void iommu_set_fault_handler(struct iommu_domain *domain, iommu_fault_handler_t handler, void *token); -/** - * iommu_map_sgtable - Map the given buffer to the IOMMU domain - * @domain: The IOMMU domain to perform the mapping - * @iova: The start address to map the buffer - * @sgt: The sg_table object describing the buffer - * @prot: IOMMU protection bits - * - * Creates a mapping at @iova for the buffer described by a scatterlist - * stored in the given sg_table object in the provided IOMMU domain. - */ -static inline size_t iommu_map_sgtable(struct iommu_domain *domain, - unsigned long iova, struct sg_table *sgt, int prot) -{ - return iommu_map_sg(domain, iova, sgt->sgl, sgt->orig_nents, prot); -} - extern void iommu_get_resv_regions(struct device *dev, struct list_head *list); extern void iommu_put_resv_regions(struct device *dev, struct list_head *list); extern void generic_iommu_put_resv_regions(struct device *dev, @@ -1079,6 +1063,22 @@ static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev) } #endif /* CONFIG_IOMMU_API */ +/** + * iommu_map_sgtable - Map the given buffer to the IOMMU domain + * @domain: The IOMMU domain to perform the mapping + * @iova: The start address to map the buffer + * @sgt: The sg_table object describing the buffer + * @prot: IOMMU protection bits + * + * Creates a mapping at @iova for the buffer described by a scatterlist + * stored in the given sg_table object in the provided IOMMU domain. + */ +static inline size_t iommu_map_sgtable(struct iommu_domain *domain, + unsigned long iova, struct sg_table *sgt, int prot) +{ + return iommu_map_sg(domain, iova, sgt->sgl, sgt->orig_nents, prot); +} + #ifdef CONFIG_IOMMU_DEBUGFS extern struct dentry *iommu_debugfs_dir; void iommu_debugfs_setup(void); -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] iommu: move sg_table wrapper out of CONFIG_IOMMU_SUPPORT 2020-06-30 8:17 ` Marek Szyprowski @ 2020-06-30 10:17 ` Joerg Roedel -1 siblings, 0 replies; 4+ messages in thread From: Joerg Roedel @ 2020-06-30 10:17 UTC (permalink / raw) To: Marek Szyprowski; +Cc: iommu, linux-kernel, Bartlomiej Zolnierkiewicz On Tue, Jun 30, 2020 at 10:17:56AM +0200, Marek Szyprowski wrote: > Move the recently added sg_table wrapper out of CONFIG_IOMMU_SUPPORT to > let the client code copile also when IOMMU support is disabled. > > Fixes: 48530d9fab0d ("iommu: add generic helper for mapping sgtable objects") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > include/linux/iommu.h | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) Applied, thanks (not for v5.8, as there seem to be no users yet). _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iommu: move sg_table wrapper out of CONFIG_IOMMU_SUPPORT @ 2020-06-30 10:17 ` Joerg Roedel 0 siblings, 0 replies; 4+ messages in thread From: Joerg Roedel @ 2020-06-30 10:17 UTC (permalink / raw) To: Marek Szyprowski; +Cc: iommu, linux-kernel, Bartlomiej Zolnierkiewicz On Tue, Jun 30, 2020 at 10:17:56AM +0200, Marek Szyprowski wrote: > Move the recently added sg_table wrapper out of CONFIG_IOMMU_SUPPORT to > let the client code copile also when IOMMU support is disabled. > > Fixes: 48530d9fab0d ("iommu: add generic helper for mapping sgtable objects") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > include/linux/iommu.h | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) Applied, thanks (not for v5.8, as there seem to be no users yet). ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-30 10:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20200630081806eucas1p2a9a0ecae69dfe3306092aff30e21cb5c@eucas1p2.samsung.com>
2020-06-30 8:17 ` [PATCH] iommu: move sg_table wrapper out of CONFIG_IOMMU_SUPPORT Marek Szyprowski
2020-06-30 8:17 ` Marek Szyprowski
2020-06-30 10:17 ` Joerg Roedel
2020-06-30 10:17 ` Joerg Roedel
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.