From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932784AbcBBPG1 (ORCPT ); Tue, 2 Feb 2016 10:06:27 -0500 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:44529 "EHLO e06smtp06.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754262AbcBBPGY (ORCPT ); Tue, 2 Feb 2016 10:06:24 -0500 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: cornelia.huck@de.ibm.com X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org;linux-s390@vger.kernel.org;sparclinux@vger.kernel.org Date: Tue, 2 Feb 2016 16:06:15 +0100 From: Cornelia Huck To: Andy Lutomirski Cc: "Michael S. Tsirkin" , Benjamin Herrenschmidt , David Woodhouse , "linux-kernel@vger.kernel.org" , "David S. Miller" , sparclinux@vger.kernel.org, Joerg Roedel , Christian Borntraeger , Sebastian Ott , Paolo Bonzini , Christoph Hellwig , KVM , Martin Schwidefsky , linux-s390 , Linux Virtualization , David Vrabel , Stefano Stabellini , xen-devel@lists.xenproject.org Subject: Re: [PATCH v6 3/9] s390/dma: Allow per device dma ops Message-ID: <20160202160615.7c7f6663.cornelia.huck@de.ibm.com> In-Reply-To: <454ab46cd61644851aa437c73e6c8c7da79bfb30.1454349471.git.luto@kernel.org> References: <454ab46cd61644851aa437c73e6c8c7da79bfb30.1454349471.git.luto@kernel.org> Organization: IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz =?UTF-8?B?R2VzY2jDpGZ0c2bDvGhydW5nOg==?= Dirk Wittkopp Sitz der Gesellschaft: =?UTF-8?B?QsO2Ymxpbmdlbg==?= Registergericht: Amtsgericht Stuttgart, HRB 243294 X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16020215-0025-0000-0000-000005BA62E1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 1 Feb 2016 10:00:53 -0800 Andy Lutomirski wrote: > From: Christian Borntraeger > > As virtio-ccw will have dma ops, we can no longer default to the > zPCI 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 does not > specify a device specific one. > To compile without PCI support we will enable HAS_DMA all the time, > via the default config in lib/Kconfig. > > Signed-off-by: Christian Borntraeger > Reviewed-by: Joerg Roedel > Acked-by: Sebastian Ott > --- > arch/s390/Kconfig | 6 ++---- > 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(+), 9 deletions(-) > > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index 3be9c832dec1..5b22a26337b2 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -124,6 +124,8 @@ config S390 > select HAVE_CMPXCHG_DOUBLE > select HAVE_CMPXCHG_LOCAL > select HAVE_DEBUG_KMEMLEAK > + select HAVE_DMA_ATTRS HAVE_DMA_ATTRS no longer exists in the current tree. > + select HAVE_DMA_API_DEBUG > select HAVE_DYNAMIC_FTRACE > select HAVE_DYNAMIC_FTRACE_WITH_REGS > select HAVE_FTRACE_MCOUNT_RECORD With the line above removed: Acked-by: Cornelia Huck