From patchwork Fri Jun 9 07:55:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273367 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 D6017C7EE29 for ; Fri, 9 Jun 2023 07:57:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B4498E0006; Fri, 9 Jun 2023 03:57:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63E158E0005; Fri, 9 Jun 2023 03:57:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B7D38E0006; Fri, 9 Jun 2023 03:57:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3AD198E0005 for ; Fri, 9 Jun 2023 03:57:50 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1084AC0167 for ; Fri, 9 Jun 2023 07:57:50 +0000 (UTC) X-FDA: 80882455500.15.11BC1B8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 3FAFD2001A for ; Fri, 9 Jun 2023 07:57:48 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LbzlVMsh; spf=pass (imf03.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686297468; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mrr2cNyhDy3XHVdkhg3dGxWKYfHUscXJOX9H9m6IS1s=; b=CNA3NcgEBoppYAZWoNK3pC6S2gfhP6tsVIYwKCWH1AHnRLdbOheCsHei9zQWUAKPTOCh/I 8ME5oxYsYm7sN0w69L8xh7VAgSTDHcUA2hgKvcch094PmvHeBcM6+lvz98X7NXL7p897U4 Wp2rV1QJY4QvnL9BY/OS4Z5ytogXzFw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686297468; a=rsa-sha256; cv=none; b=0VjuWezIDVJcA4HGHtlMgsFSwwJafG79qV190Zuar106M66wETzrdWr5ZGzO912usXU2jn auJNn3pfxnozi5+DofGu+chaxtjmEQ40mBY1PELtIgkJHOlnOah6n2g1k2onc6qg2z0Oxa 6x52ok6BT+c1SEY8EiVYO24R9LSjDGs= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LbzlVMsh; spf=pass (imf03.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297467; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mrr2cNyhDy3XHVdkhg3dGxWKYfHUscXJOX9H9m6IS1s=; b=LbzlVMshK6wT1awCwyN49u/RvqVLaNhcX+RREZtYv2rlOXTzIOHh4Ct33RO3JOZjpYVl9k c4PzASFRA5gtmDHr+FBJxo2nsT5Z9UJw0NZ6Tnz+C4TXua2UThc4z/YEFkIfYxYABMoa/B e1QAjavdqW9eZRYcEqkuXa2furSAsh0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-76-1o8RxqJuNy6kld5Aajr5wQ-1; Fri, 09 Jun 2023 03:57:38 -0400 X-MC-Unique: 1o8RxqJuNy6kld5Aajr5wQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 625713849528; Fri, 9 Jun 2023 07:57:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-92.pek2.redhat.com [10.72.12.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C15C20268C6; Fri, 9 Jun 2023 07:57:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@lst.de, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, Baoquan He , Michael Ellerman , Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v6 17/19] powerpc: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:26 +0800 Message-Id: <20230609075528.9390-18-bhe@redhat.com> In-Reply-To: <20230609075528.9390-1-bhe@redhat.com> References: <20230609075528.9390-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspamd-Queue-Id: 3FAFD2001A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: wxx8dbqfwbqkexki7d9ixzbpjucj6uff X-HE-Tag: 1686297468-877091 X-HE-Meta: U2FsdGVkX1+A0X42+y8l3WO2lA7rEg8xCOAkef1eibGbSUvt8S2Z3onrhZLr7M83Kl47V3zg1HoFkDPEaSYjFWYlWE4lzKbnyxh3D6A2cPbDQihux6mrZzYznf+9l8RCeDv7mEb3+mUNyAWiHcGC6pFa7v9wUPXQQu4yrrHOBABWg7ZXppQmHFk/Uf7XcIvxZZ6FumJfndiwzhD53ynw1OIpcP1Zvg1Y1Ey7VQBTfrqvQzU6SpY1Q5b8TRJs8B/id44BF25TDevYmbLnm/T0A3j/PbQFR5egVt81eySKmwBOSYU/OWyJTyXL9RM/0YdiAt4z8kQ3q5A6VACqEBEXsm0gW3r5Z2Q2/taQh7Rwd7DM3Tw9GhbcowKL2BsOMhFRe10w/YJ8YOw9DEJgrUg/73/R79uhMHm7DrXn4iKJOQt64g8zvHSLQ5OBjsinN+4xWJidhCTOqrYouf2pU8ympwfzXPuKj2KATym/20zzz8/mjxMwinX85B7H0KGFcgnqsCoos/KQ3ErkSF1J2X1e91X2KWZeFLLC/vEKw1VmUCq0fhqkDea808uUygC1LLg0J9+VRKJxushRk3CaTbdpHxGDrBbi2mzgP21L156q3tt5KuJf/a6FfVHJijS8qpeFhZXAEpA9VlEefFn990WtIN26R84rYB9wXTHFoTkVm8yWJeoqCMoXvPrNdGjjIs06D8TwGRWuj48xLPETD+arD0D2Xw5RJrZWUT1i2hm4sT27EFxJ7zS9KrfF86Rk7wIIOThwEXnDbCPxWZ5cqP0D11/ZWxQUKHt3jFwiKodfRCLSgRq2nCfwmUdO6FYDAl6T7QYLu3oEJ4GxQP192/5CCXUv+WKp7gWBJrOOT2WhJaa80+qpLpAb38CT0o+uZkCnScCQcx85+RSOSLUkqfPXXb7pa+WCF+hsLGPrDg4y9KzoBxDoKduvf5L7GGt+IZY/R+ThND/rMOH2V7ijw0T /VczrIEB ody5KUbIF2Q/TRjjlMKu0rZoBIHcCfj1FvER9UGO78DFlJqLAHxmsb/+gu4x1M8KblY2MotAqs+SQJcCfNWnJNTieOqWhJLTi2p2kZbjnvgy4gY4r1vYwOOVCVQXY+iIaBiEor5JkNufh/DwdRqDVvQVaBQdjioqSFVd5iVM5Y7Fxpb2+BK4SXjk8197kCqi4WdEdt19/7J0zrlmitO/7V7mmCrGor89REIyAgcUH0rxGFtWICak9U7K+EErPLCK61dWaIXkd0TDn23BPjfAQLqImQeiuT+fCuGptQU6hhDAhD3npsXugXB+/3qNlpBhTFwbqiK1bSRKocIfxyWJleBNlk0+K7Uo4NEvGsHK7N8+3gPhoCb2p8limfk+OSrGYdAZ35s/jErs/w4q4jOoLNn8t4edclYSVdEjSccIvPhqui8Y= 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: 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 Reviewed-by: Christoph Hellwig Reviewed-by: Mike Rapoport (IBM) Cc: Michael Ellerman Cc: Nicholas Piggin Cc: linuxppc-dev@lists.ozlabs.org --- 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 bff5820b7cda..aadb280a539e 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);