Commit 97313d61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7893cc12 6a3d5fda

drivers/iommu/generic_pt/.kunitconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_KUNIT=y

CONFIG_COMPILE_TEST=y

CONFIG_GENERIC_PT=y

CONFIG_DEBUG_GENERIC_PT=y

CONFIG_IOMMU_PT=y
@@ -11,4 +12,3 @@ CONFIG_IOMMUFD=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_FAULT_INJECTION=y

CONFIG_RUNTIME_TESTING_MENU=y
 
CONFIG_IOMMUFD_TEST=y

drivers/iommu/generic_pt/pt_defs.h

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static inline bool pt_table_install32(struct pt_state *pts, u32 table_entry) 


#define PT_SUPPORTED_FEATURE(feature_nr) (PT_SUPPORTED_FEATURES & BIT(feature_nr))



static inline bool pt_feature(const struct pt_common *common,

static __always_inline bool pt_feature(const struct pt_common *common,

			      unsigned int feature_nr)

{

	if (PT_FORCE_ENABLED_FEATURES & BIT(feature_nr))
@@ -212,7 +212,7 @@ static inline bool pt_feature(const struct pt_common *common, 
	return common->features & BIT(feature_nr);

}



static inline bool pts_feature(const struct pt_state *pts,

static __always_inline bool pts_feature(const struct pt_state *pts,

			       unsigned int feature_nr)

{

	return pt_feature(pts->range->common, feature_nr);

drivers/iommu/iommufd/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ config IOMMUFD_TEST 
	depends on DEBUG_KERNEL

	depends on FAULT_INJECTION

	depends on RUNTIME_TESTING_MENU

	depends on IOMMU_PT_AMDV1

	depends on IOMMU_PT_AMDV1=y || IOMMUFD=IOMMU_PT_AMDV1

	select DMA_SHARED_BUFFER

	select IOMMUFD_DRIVER

	default n

	help