Commit 54e09a5d authored May 24, 2024 by leoliu-oc

x86/cpu/zhaoxin: Adjust the configuration options for zhaoxin-kx40000.c

zhaoxin inclusion
category: other
bugzilla: https://gitee.com/openeuler/kernel/issues/I9RPB1


CVE: NA

-----------------

Replace CONFIG_PCI with CONFIG_INTEL_IOMMU, and add CONFIG_X86_64, This
approach better aligns with the code implementation, and avoid
compilation issues that may arise due to different configuration options.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202405202027.XOiN2dDz-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202405202228.Trf7bvHA-lkp@intel.com/


Signed-off-by: leoliu-oc <leoliu-oc@zhaoxin.com>

parent a4738ea3

arch/x86/include/asm/dma-mapping.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(void)
		return dma_ops;
		}

		#ifdef CONFIG_PCI
		#if IS_BUILTIN(CONFIG_INTEL_IOMMU) && IS_BUILTIN(CONFIG_X86_64)

		extern bool is_zhaoxin_kh40000;
		extern const struct dma_map_ops kh40000_dma_direct_ops;

arch/x86/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,5 +160,5 @@ ifeq ($(CONFIG_X86_64),y)

		obj-$(CONFIG_MMCONF_FAM10H) += mmconf-fam10h_64.o
		obj-y += vsmp_64.o
		obj-$(CONFIG_PCI) += zhaoxin_kh40000.o
		obj-$(CONFIG_INTEL_IOMMU) += zhaoxin_kh40000.o
		endif