shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FROMLIST: iommu/dma: Allow drivers to reserve an iova range"

Browse Source 
This reverts commit 0d5de782bb as it was
not accepted upstream and it causes merge issues with 5.11-rc1.

If this change is still needed, please work with upstream to get it
accepted and then submit the backported patch here.

Bug: 149544395
Cc: Patrick Daly <pdaly@codeaurora.org>
Cc: Isaac J. Manjarres <isaacm@codeaurora.org>
Cc: Chris Goldsworthy <cgoldswo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I53fb1d0d5245de3c1afc03246f31a36333b055ff
This commit is contained in:
Greg Kroah-Hartman
2020-12-18 17:30:46 +01:00
parent dd2de4d121
commit 0cb1adebab
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/iommu/dma-iommu.c
View File

@@ -370,34 +370,6 @@ static int iommu_dma_deferred_attach(struct device *dev,
return 0;
}
/*
* Should be called prior to using dma-apis
*/
int iommu_dma_reserve_iova(struct device *dev, dma_addr_t base,
u64 size)
{
struct iommu_domain *domain;
struct iommu_dma_cookie *cookie;
struct iova_domain *iovad;
unsigned long pfn_lo, pfn_hi;
domain = iommu_get_domain_for_dev(dev);
if (!domain || !domain->iova_cookie)
return -EINVAL;
cookie = domain->iova_cookie;
iovad = &cookie->iovad;
/* iova will be freed automatically by put_iova_domain() */
pfn_lo = iova_pfn(iovad, base);
pfn_hi = iova_pfn(iovad, base + size - 1);
if (!reserve_iova(iovad, pfn_lo, pfn_hi))
return -EINVAL;
return 0;
}
EXPORT_SYMBOL(iommu_dma_reserve_iova);
/**
* dma_info_to_prot - Translate DMA API directions and attributes to IOMMU API
* page flags.

9
include/linux/dma-iommu.h
View File

@@ -37,9 +37,6 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
int iommu_dma_reserve_iova(struct device *dev, dma_addr_t base,
u64 size);
#else /* CONFIG_IOMMU_DMA */
struct iommu_domain;
@@ -81,11 +78,5 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
{
}
static inline int iommu_dma_reserve_iova(struct device *dev, dma_addr_t base,
u64 size)
{
return -ENODEV;
}
#endif /* CONFIG_IOMMU_DMA */
#endif /* __DMA_IOMMU_H */