From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CD32C77B75 for ; Tue, 16 May 2023 06:52:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE7AB900003; Tue, 16 May 2023 02:52:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9627900002; Tue, 16 May 2023 02:52:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95E06900003; Tue, 16 May 2023 02:52:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 886D6900002 for ; Tue, 16 May 2023 02:52:50 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 52D4312014A for ; Tue, 16 May 2023 06:52:50 +0000 (UTC) X-FDA: 80795200500.29.709806C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 88DBDC000A for ; Tue, 16 May 2023 06:52:48 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ktUM9ZWm; spf=pass (imf22.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684219968; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/MQwS2579V/g3jGFWjhjfgfwZbwToaNgw/6SvPScfgI=; b=kzWhxZCxjnDF7nEe2QqiHhpmORje1QcPMoixwmQ41ygNiKOrvbXYugZy9K3KBD2HMSfsGd ZMYuj5VqvLyglj60y7eqm9EgOQ1hRoETY+zTZZbH5l39zvTCg/r8Sx1Y7gGnVsa2aUyID0 plczU/5/uNhVBFxa929wVil6QNv9v0Q= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ktUM9ZWm; spf=pass (imf22.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684219968; a=rsa-sha256; cv=none; b=yxpFrLQ5OUqDNFVNEBUewHsZOPHg7NZss2U3kx/s9SlCDCQpzsYUBN685auLRdoP3ru+Vu e716FTGlyOveq92GYKOJmRGbAFLsNmI7xfT/O05MAWC2kCT4HtlL6Y0RKpPYLtKpvB6/Gu 0O3oyAhyyGPHuARvQRZJm8MDiXlENKY= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C02F161FC5; Tue, 16 May 2023 06:52:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33F0DC433D2; Tue, 16 May 2023 06:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684219967; bh=C0maaaVYK0mlVYQIVRRneqJu0UHwybB7kjeIlSX8s+c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ktUM9ZWmnUySfqn0dRbUi1RPkXZM7EWikWs/v1GpYveJR1uPzQzk0+/FfcfDBpqXC p3yM2yFo2r+0z6dhJPXt6O82UVUkhnq+BPUR39J0obtuJsU2hIh9OONWzRZDQqXWRM Kry9gKuwN/e6DjXnVp0oyrkxXzjqeS0B2pMuFfL6ROrU6RoBKezlU9UD2AlnBVGn41 G0m6RgzFPv4jREJgAAwgL1pdG9liUN1PJlsyRmeE5lMf68eJaLyfZLm03tCww17mix dZPm8SQQC/JwPC/3mdw9tpeiWXl6wcY6muzoQtgLvKxSlMyIV5MNNn4H+tEPz3HMEP WyWH5G+ixYUxw== Date: Tue, 16 May 2023 09:52:39 +0300 From: Mike Rapoport To: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@aculab.com, shorne@gmail.com, willy@infradead.org, deller@gmx.de, "James E.J. Bottomley" , linux-parisc@vger.kernel.org Subject: Re: [PATCH v5 RESEND 13/17] parisc: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-14-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515090848.833045-14-bhe@redhat.com> X-Stat-Signature: q37gt1bdya9g7cc89tf14ho85psqz9rp X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 88DBDC000A X-Rspam-User: X-HE-Tag: 1684219968-453236 X-HE-Meta: U2FsdGVkX18bDe6FWBeqcYFryphVHNQ6BLwFIbqDyyMaowtAuZJTdFJJjtbbV8YxvySa7dnBfdhg/+3erufHUAccrgFKX238qRtAkb1I6/waNADpi5+MafOXSaghOVFyOyEkcgVOAj3n6kbCH83A+Qx8GccsXAgMIHOuZoOIcmqqgPE0WQiJjnA+TKhBGp/R7w+VeHdWQoIs+gCeonUutFNuWeSGEPWiOLXLH/K+XSNjS4Ccyg/1LGfMUvDxEz2W1O2VXSOH/MKGaaWzfzEsTUUPougfGD3JBObsLwkIGtIQylrkJphe104r0mxuHpoFz3qtrXgLn9omth83pZZ2TXidsgMPD71pAIc6Q4lxH/DYmTEKDSo+vV1YCns3M6a51ow9LT+HY3EbV9mTHEuuiupGoQeDpAZvdW+LIvmYFoKbZLOElOGmhXz9A2PpT/fK1kLIEoJZLOXWlsSikjqGfKB0B26dJ/zL6CNjXy+WtXG15UCsxHhkeLV1xsYceRu4+etz4WLaPVuKOpUF4nKqllXbK0hey78g9dzi2i+/c2U3wGF6NxIv10zpW4i56TM9tJvgzEYwCQM+fe99pJ0XGEFvL+mjkUuTj8e0nqOKrxih/z+ZYDLusHXwg06r6KBnoHY/s/K2GlyOCUjxcPw3Eu155it4drEbK7xUAMkXLtcGYZfbdqVbVhmGkl2envlszqQRgvuUKK8O7xvif2shja8du7WejgOcTo4GyyPiBWsW08eoAvUBNX58Ecxwr17QohOeEoY3XBNtEglTRfJxa9uSkl9KFbi3cOf+nA9ucdDdXMQSm47mt7Hnw8vmIx2RgI2xy4VM1GiMQjEZldqsCicnzAKzJGuZD+Zlny9TtPs7jWi0QzaSVzr++Xel7lAFRiYtkxO+AMKrvurc3PcJWsdGnD5ewVN59cxabeD6VD58Qg8rVcuzaZVR+T9ndMsefa/WZtBvP9ulpf/sqxF 86G+IivP De+AxXWkDf46qrRBQgGfxRD0sbe6LPFIVUCm8GPvPQ0lfipo+3zsn65z2if5bt73PwCttd1uhJBOTEjERatJV4gSNEngcItfJaKQzrlGFDD/Yg6znA+nmMHR/g7fdNuVbPYalBuRcmjyHTzl0FJGoINFsvJ6d3JOgwlAnWcdxZdwbrV3o0Q+ue/JvTveSmijUQS7pMjYwxvIfqWNlHaAGG3d8UYxQh6/UHSDelzIFlr7yZaqu81a612MBtbbFXkIw65/BGCGjYbEo11RCTQa2fFO+HZTeOsOAeHZRj49mtqei5oWGjlcnt5LMtqcLsgX2WM9XK150AhFsGDjH9Bohb6fIEqsX0HWEc5M2n6KBVLxFRWPH43xcM5duTQs1KoajqOzI+pYVkftoqJRJnxzxBbwn70diR5xpSJx9kiooxArlTXHzIl9StLyIyVx9RU7/ViIFi59Uh1IxqQwhUVT8rBVAz6LC/rZcVt6M X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, May 15, 2023 at 05:08:44PM +0800, Baoquan He wrote: > By taking GENERIC_IOREMAP method, the generic generic_ioremap_prot(), > generic_iounmap(), and their generic wrapper ioremap_prot(), ioremap() > and iounmap() are all visible and available to arch. Arch needs to > provide wrapper functions to override the generic versions if there's > arch specific handling in its ioremap_prot(), ioremap() or iounmap(). > This change will simplify implementation by removing duplicated codes > with generic_ioremap_prot() and generic_iounmap(), and has the equivalent > functioality as before. > > Here, add wrapper function ioremap_prot() for parisc's special operation > when iounmap(). > > Meanwhile, add macro ARCH_HAS_IOREMAP_WC since the added ioremap_wc() > will conflict with the one in include/asm-generic/iomap.h, then an > compiling error is seen: Looks like this paragraph is outdated, as an earlier patch in the series removes use of ARCH_HAS_IOREMAP_WC? > ./include/asm-generic/iomap.h:97: warning: "ioremap_wc" redefined > 97 | #define ioremap_wc ioremap > > And benefit from the commit 437b6b35362b ("parisc: Use the generic > IO helpers"), those macros don't need be added any more. > > Signed-off-by: Baoquan He > Acked-by: Helge Deller > Cc: "James E.J. Bottomley" > Cc: linux-parisc@vger.kernel.org > --- > arch/parisc/Kconfig | 1 + > arch/parisc/include/asm/io.h | 15 ++++++--- > arch/parisc/mm/ioremap.c | 62 +++--------------------------------- > 3 files changed, 15 insertions(+), 63 deletions(-) > > diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig > index 466a25525364..be6ab4530390 100644 > --- a/arch/parisc/Kconfig > +++ b/arch/parisc/Kconfig > @@ -36,6 +36,7 @@ config PARISC > select GENERIC_ATOMIC64 if !64BIT > select GENERIC_IRQ_PROBE > select GENERIC_PCI_IOMAP > + select GENERIC_IOREMAP > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select GENERIC_SMP_IDLE_THREAD > select GENERIC_ARCH_TOPOLOGY if SMP > diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h > index c05e781be2f5..366537042465 100644 > --- a/arch/parisc/include/asm/io.h > +++ b/arch/parisc/include/asm/io.h > @@ -125,12 +125,17 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) > /* > * The standard PCI ioremap interfaces > */ > -void __iomem *ioremap(unsigned long offset, unsigned long size); > -#define ioremap_wc ioremap > -#define ioremap_uc ioremap > -#define pci_iounmap pci_iounmap > +#define ioremap_prot ioremap_prot > + > +#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \ > + _PAGE_ACCESSED | _PAGE_NO_CACHE) > > -extern void iounmap(const volatile void __iomem *addr); > +#define ioremap_wc(addr, size) \ > + ioremap_prot((addr), (size), _PAGE_IOREMAP) > +#define ioremap_uc(addr, size) \ > + ioremap_prot((addr), (size), _PAGE_IOREMAP) > + > +#define pci_iounmap pci_iounmap > > void memset_io(volatile void __iomem *addr, unsigned char val, int count); > void memcpy_fromio(void *dst, const volatile void __iomem *src, int count); > diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c > index 345ff0b66499..fd996472dfe7 100644 > --- a/arch/parisc/mm/ioremap.c > +++ b/arch/parisc/mm/ioremap.c > @@ -13,25 +13,9 @@ > #include > #include > > -/* > - * Generic mapping function (not visible outside): > - */ > - > -/* > - * Remap an arbitrary physical address space into the kernel virtual > - * address space. > - * > - * NOTE! We need to allow non-page-aligned mappings too: we will obviously > - * have to convert them into an offset in a page-aligned mapping, but the > - * caller shouldn't need to know that small detail. > - */ > -void __iomem *ioremap(unsigned long phys_addr, unsigned long size) > +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, > + unsigned long prot) > { > - void __iomem *addr; > - struct vm_struct *area; > - unsigned long offset, last_addr; > - pgprot_t pgprot; > - > #ifdef CONFIG_EISA > unsigned long end = phys_addr + size - 1; > /* Support EISA addresses */ > @@ -40,11 +24,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) > phys_addr |= F_EXTEND(0xfc000000); > #endif > > - /* Don't allow wraparound or zero size */ > - last_addr = phys_addr + size - 1; > - if (!size || last_addr < phys_addr) > - return NULL; > - > /* > * Don't allow anybody to remap normal RAM that we're using.. > */ > @@ -62,39 +41,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) > } > } > > - pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | > - _PAGE_ACCESSED | _PAGE_NO_CACHE); > - > - /* > - * Mappings have to be page-aligned > - */ > - offset = phys_addr & ~PAGE_MASK; > - phys_addr &= PAGE_MASK; > - size = PAGE_ALIGN(last_addr + 1) - phys_addr; > - > - /* > - * Ok, go for it.. > - */ > - area = get_vm_area(size, VM_IOREMAP); > - if (!area) > - return NULL; > - > - addr = (void __iomem *) area->addr; > - if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, > - phys_addr, pgprot)) { > - vunmap(addr); > - return NULL; > - } > - > - return (void __iomem *) (offset + (char __iomem *)addr); > -} > -EXPORT_SYMBOL(ioremap); > - > -void iounmap(const volatile void __iomem *io_addr) > -{ > - unsigned long addr = (unsigned long)io_addr & PAGE_MASK; > - > - if (is_vmalloc_addr((void *)addr)) > - vunmap((void *)addr); > + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); > } > -EXPORT_SYMBOL(iounmap); > +EXPORT_SYMBOL(ioremap_prot); > -- > 2.34.1 > > -- Sincerely yours, Mike.