On Thu, Jun 26, 2025 at 12:34:34PM -0700, Nicolin Chen wrote: > Replace u32 to make it clear. No functional changes. > > Also simplify the kdoc since the type itself is clear enough. > > Signed-off-by: Nicolin Chen <nicol...@nvidia.com> > --- > include/linux/iommu.h | 6 +++--- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 3 ++- > drivers/iommu/intel/iommu.c | 3 ++- > drivers/iommu/iommufd/selftest.c | 3 ++- > 4 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 04548b18df28..b87c2841e6bc 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -563,8 +563,7 @@ iommu_copy_struct_from_full_user_array(void *kdst, size_t > kdst_entry_size, > * @capable: check capability > * @hw_info: report iommu hardware information. The data buffer returned by > this > * op is allocated in the iommu driver and freed by the caller > after > - * use. The information type is one of enum iommu_hw_info_type > defined > - * in include/uapi/linux/iommufd.h. > + * use. > * @domain_alloc: Do not use in new drivers > * @domain_alloc_identity: allocate an IDENTITY domain. Drivers should > prefer to > * use identity_domain instead. This should only be > used > @@ -623,7 +622,8 @@ iommu_copy_struct_from_full_user_array(void *kdst, size_t > kdst_entry_size, > */ > struct iommu_ops { > bool (*capable)(struct device *dev, enum iommu_cap); > - void *(*hw_info)(struct device *dev, u32 *length, u32 *type); > + void *(*hw_info)(struct device *dev, u32 *length, > + enum iommu_hw_info_type *type); > > /* Domain allocation and freeing by the iommu driver */ > #if IS_ENABLED(CONFIG_FSL_PAMU) > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c > b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c > index 9f59c95a254c..69bbe39e28de 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c > @@ -7,7 +7,8 @@ > > #include "arm-smmu-v3.h" > > -void *arm_smmu_hw_info(struct device *dev, u32 *length, u32 *type) > +void *arm_smmu_hw_info(struct device *dev, u32 *length, > + enum iommu_hw_info_type *type) > { > struct arm_smmu_master *master = dev_iommu_priv_get(dev); > struct iommu_hw_info_arm_smmuv3 *info; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index 7aa3932251b2..850f1a6f548c 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -4091,7 +4091,8 @@ static int intel_iommu_set_dev_pasid(struct > iommu_domain *domain, > return ret; > } > > -static void *intel_iommu_hw_info(struct device *dev, u32 *length, u32 *type) > +static void *intel_iommu_hw_info(struct device *dev, u32 *length, > + enum iommu_hw_info_type *type) > { > struct device_domain_info *info = dev_iommu_priv_get(dev); > struct intel_iommu *iommu = info->iommu; > diff --git a/drivers/iommu/iommufd/selftest.c > b/drivers/iommu/iommufd/selftest.c > index 74ca955a766e..7a9abe3f47d5 100644 > --- a/drivers/iommu/iommufd/selftest.c > +++ b/drivers/iommu/iommufd/selftest.c > @@ -287,7 +287,8 @@ static struct iommu_domain mock_blocking_domain = { > .ops = &mock_blocking_ops, > }; > > -static void *mock_domain_hw_info(struct device *dev, u32 *length, u32 *type) > +static void *mock_domain_hw_info(struct device *dev, u32 *length, > + enum iommu_hw_info_type *type) > { > struct iommu_test_hw_info *info; >
Reviewed-by: Pranjal Shrivastava <pr...@google.com> > -- > 2.43.0 >