two small DMA-related Kconfig cleanups for x86
Subsystems (5)
Just cleaning up the Kconfig files for some of the changes happening over the last years..
PATCH 1/2 x86: Remove the unused X86_DMA_REMAP kconfig symbol
--- arch/x86/Kconfig | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/Kconfig +0 -5
@@ -704,7 +704,6 @@ config STA2X11 depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS - select X86_DMA_REMAP select SWIOTLB select MFD_STA2X11 select GPIOLIB
@@ -2880,10 +2879,6 @@ config X86_DEV_DMA_OPS bool depends on X86_64 || STA2X11 -config X86_DMA_REMAP - bool - depends on STA2X11 - config HAVE_GENERIC_GUP def_bool y
Signature · 1 line
2.20.1
tip-bot for Christoph Hellwig
merge bot[tip:x86/cleanups] x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
Commit-ID: a5881bea88616e3aacf521dbdbe0e323257aaba1 Gitweb: https://git.kernel.org/tip/a5881bea88616e3aacf521dbdbe0e323257aaba1 Author: Christoph Hellwig <[email protected]> AuthorDate: Wed, 10 Apr 2019 10:02:19 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 10 Apr 2019 10:17:24 +0200
x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
--- arch/x86/Kconfig | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/Kconfig +0 -5
@@ -704,7 +704,6 @@ config STA2X11 depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS - select X86_DMA_REMAP select SWIOTLB select MFD_STA2X11 select GPIOLIB
@@ -2886,10 +2885,6 @@ config X86_DEV_DMA_OPS bool depends on X86_64 || STA2X11 -config X86_DMA_REMAP - bool - depends on STA2X11 - config HAVE_GENERIC_GUP def_bool y
PATCH 2/2 x86/pci: Clean up usage of X86_DEV_DMA_OPS
In reply to Christoph HellwigWe have supported per-device dma_map_ops in generic code for a long time, and this symbol just guards the inclusion of the dma_map_ops registry used for vmd. Stop enabling it for anything but vmd.
--- arch/x86/Kconfig | 3 --- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 4 files changed, 3 insertions(+), 12 deletions(-)
arch/x86/Kconfig +0 -3
@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #
@@ -703,7 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS select SWIOTLB select MFD_STA2X11 select GPIOLIB
@@ -2877,7 +2875,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 config HAVE_GENERIC_GUP def_bool y
drivers/misc/mic/Kconfig +2 -2
@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,
@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST
drivers/pci/controller/Kconfig +1 -0
@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD). VMD is a
drivers/pci/controller/vmd.c +0 -7
@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a * VMD domain need to be mapped for the VMD, not the device requiring
@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr (struct vmd_dev *vmd,struct pci_bus *bus,unsigned int devfn,int reg,int len)
Signature · 1 line
2.20.1
Re: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
(+Cc. Patch quoted below. Acked-by from an x86 perspective.)
Quoted 111 lines · Christoph Hellwig
We have supported per-device
dma_map_opsin generic code for a long time, and this symbol just guards the inclusion of thedma_map_opsregistry used for vmd. Stop enabling it for anything but vmd.Signed-off-by Christoph Hellwig <[email protected]>--- arch/x86/Kconfig | 3 --- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 4 files changed, 3 insertions(+), 12 deletions(-)arch/x86/Kconfig +0
-3@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #@@ -703,7 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS select SWIOTLB select MFD_STA2X11 select GPIOLIB@@ -2877,7 +2875,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 config HAVE_GENERIC_GUP def_bool ydrivers/misc/mic/Kconfig +2
-2@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOSTdrivers/pci/controller/Kconfig +1
-0@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD). VMD is adrivers/pci/controller/vmd.c +0
-7@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a * VMD domain need to be mapped for the VMD, not the device requiring @@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr (struct vmd_dev *vmd,struct pci_bus *bus,unsigned int devfn,int reg,int len)Signature · 1 line
2.20.1
Bjorn Helgaas
Acked-byRe: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
[+cc Keith, Jonathan (VMD guys)]
I'm OK with this from a PCI perspective. It would be nice if
dma_domain_list
dma_domain_list_lock
add_dma_domain()
del_dma_domain()
set_dma_domain_ops()
could all be moved to vmd.c, since they're really only used there.
But we don't really have a good way to call host bridge-specific code like set_dma_domain_ops() except via pcibios_add_device(). Someday maybe pcibios_add_device() will become a host bridge method.
Quoted 115 lines · Ingo Molnar
(+Cc. Patch quoted below. Acked-by from an x86 perspective.)
Quoted 111 lines · Christoph Hellwig
We have supported per-device
dma_map_opsin generic code for a long time, and this symbol just guards the inclusion of thedma_map_opsregistry used for vmd. Stop enabling it for anything but vmd.Signed-off-by Christoph Hellwig <[email protected]>--- arch/x86/Kconfig | 3 --- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 4 files changed, 3 insertions(+), 12 deletions(-)arch/x86/Kconfig +0
-3@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #@@ -703,7 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS select SWIOTLB select MFD_STA2X11 select GPIOLIB@@ -2877,7 +2875,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 config HAVE_GENERIC_GUP def_bool ydrivers/misc/mic/Kconfig +2
-2@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOSTdrivers/pci/controller/Kconfig +1
-0@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD). VMD is adrivers/pci/controller/vmd.c +0
-7@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a * VMD domain need to be mapped for the VMD, not the device requiring @@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr (struct vmd_dev *vmd,struct pci_bus *bus,unsigned int devfn,int reg,int len)Signature · 1 line
2.20.1
Derrick, Jonathan
Reviewed-byRe: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
Quoted 10 lines · Bjorn Helgaas
[+cc Keith, Jonathan (VMD guys)]
I'm OK with this from a PCI perspective. It would be nice if
dma_domain_list
dma_domain_list_lock
add_dma_domain()
del_dma_domain()
set_dma_domain_ops()
Quoted 5 lines
could all be moved to
vmd.c, since they're really only used there.But we don't really have a good way to call host bridge-specific code like
set_dma_domain_ops()except viapcibios_add_device(). Someday maybepcibios_add_device()will become a host bridge method.
I think these could have been contained to vmd.c with the host bridge add_device callback [1] but I can't seem to find whatever came about that discussion
[1] https://marc.info/?l=linux-pci&m=153337765811720&w=2
Either way, this looks fine
Quoted 132 lines
Acked-by Bjorn Helgaas <[email protected]>Quoted 127 lines · Ingo Molnar
(+Cc. Patch quoted below. Acked-by from an x86 perspective.)
Quoted 123 lines · Christoph Hellwig
We have supported per-device
dma_map_opsin generic code for a long
time, and this symbol just guards the inclusion of thedma_map_ops
registry used for vmd. Stop enabling it for anything but vmd.Signed-off-by Christoph Hellwig <[email protected]>--- arch/x86/Kconfig | 3 --- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 4 files changed, 3 insertions(+), 12 deletions(-)arch/x86/Kconfig +0
-3@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #@@ -703,7 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS select SWIOTLB select MFD_STA2X11 select GPIOLIB@@ -2877,7 +2875,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 config HAVE_GENERIC_GUP def_bool ydrivers/misc/mic/Kconfig +1
-1@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as
CONFIG_INTEL_MIC_HOST,drivers/misc/mic/Kconfig +1
-1@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as
CONFIG_INTEL_MIC_HOSTdrivers/pci/controller/Kconfig +1
-0@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD).VMD is a
drivers/pci/controller/vmd.c +0
-3@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a
* VMD domain need to be mapped for the VMD, not the device
requiringdrivers/pci/controller/vmd.c +0
-4@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct
pci_bus*bus,
unsigned int devfn, int reg, int len)Signature · 1 line
2.20.1
Re: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
In reply to Bjorn HelgaasQuoted 11 lines · Bjorn Helgaas
[+cc Keith, Jonathan (VMD guys)]
I'm OK with this from a PCI perspective. It would be nice if
dma_domain_list
dma_domain_list_lock
add_dma_domain()
del_dma_domain()
set_dma_domain_ops()could all be moved to
vmd.c, since they're really only used there.
I have another patch to eventually kill that, but it will need a little more prep work and thus be delayed to the next merge window.
Re: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
Quoted 11 lines · Christoph Hellwig
Quoted 10 lines · Bjorn Helgaas
[+cc Keith, Jonathan (VMD guys)]
I'm OK with this from a PCI perspective. It would be nice if
dma_domain_list
dma_domain_list_lock
add_dma_domain()
del_dma_domain()
set_dma_domain_ops()
Quoted 4 lines
Quoted 1 line
could all be moved to
vmd.c, since they're really only used there.I have another patch to eventually kill that, but it will need a little more prep work and thus be delayed to the next merge window.
Awesome, thanks! I really appreciate all the global cleanup work you do.
Bjorn
Re: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
Is anyone going to pick this patch up?
Re: [PATCH 2/2] x86/pci: Clean up usage of X86_DEV_DMA_OPS
Quoted 1 line · Christoph Hellwig
Is anyone going to pick this patch up?
Sure, I've picked it up with Bjorn's Acked-by and will push it out after a bit of testing.
Thanks,
Ingo
tip-bot for Christoph Hellwig
merge bot[tip:x86/cleanups] x86/pci: Clean up usage of X86_DEV_DMA_OPS
In reply to Christoph Hellwigx86/pci: Clean up usage of X86_DEV_DMA_OPS
Commit-ID: 15854edd193ae5d9daf8f50ce5f9f1724cebe344 Gitweb: https://git.kernel.org/tip/15854edd193ae5d9daf8f50ce5f9f1724cebe344 Author: Christoph Hellwig <[email protected]> AuthorDate: Wed, 10 Apr 2019 10:02:20 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 24 Apr 2019 13:12:05 +0200
x86/pci: Clean up usage of X86_DEV_DMA_OPS
We have supported per-device dma_map_ops in generic code for a long time, and this symbol just guards the inclusion of the dma_map_ops registry used for vmd. Stop enabling it for anything but vmd.
No change in functionality intended.
--- arch/x86/Kconfig | 3 --- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 4 files changed, 3 insertions(+), 12 deletions(-)
arch/x86/Kconfig +0 -3
@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #
@@ -703,7 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS select SWIOTLB select MFD_STA2X11 select GPIOLIB
@@ -2883,7 +2881,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 config HAVE_GENERIC_GUP def_bool y
drivers/misc/mic/Kconfig +2 -2
@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,
@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST
drivers/pci/controller/Kconfig +1 -0
@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD). VMD is a
drivers/pci/controller/vmd.c +0 -7
@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a * VMD domain need to be mapped for the VMD, not the device requiring
@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr (struct vmd_dev *vmd,struct pci_bus *bus,unsigned int devfn,int reg,int len)