Commit 7ba56472 authored by Fenghua Yu's avatar Fenghua Yu Committed by Borislav Petkov
Browse files

iommu/sva: Rename CONFIG_IOMMU_SVA_LIB to CONFIG_IOMMU_SVA 



This CONFIG option originally only referred to the Shared
Virtual Address (SVA) library. But it is now also used for
non-library portions of code.

Drop the "_LIB" suffix so that there is just one configuration
option for all code relating to SVA.

Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20220207230254.3342514-2-fenghua.yu@intel.com
parent 754e0b0e

drivers/iommu/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ config IOMMU_DMA 
	select IRQ_MSI_IOMMU

	select NEED_SG_DMA_LENGTH



# Shared Virtual Addressing library

config IOMMU_SVA_LIB

# Shared Virtual Addressing

config IOMMU_SVA

	bool

	select IOASID
@@ -379,7 +379,7 @@ config ARM_SMMU_V3 
config ARM_SMMU_V3_SVA

	bool "Shared Virtual Addressing support for the ARM SMMUv3"

	depends on ARM_SMMU_V3

	select IOMMU_SVA_LIB

	select IOMMU_SVA

	select MMU_NOTIFIER

	help

	  Support for sharing process address spaces with devices using the

drivers/iommu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o 
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o

obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o

obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o

obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o io-pgfault.o

obj-$(CONFIG_IOMMU_SVA) += iommu-sva-lib.o io-pgfault.o

obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o

obj-$(CONFIG_APPLE_DART) += apple-dart.o

drivers/iommu/intel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ config INTEL_IOMMU_SVM 
	select PCI_PRI

	select MMU_NOTIFIER

	select IOASID

	select IOMMU_SVA_LIB

	select IOMMU_SVA

	help

	  Shared Virtual Memory (SVM) provides a facility for devices

	  to access DMA resources through process address space by

drivers/iommu/iommu-sva-lib.h

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct device; 
struct iommu_fault;

struct iopf_queue;



#ifdef CONFIG_IOMMU_SVA_LIB

#ifdef CONFIG_IOMMU_SVA

int iommu_queue_iopf(struct iommu_fault *fault, void *cookie);



int iopf_queue_add_device(struct iopf_queue *queue, struct device *dev);
@@ -28,7 +28,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name); 
void iopf_queue_free(struct iopf_queue *queue);

int iopf_queue_discard_partial(struct iopf_queue *queue);



#else /* CONFIG_IOMMU_SVA_LIB */

#else /* CONFIG_IOMMU_SVA */

static inline int iommu_queue_iopf(struct iommu_fault *fault, void *cookie)

{

	return -ENODEV;
@@ -64,5 +64,5 @@ static inline int iopf_queue_discard_partial(struct iopf_queue *queue) 
{

	return -ENODEV;

}

#endif /* CONFIG_IOMMU_SVA_LIB */

#endif /* CONFIG_IOMMU_SVA */

#endif /* _IOMMU_SVA_LIB_H */