Merge tag 'iommu-fixes-v6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux

Pull iomu fixes from Joerg Roedel:

- several Kconfig-related build fixes

- fix for when gcc 8.5 on PPC refuses to inline a function from a
header file

* tag 'iommu-fixes-v6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux:
iommupt: Make pt_feature() always_inline
iommufd/selftest: Prevent module/builtin conflicts in kconfig
iommufd/selftest: Add missing kconfig for DMA_SHARED_BUFFER
iommupt: Fix the kunit building

Changed files
+5 -4
drivers
iommu
generic_pt
iommufd
+1 -1
drivers/iommu/generic_pt/.kunitconfig
··· 1 1 CONFIG_KUNIT=y 2 + CONFIG_COMPILE_TEST=y 2 3 CONFIG_GENERIC_PT=y 3 4 CONFIG_DEBUG_GENERIC_PT=y 4 5 CONFIG_IOMMU_PT=y ··· 12 11 CONFIG_DEBUG_KERNEL=y 13 12 CONFIG_FAULT_INJECTION=y 14 13 CONFIG_RUNTIME_TESTING_MENU=y 15 - CONFIG_IOMMUFD_TEST=y
+2 -2
drivers/iommu/generic_pt/pt_defs.h
··· 202 202 203 203 #define PT_SUPPORTED_FEATURE(feature_nr) (PT_SUPPORTED_FEATURES & BIT(feature_nr)) 204 204 205 - static inline bool pt_feature(const struct pt_common *common, 205 + static __always_inline bool pt_feature(const struct pt_common *common, 206 206 unsigned int feature_nr) 207 207 { 208 208 if (PT_FORCE_ENABLED_FEATURES & BIT(feature_nr)) ··· 212 212 return common->features & BIT(feature_nr); 213 213 } 214 214 215 - static inline bool pts_feature(const struct pt_state *pts, 215 + static __always_inline bool pts_feature(const struct pt_state *pts, 216 216 unsigned int feature_nr) 217 217 { 218 218 return pt_feature(pts->range->common, feature_nr);
+2 -1
drivers/iommu/iommufd/Kconfig
··· 41 41 depends on DEBUG_KERNEL 42 42 depends on FAULT_INJECTION 43 43 depends on RUNTIME_TESTING_MENU 44 - depends on IOMMU_PT_AMDV1 44 + depends on IOMMU_PT_AMDV1=y || IOMMUFD=IOMMU_PT_AMDV1 45 + select DMA_SHARED_BUFFER 45 46 select IOMMUFD_DRIVER 46 47 default n 47 48 help