From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751982AbbJBXRM (ORCPT ); Fri, 2 Oct 2015 19:17:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:48554 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499AbbJBXRK (ORCPT ); Fri, 2 Oct 2015 19:17:10 -0400 Date: Sat, 3 Oct 2015 01:17:06 +0200 From: "Luis R. Rodriguez" To: Randy Dunlap Cc: "Luis R. Rodriguez" , arnd@arndb.de, linux-arch@vger.kernel.org, mingo@kernel.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, linux-s390@vger.kernel.org, bp@suse.de, linux@roeck-us.net, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, rostedt@goodmis.org Subject: Re: [RFC] asm-generic/pci_iomap.h: make custom PCI BAR requirements explicit Message-ID: <20151002231706.GI14464@wotan.suse.de> References: <1440807447-584-1-git-send-email-mcgrof@do-not-panic.com> <55E11534.2050508@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55E11534.2050508@infradead.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 28, 2015 at 07:13:08PM -0700, Randy Dunlap wrote: > On 08/28/15 17:17, Luis R. Rodriguez wrote: > > > > arch/s390/Kconfig | 8 +++++ > > arch/s390/include/asm/io.h | 11 ------- > > arch/s390/include/asm/pci.h | 2 -- > > arch/s390/include/asm/pci_iomap.h | 33 +++++++++++++++++++++ > > arch/s390/pci/pci.c | 2 ++ > > include/asm-generic/io.h | 12 -------- > > include/asm-generic/iomap.h | 10 ------- > > include/asm-generic/pci_iomap.h | 62 +++++++++++++++++++++++++++++++++++---- > > lib/Kconfig | 1 + > > lib/pci_iomap.c | 5 ++++ > > 10 files changed, 105 insertions(+), 41 deletions(-) > > create mode 100644 arch/s390/include/asm/pci_iomap.h > > > > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > > index 1d57000b1b24..1217b7db4265 100644 > > --- a/arch/s390/Kconfig > > +++ b/arch/s390/Kconfig > > @@ -614,6 +614,14 @@ endif # PCI > > config PCI_DOMAINS > > def_bool PCI > > > > +config ARCH_PCI_NON_DISJUNCTIVE > > + def_bool PCI > > + help > > + On the S390 architecture PCI BAR spaces are not disjunctive, as such > > are not disjoint? may be overlapping? > > > + the PCI bar is required on a series of otherwise asm generic PCI > > + routines, as such S390 requires itw own implemention for these > > its own implementation Thanks, I've re-written this as: mcgrof@ergon ~/linux-next (git::(no branch, rebasing 20150805-pend-all))$ git diff diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index f4725d1af438..8ba5826ed13b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -618,10 +618,10 @@ config PCI_DOMAINS config ARCH_PCI_NON_DISJUNCTIVE def_bool PCI help - On the S390 architecture PCI BAR spaces are not disjunctive, as such - the PCI bar is required on a series of otherwise asm generic PCI - routines, as such S390 requires itw own implemention for these - routines. + On the S390 architecture PCI BAR spaces may overlap with each other, + because of this the PCI bar is required on a series of otherwise asm + generic PCI routines and this in turn requires S390 to provide its + own implementation for these routines. config HAS_IOMEM def_bool PCI >