Skip to content

Commit d43936a

Browse files
author
Torsten Duwe
committed
On ppc, SWIOTLB is just an alias for DMA bounce buffers
(see Kconfig help: "Support for IO bounce buffering for systems without an IOMMU..." ) The systems we support all have proper IOMMUs and thus don't need it.
1 parent 7eabae5 commit d43936a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

config/ppc/default

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ CONFIG_BINFMT_SCRIPT=y
445445
# CONFIG_HAVE_AOUT is not set
446446
CONFIG_BINFMT_MISC=m
447447
CONFIG_COREDUMP=y
448-
CONFIG_IOMMU_HELPER=y
449-
CONFIG_SWIOTLB=y
448+
# CONFIG_IOMMU_HELPER is not set
449+
# CONFIG_SWIOTLB is not set
450450
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
451451
CONFIG_ARCH_HAS_WALK_MEMORY=y
452452
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

config/ppc/vanilla

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ CONFIG_BINFMT_SCRIPT=y
444444
# CONFIG_HAVE_AOUT is not set
445445
CONFIG_BINFMT_MISC=m
446446
CONFIG_COREDUMP=y
447-
# CONFIG_IOMMU_HELPER is not set
447+
CONFIG_IOMMU_HELPER=y
448448
# CONFIG_SWIOTLB is not set
449449
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
450450
CONFIG_ARCH_HAS_WALK_MEMORY=y

config/ppc64/debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ CONFIG_COREDUMP=y
528528
CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
529529
CONFIG_PPC_TRANSACTIONAL_MEM=y
530530
CONFIG_IOMMU_HELPER=y
531-
CONFIG_SWIOTLB=y
531+
# CONFIG_SWIOTLB is not set
532532
CONFIG_HOTPLUG_CPU=y
533533
CONFIG_ARCH_CPU_PROBE_RELEASE=y
534534
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

config/ppc64/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ CONFIG_COREDUMP=y
533533
CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
534534
CONFIG_PPC_TRANSACTIONAL_MEM=y
535535
CONFIG_IOMMU_HELPER=y
536-
CONFIG_SWIOTLB=y
536+
# CONFIG_SWIOTLB is not set
537537
CONFIG_HOTPLUG_CPU=y
538538
CONFIG_ARCH_CPU_PROBE_RELEASE=y
539539
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

config/ppc64le/debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ CONFIG_COREDUMP=y
473473
CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
474474
CONFIG_PPC_TRANSACTIONAL_MEM=y
475475
CONFIG_IOMMU_HELPER=y
476-
CONFIG_SWIOTLB=y
476+
# CONFIG_SWIOTLB is not set
477477
CONFIG_HOTPLUG_CPU=y
478478
CONFIG_ARCH_CPU_PROBE_RELEASE=y
479479
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

config/ppc64le/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ CONFIG_COREDUMP=y
478478
CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
479479
CONFIG_PPC_TRANSACTIONAL_MEM=y
480480
CONFIG_IOMMU_HELPER=y
481-
CONFIG_SWIOTLB=y
481+
# CONFIG_SWIOTLB is not set
482482
CONFIG_HOTPLUG_CPU=y
483483
CONFIG_ARCH_CPU_PROBE_RELEASE=y
484484
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

0 commit comments

Comments
 (0)