From: Nathan Chancellor Date: Thu, 22 Jan 2026 21:42:38 +0000 (-0700) Subject: iommu/amd: Fix type of type parameter to amd_iommufd_hw_info() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0530bb16ec5af3cc96fc25891d6a860fd37a8c;p=thirdparty%2Fkernel%2Flinux.git iommu/amd: Fix type of type parameter to amd_iommufd_hw_info() When building with -Wincompatible-function-pointer-types-strict, a warning designed to catch kernel control flow integrity (kCFI) issues at build time, there is an instance around amd_iommufd_hw_info(): drivers/iommu/amd/iommu.c:3141:13: error: incompatible function pointer types initializing 'void *(*)(struct device *, u32 *, enum iommu_hw_info_type *)' (aka 'void *(*)(struct device *, unsigned int *, enum iommu_hw_info_type *)') with an expression of type 'void *(struct device *, u32 *, u32 *)' (aka 'void *(struct device *, unsigned int *, unsigned int *)') [-Werror,-Wincompatible-function-pointer-types-strict] 3141 | .hw_info = amd_iommufd_hw_info, | ^~~~~~~~~~~~~~~~~~~ While 'u32 *' and 'enum iommu_hw_info_type *' are ABI compatible, hence no regular warning from -Wincompatible-function-pointer-types, the mismatch will trigger a kCFI violation when amd_iommufd_hw_info() is called indirectly. Update the type parameter of amd_iommufd_hw_info() to be 'enum iommu_hw_info_type *' to match the prototype in 'struct iommu_ops', clearing up the warning and kCFI violation. Fixes: 7d8b06ecc45b ("iommu/amd: Add support for hw_info for iommu capability query") Signed-off-by: Nathan Chancellor Reviewed-by: Vasant Hegde Reviewed-by: Nicolin Chen Reviewed-by: Jason Gunthorpe Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/amd/iommufd.c b/drivers/iommu/amd/iommufd.c index ad627fd5ccc7..96ec6a4a760d 100644 --- a/drivers/iommu/amd/iommufd.c +++ b/drivers/iommu/amd/iommufd.c @@ -11,7 +11,7 @@ static const struct iommufd_viommu_ops amd_viommu_ops; -void *amd_iommufd_hw_info(struct device *dev, u32 *length, u32 *type) +void *amd_iommufd_hw_info(struct device *dev, u32 *length, enum iommu_hw_info_type *type) { struct iommu_hw_info_amd *hwinfo; diff --git a/drivers/iommu/amd/iommufd.h b/drivers/iommu/amd/iommufd.h index f05aad495b5b..62e9e1bebfbe 100644 --- a/drivers/iommu/amd/iommufd.h +++ b/drivers/iommu/amd/iommufd.h @@ -7,7 +7,7 @@ #define AMD_IOMMUFD_H #if IS_ENABLED(CONFIG_AMD_IOMMU_IOMMUFD) -void *amd_iommufd_hw_info(struct device *dev, u32 *length, u32 *type); +void *amd_iommufd_hw_info(struct device *dev, u32 *length, enum iommu_hw_info_type *type); size_t amd_iommufd_get_viommu_size(struct device *dev, enum iommu_viommu_type viommu_type); int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *parent, const struct iommu_user_data *user_data);