Commit b5c29fba authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel

iommu: Make iommu_sva_domain_alloc() static

iommu_sva_domain_alloc() is only called in iommu-sva.c, hence make it
static.

On the other hand, iommu_sva_domain_alloc() should not return NULL anymore
after commit <80af5a45> ("iommu: Add ops->domain_alloc_sva()"), the
removal of inline code avoids potential confusion.

Fixes: 80af5a45 ("iommu: Add ops->domain_alloc_sva()")
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20240528045458.81458-1-baolu.lu@linux.intel.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 83a7eefe
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "iommu-priv.h" #include "iommu-priv.h"
static DEFINE_MUTEX(iommu_sva_lock); static DEFINE_MUTEX(iommu_sva_lock);
static struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
struct mm_struct *mm);
/* Allocate a PASID for the mm within range (inclusive) */ /* Allocate a PASID for the mm within range (inclusive) */
static struct iommu_mm_data *iommu_alloc_mm_data(struct mm_struct *mm, struct device *dev) static struct iommu_mm_data *iommu_alloc_mm_data(struct mm_struct *mm, struct device *dev)
...@@ -277,8 +279,8 @@ static int iommu_sva_iopf_handler(struct iopf_group *group) ...@@ -277,8 +279,8 @@ static int iommu_sva_iopf_handler(struct iopf_group *group)
return 0; return 0;
} }
struct iommu_domain *iommu_sva_domain_alloc(struct device *dev, static struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
struct mm_struct *mm) struct mm_struct *mm)
{ {
const struct iommu_ops *ops = dev_iommu_ops(dev); const struct iommu_ops *ops = dev_iommu_ops(dev);
struct iommu_domain *domain; struct iommu_domain *domain;
......
...@@ -1527,8 +1527,6 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, ...@@ -1527,8 +1527,6 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev,
struct mm_struct *mm); struct mm_struct *mm);
void iommu_sva_unbind_device(struct iommu_sva *handle); void iommu_sva_unbind_device(struct iommu_sva *handle);
u32 iommu_sva_get_pasid(struct iommu_sva *handle); u32 iommu_sva_get_pasid(struct iommu_sva *handle);
struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
struct mm_struct *mm);
#else #else
static inline struct iommu_sva * static inline struct iommu_sva *
iommu_sva_bind_device(struct device *dev, struct mm_struct *mm) iommu_sva_bind_device(struct device *dev, struct mm_struct *mm)
...@@ -1553,12 +1551,6 @@ static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) ...@@ -1553,12 +1551,6 @@ static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm)
} }
static inline void mm_pasid_drop(struct mm_struct *mm) {} static inline void mm_pasid_drop(struct mm_struct *mm) {}
static inline struct iommu_domain *
iommu_sva_domain_alloc(struct device *dev, struct mm_struct *mm)
{
return NULL;
}
#endif /* CONFIG_IOMMU_SVA */ #endif /* CONFIG_IOMMU_SVA */
#ifdef CONFIG_IOMMU_IOPF #ifdef CONFIG_IOMMU_IOPF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment