Skip to content

Commit 7ba5647

Browse files
Fenghua Yusuryasaimadhu
authored andcommitted
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: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Tony Luck <tony.luck@intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com> Link: https://lore.kernel.org/r/20220207230254.3342514-2-fenghua.yu@intel.com
1 parent 754e0b0 commit 7ba5647

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/iommu/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ config IOMMU_DMA
144144
select IRQ_MSI_IOMMU
145145
select NEED_SG_DMA_LENGTH
146146

147-
# Shared Virtual Addressing library
148-
config IOMMU_SVA_LIB
147+
# Shared Virtual Addressing
148+
config IOMMU_SVA
149149
bool
150150
select IOASID
151151

@@ -379,7 +379,7 @@ config ARM_SMMU_V3
379379
config ARM_SMMU_V3_SVA
380380
bool "Shared Virtual Addressing support for the ARM SMMUv3"
381381
depends on ARM_SMMU_V3
382-
select IOMMU_SVA_LIB
382+
select IOMMU_SVA
383383
select MMU_NOTIFIER
384384
help
385385
Support for sharing process address spaces with devices using the

drivers/iommu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
2727
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
2828
obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o
2929
obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
30-
obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o io-pgfault.o
30+
obj-$(CONFIG_IOMMU_SVA) += iommu-sva-lib.o io-pgfault.o
3131
obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o
3232
obj-$(CONFIG_APPLE_DART) += apple-dart.o

drivers/iommu/intel/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ config INTEL_IOMMU_SVM
5252
select PCI_PRI
5353
select MMU_NOTIFIER
5454
select IOASID
55-
select IOMMU_SVA_LIB
55+
select IOMMU_SVA
5656
help
5757
Shared Virtual Memory (SVM) provides a facility for devices
5858
to access DMA resources through process address space by

drivers/iommu/iommu-sva-lib.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct device;
1717
struct iommu_fault;
1818
struct iopf_queue;
1919

20-
#ifdef CONFIG_IOMMU_SVA_LIB
20+
#ifdef CONFIG_IOMMU_SVA
2121
int iommu_queue_iopf(struct iommu_fault *fault, void *cookie);
2222

2323
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);
2828
void iopf_queue_free(struct iopf_queue *queue);
2929
int iopf_queue_discard_partial(struct iopf_queue *queue);
3030

31-
#else /* CONFIG_IOMMU_SVA_LIB */
31+
#else /* CONFIG_IOMMU_SVA */
3232
static inline int iommu_queue_iopf(struct iommu_fault *fault, void *cookie)
3333
{
3434
return -ENODEV;
@@ -64,5 +64,5 @@ static inline int iopf_queue_discard_partial(struct iopf_queue *queue)
6464
{
6565
return -ENODEV;
6666
}
67-
#endif /* CONFIG_IOMMU_SVA_LIB */
67+
#endif /* CONFIG_IOMMU_SVA */
6868
#endif /* _IOMMU_SVA_LIB_H */

0 commit comments

Comments
 (0)