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 C4C73C77B7A for ; Tue, 16 May 2023 07:00:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69B7F900004; Tue, 16 May 2023 03:00:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 64BAF900002; Tue, 16 May 2023 03:00:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53AE9900004; Tue, 16 May 2023 03:00:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 45497900002 for ; Tue, 16 May 2023 03:00:27 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 16E14A0137 for ; Tue, 16 May 2023 07:00:27 +0000 (UTC) X-FDA: 80795219694.06.A4792F6 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id C8673140016 for ; Tue, 16 May 2023 07:00:23 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YXOsZa+d; spf=pass (imf26.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=1684220424; a=rsa-sha256; cv=none; b=vaH7BVYe82A6Ew4/OCNNbbS+6NhyOHMrbsTDVoe5VgR2ecDH74bdT6Uo95I97czxai64BA J7ZXlz12+UoE+jxL/+CoGOb40X3PWhHFmHKupi13uTPgsy7drz/zdslTs7bw5ebdFSy4Kw TIqeQCy1paNHzYsEMG7hFmr4PtVCueM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YXOsZa+d; spf=pass (imf26.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=1684220424; 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=NAdcpaQX32eLDdyvnblol9Iy6+b/N2SJVk27ZQCRuTA=; b=EE8nXV8IIvvktGbkmTrHaMCfhZAmF60NDylJjveoIe8kvEEqfewnRQfNkWy9TM8IK4pDpl BFu1ScW88cgpWhko3GN8fh7+tEfcbTcq7r5CyipldlQJu0VC47NEfAu5UNBkZWy+zGWO6r Ynu8jh7hcf/lOlXRkaZ9TQj/ZADF1LU= 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 B0194634CF; Tue, 16 May 2023 07:00:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCBC7C433A4; Tue, 16 May 2023 07:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684220422; bh=uaWOFEtnJfkEuUvkgldSHMU1qyTBFUzaYt9REtBOs3Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YXOsZa+dfbd0JluDvpWuYL/Y6rAf175fM4RRCp4pw4AR+CQNq/1kMluQTqdDOlidy hzLAtTHThLN0+DyuFhGthLgJbKWYTxQApdSwYvoTlzSB/raOEG7CGgF/6uWqQEplK8 ssEOLHE64petJfhUwuCTpLDJUxrl38jPFkJkYb+5JvPdu+oyFpMp9j0uyMxcEHfwNq uwNze7H82R9PE/0W4xyMpR7ssVidhfvRrk2CLfR1RWf2qT6X1pdSXM9I8NG1tUgFUj CxqBNAIrREKVAAphcUySJo7p9IG00kpRk8837SL+zlh6Fxd8qBINcT6DsDriZGvhk3 5fVJa3rbyTVwQ== Date: Tue, 16 May 2023 10:00:13 +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, Michael Ellerman , Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v5 RESEND 15/17] powerpc: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-16-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515090848.833045-16-bhe@redhat.com> X-Rspam-User: X-Stat-Signature: rnbwo3ujajpd85ininr3r5adgx1dm5gs X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C8673140016 X-HE-Tag: 1684220423-970404 X-HE-Meta: U2FsdGVkX18GSnBpX0v7XtyV1ICKGt82H0+rVQv3GpIzrYMS3u7FPpWqRV0siujJrdM66Zx36xBOiSrnr7hEyHTVmszNmZfFe61pY9sPOxlDlhWZKZIbYhoCUnw4oA4/dsxphuLghG0aEimiATjCnFAbyDVy1w4F1bo4qA2PLe74ZuSkV0MODKbH+u3CZarJhkD5Z2CnmCrPUIH15zbgg6Xn5z6yfn2jKRIOcN0CskDvsCXuDS/k+zL6wwsVjivionKo+HFnCZpwwjFz8RhlWPSBUIe+Lb3FG87v6mkUczzUAzS1oCNtPMu9uqr0jK79x/ezZnn5V8mzhs2UuhqtK0UDNzWFE3Dp2JUT0dZwb0NxKL07iv0lEbkdEVVigpegVo4eeOue6rE8kPbfA+bvUPgrPypC77vsvMzdmPFWK04gSkPPkkdo2LoZt/HqCtKM+srxAi7gtl8VTENYJwOlXdMBk9zBWD//3DJEOxZWSvzKUwvhYH3Y/l8nYLaDCS/dowEoBNXxZddiVJLGWpIe/CXu82Mg+3fIDiYuZ23bucOGtBihGLPuLzfY3/u74TCDrxvPaTU2BqOJ1tN5RmExRy1mbR3pwUbcoONpjL3TfEGLZS+pvwpypU1te3pHUPcjJMo7B7vojGNEQc5tUM9oYIh9W3ZgbUReY06OV9TtSFuchvRjW2/cT0qHA4TwIIxJTv4TG2x7gA0DssBm95iHVjSJqZWaLRAJEXYE7Oiyu7+DEaGeEgVbQN1oxN+HM4wa0Ff4JuQ5ZifFlKsPzL5beLpqDcm+X28AXRwJPSJlnTXFMZfdFcovPiAKm6XFz1776VIwBeNHpCjZIctlyphhoYwGFyDNpEHJSyyG0IRiI2Ql3it4i6GNpxzTMV+dwARLlA2l7pXQ3PsTCgwrV9YdeGliUmJcrih5AbJIHV7ww6wZHM1wdBobqZQHhZVMno6akVyNJBLuJI+fjtccTQW JKOJ2iR/ FvDAWC94pCMAmQrMF/ht+RqVhm7pTMmm9mJdmlK9ltIyAk1Xm2+X3uk+qMFkurchqjQL4cAURSCORF4aoa4WUpoL8HzVt9L/CwdPW5v6BnAPPr0dI0BnPp0zHhkF00ilNJFrTzV2K/YfrfpRa3H5S7DuXcj/9FEWbjWhF4pEHdiV3hwjynEfNAt38YYlSw0EMQHRg6NL8q0zv+OiVCF/429GbjuylKfh840mVyT6cRs2JKq76x5ySjyTJbFjhubtgM7aKgbf3FiZ9ZA0zc+g5EsKrrjNCJxikcq91IwKn+PWEzi0wV8RBPSA1tGrScwXNU0Ytz5B0njaJJiG+GllYyUqSucAyM9Ru++KGPW+cv6rJYViY+zMijv2BmJLg+Vv4Ez0HbaGcDlGqjwYlJ/Md1/QM/4qVrlnkpglgGLXB3zdTy0Eq7Y8jhDzj+4TccIry/tVkEA2UvGVb0P2d2Dq6u0SZgv8IarxjQeeFSQ6sKKNg2uSXW++QME4rFv8V1lJAtY0EY54bABgDl7oI/8Z5jdN1KkBo0idbAMEMNdvQOprSII9ep/3SUWYkpw== 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:46PM +0800, Baoquan He wrote: > From: Christophe Leroy > > 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 functions ioremap_prot() and iounmap() for powerpc's > special operation when ioremap() and iounmap(). > > Signed-off-by: Christophe Leroy > Signed-off-by: Baoquan He > Cc: Michael Ellerman > Cc: Nicholas Piggin > Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Mike Rapoport (IBM) > --- > arch/powerpc/Kconfig | 1 + > arch/powerpc/include/asm/io.h | 8 +++----- > arch/powerpc/mm/ioremap.c | 26 +------------------------- > arch/powerpc/mm/ioremap_32.c | 19 +++++++++---------- > arch/powerpc/mm/ioremap_64.c | 12 ++---------- > 5 files changed, 16 insertions(+), 50 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 539d1f03ff42..e0a88ebcd026 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -194,6 +194,7 @@ config PPC > select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC > select GENERIC_EARLY_IOREMAP > select GENERIC_GETTIMEOFDAY > + select GENERIC_IOREMAP > select GENERIC_IRQ_SHOW > select GENERIC_IRQ_SHOW_LEVEL > select GENERIC_PCI_IOMAP if PCI > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h > index 67a3fb6de498..0732b743e099 100644 > --- a/arch/powerpc/include/asm/io.h > +++ b/arch/powerpc/include/asm/io.h > @@ -889,8 +889,8 @@ static inline void iosync(void) > * > */ > extern void __iomem *ioremap(phys_addr_t address, unsigned long size); > -extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size, > - unsigned long flags); > +#define ioremap ioremap > +#define ioremap_prot ioremap_prot > extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size); > #define ioremap_wc ioremap_wc > > @@ -904,14 +904,12 @@ void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); > #define ioremap_cache(addr, size) \ > ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) > > -extern void iounmap(volatile void __iomem *addr); > +#define iounmap iounmap > > void __iomem *ioremap_phb(phys_addr_t paddr, unsigned long size); > > int early_ioremap_range(unsigned long ea, phys_addr_t pa, > unsigned long size, pgprot_t prot); > -void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size, > - pgprot_t prot, void *caller); > > extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size, > pgprot_t prot, void *caller); > diff --git a/arch/powerpc/mm/ioremap.c b/arch/powerpc/mm/ioremap.c > index 4f12504fb405..705e8e8ffde4 100644 > --- a/arch/powerpc/mm/ioremap.c > +++ b/arch/powerpc/mm/ioremap.c > @@ -41,7 +41,7 @@ void __iomem *ioremap_coherent(phys_addr_t addr, unsigned long size) > return __ioremap_caller(addr, size, prot, caller); > } > > -void __iomem *ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) > +void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long flags) > { > pte_t pte = __pte(flags); > void *caller = __builtin_return_address(0); > @@ -74,27 +74,3 @@ int early_ioremap_range(unsigned long ea, phys_addr_t pa, > > return 0; > } > - > -void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size, > - pgprot_t prot, void *caller) > -{ > - struct vm_struct *area; > - int ret; > - unsigned long va; > - > - area = __get_vm_area_caller(size, VM_IOREMAP, IOREMAP_START, IOREMAP_END, caller); > - if (area == NULL) > - return NULL; > - > - area->phys_addr = pa; > - va = (unsigned long)area->addr; > - > - ret = ioremap_page_range(va, va + size, pa, prot); > - if (!ret) > - return (void __iomem *)area->addr + offset; > - > - vunmap_range(va, va + size); > - free_vm_area(area); > - > - return NULL; > -} > diff --git a/arch/powerpc/mm/ioremap_32.c b/arch/powerpc/mm/ioremap_32.c > index 9d13143b8be4..ca5bc6be3e6f 100644 > --- a/arch/powerpc/mm/ioremap_32.c > +++ b/arch/powerpc/mm/ioremap_32.c > @@ -21,6 +21,13 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call > phys_addr_t p, offset; > int err; > > + /* > + * If the address lies within the first 16 MB, assume it's in ISA > + * memory space > + */ > + if (addr < SZ_16M) > + addr += _ISA_MEM_BASE; > + > /* > * Choose an address to map it to. > * Once the vmalloc system is running, we use it. > @@ -31,13 +38,6 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call > offset = addr & ~PAGE_MASK; > size = PAGE_ALIGN(addr + size) - p; > > - /* > - * If the address lies within the first 16 MB, assume it's in ISA > - * memory space > - */ > - if (p < 16 * 1024 * 1024) > - p += _ISA_MEM_BASE; > - > #ifndef CONFIG_CRASH_DUMP > /* > * Don't allow anybody to remap normal RAM that we're using. > @@ -63,7 +63,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call > return (void __iomem *)v + offset; > > if (slab_is_available()) > - return do_ioremap(p, offset, size, prot, caller); > + return generic_ioremap_prot(addr, size, prot); > > /* > * Should check if it is a candidate for a BAT mapping > @@ -87,7 +87,6 @@ void iounmap(volatile void __iomem *addr) > if (v_block_mapped((unsigned long)addr)) > return; > > - if (addr > high_memory && (unsigned long)addr < ioremap_bot) > - vunmap((void *)(PAGE_MASK & (unsigned long)addr)); > + generic_iounmap(addr); > } > EXPORT_SYMBOL(iounmap); > diff --git a/arch/powerpc/mm/ioremap_64.c b/arch/powerpc/mm/ioremap_64.c > index 3acece00b33e..d24e5f166723 100644 > --- a/arch/powerpc/mm/ioremap_64.c > +++ b/arch/powerpc/mm/ioremap_64.c > @@ -29,7 +29,7 @@ void __iomem *__ioremap_caller(phys_addr_t addr, unsigned long size, > return NULL; > > if (slab_is_available()) > - return do_ioremap(paligned, offset, size, prot, caller); > + return generic_ioremap_prot(addr, size, prot); > > pr_warn("ioremap() called early from %pS. Use early_ioremap() instead\n", caller); > > @@ -49,17 +49,9 @@ void __iomem *__ioremap_caller(phys_addr_t addr, unsigned long size, > */ > void iounmap(volatile void __iomem *token) > { > - void *addr; > - > if (!slab_is_available()) > return; > > - addr = (void *)((unsigned long __force)PCI_FIX_ADDR(token) & PAGE_MASK); > - > - if ((unsigned long)addr < ioremap_bot) { > - pr_warn("Attempt to iounmap early bolted mapping at 0x%p\n", addr); > - return; > - } > - vunmap(addr); > + generic_iounmap(PCI_FIX_ADDR(token)); > } > EXPORT_SYMBOL(iounmap); > -- > 2.34.1 > > -- Sincerely yours, Mike.