Commit 4b57c057 authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommu: Use enum iommu_hw_info_type for type in hw_info op 

Replace u32 to make it clear. No functional changes.

Also simplify the kdoc since the type itself is clear enough.

Link: https://patch.msgid.link/r/651c50dee8ab900f691202ef0204cd5a43fdd6a2.1752126748.git.nicolinc@nvidia.com


Reviewed-by: default avatarPranjal Shrivastava <praan@google.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c50a5de2

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h

+2 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,8 @@ struct arm_vsmmu { 
};



#if IS_ENABLED(CONFIG_ARM_SMMU_V3_IOMMUFD)

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);

size_t arm_smmu_get_viommu_size(struct device *dev,

				enum iommu_viommu_type viommu_type);

int arm_vsmmu_init(struct iommufd_viommu *viommu,

drivers/iommu/intel/iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/iommufd/selftest.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/iommu.h

+3 −3
Original line number Diff line number Diff line
@@ -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)