From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbdE3MV3 (ORCPT ); Tue, 30 May 2017 08:21:29 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33820 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750912AbdE3MVZ (ORCPT ); Tue, 30 May 2017 08:21:25 -0400 Date: Tue, 30 May 2017 14:21:19 +0200 (CEST) From: Sebastian Ott X-X-Sender: sebott@schleppi To: Logan Gunthorpe cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, Martin Schwidefsky , Heiko Carstens , Al Viro Subject: Re: [PATCH v2] s390: provide default ioremap and iounmap declaration In-Reply-To: <20170529191308.8499-1-logang@deltatee.com> References: <20170529191308.8499-1-logang@deltatee.com> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) Organization: =?ISO-8859-15?Q?=22IBM_Deutschland_Research_&_Development_GmbH_=2F_Vorsitzende_des_Aufsichtsrats=3A_Martina_Koederitz_Gesch=E4ftsf=FChrung=3A_Dirk_Wittkopp_Sitz_der_Gesellschaft=3A_B=F6blingen_=2F_Registergericht?= =?ISO-8859-15?Q?=3A_Amtsgericht_Stuttgart=2C_HRB_243294=22?= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-TM-AS-GCONF: 00 x-cbid: 17053012-0040-0000-0000-0000039B4FE1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17053012-0041-0000-0000-0000258DD87A Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-30_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705300232 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 29 May 2017, Logan Gunthorpe wrote: > Move the CONFIG_PCI device so that ioremap and iounmap are always > available. This looks safe as there's nothing PCI specific in the > implementation of these functions. > > I have designs to use these functions in scatterlist.c where they'd likely > never be called without CONFIG_PCI set, but this is needed to compile > such changes. > > Signed-off-by: Logan Gunthorpe > Cc: Martin Schwidefsky > Cc: Heiko Carstens > cc: Sebastian Ott > Cc: Al Viro > --- > > v2 of this patch is changed to simply move the CONFIG_PCI #ifdef > to expose only a single set of functions as suggested by Heiko > Carstens. > > arch/s390/include/asm/io.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h > index 437e9af96688..904e4b3af95d 100644 > --- a/arch/s390/include/asm/io.h > +++ b/arch/s390/include/asm/io.h > @@ -25,8 +25,6 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); > > #define IO_SPACE_LIMIT 0 > > -#ifdef CONFIG_PCI > - > #define ioremap_nocache(addr, size) ioremap(addr, size) > #define ioremap_wc ioremap_nocache > #define ioremap_wt ioremap_nocache > @@ -49,6 +47,8 @@ static inline void ioport_unmap(void __iomem *p) > { > } > > +#ifdef CONFIG_PCI > + > /* > * s390 needs a private implementation of pci_iomap since ioremap with its > * offset parameter isn't sufficient. That's because BAR spaces are not > -- > 2.11.0 > > Applied. The patch will go upstream via Martin's tree. Thanks! Sebastian