On Tue, 3 Nov 2015 12:54:39 +0100
Christian Borntraeger <borntrae...@de.ibm.com> wrote:
> As virtio-ccw now has dma ops, we can no longer default to the PCI ones.
> Make use of dev_archdata to keep the dma_ops per device. The pci devices
> now use that to override the default, and the default is changed to use
> the noop ops for everything that is not PCI. To compile without PCI
> support we also have to enable the DMA api with virtio.
Not only with virtio, but generally, right?
> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
> Reviewed-by: Joerg Roedel <jroe...@suse.de>
> Acked-by: Sebastian Ott <seb...@linux.vnet.ibm.com>
> ---
> arch/s390/Kconfig | 3 ++-
> arch/s390/include/asm/device.h | 6 +++++-
> arch/s390/include/asm/dma-mapping.h | 6 ++++--
> arch/s390/pci/pci.c | 1 +
> arch/s390/pci/pci_dma.c | 4 ++--
> 5 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index 1d57000..04f0e02 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -113,6 +113,7 @@ config S390
> select GENERIC_FIND_FIRST_BIT
> select GENERIC_SMP_IDLE_THREAD
> select GENERIC_TIME_VSYSCALL
> + select HAS_DMA
> select HAVE_ALIGNED_STRUCT_PAGE if SLUB
> select HAVE_ARCH_AUDITSYSCALL
> select HAVE_ARCH_EARLY_PFN_TO_NID
> @@ -124,6 +125,7 @@ config S390
> select HAVE_CMPXCHG_DOUBLE
> select HAVE_CMPXCHG_LOCAL
> select HAVE_DEBUG_KMEMLEAK
> + select HAVE_DMA_ATTRS
> select HAVE_DYNAMIC_FTRACE
> select HAVE_DYNAMIC_FTRACE_WITH_REGS
> select HAVE_FTRACE_MCOUNT_RECORD
> @@ -580,7 +582,6 @@ config QDIO
>
> menuconfig PCI
> bool "PCI support"
> - select HAVE_DMA_ATTRS
> select PCI_MSI
> help
> Enable PCI support.
Hm. Further down in this file, there's
config HAS_DMA
def_bool PCI
select HAVE_DMA_API_DEBUG
Should we maybe select HAVE_DMA_API_DEBUG above, drop the HAS_DMA
config option and rely on not defining NO_DMA instead?
Otherwise, the patch looks good to me.
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
