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 86768EB64DB for ; Tue, 20 Jun 2023 13:18:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 293688D000D; Tue, 20 Jun 2023 09:18:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 244198D000A; Tue, 20 Jun 2023 09:18:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10C778D000D; Tue, 20 Jun 2023 09:18:05 -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 02FE68D000A for ; Tue, 20 Jun 2023 09:18:05 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A6C2B40F2B for ; Tue, 20 Jun 2023 13:18:04 +0000 (UTC) X-FDA: 80923179288.11.418B1F4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id A7D04120013 for ; Tue, 20 Jun 2023 13:18:01 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SHRCgk5m; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687267081; 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=x2sUaNNwCqsMasg/2AzDkqwqMP/JuqkQbmlNO68GmDZ6BG4WyajrV+pFvLJXyAnNcyjmrN 0OIN0+G3Drry+kcZ5PJZcRpOkNzxIgJBVmG/jrBfuO21eqgGXxzmReD4J0f3/mOqEWSuQP eNVIrzgf+d1Zo9ruigZK4mgH+mEvm1s= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SHRCgk5m; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687267081; a=rsa-sha256; cv=none; b=kqph2CbGKNd3YYTMKwlLl/yqOKMJ3oXei6lqTXDxnHSSgQfY1W4zVlyFYObeCM16trhyaT A1qrtCVM98/gN8LaNkrfTC8axw7jJvyUxmoMRZ23Xa4hNpRuXIY9ku2Nn2Ih4Q9XTh1bE/ TiqYA82MLtIktich6iXAcGCFPz0WNxQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687267081; 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=SHRCgk5m+59pMpdEjWmZv8vj2Tp2kNcfoinei8xhWopLDd+cnc28hX4R7Nvs8pcRkmdQ7V /6h0TpFGfO6Qt20GqZxWQA6QDUradaB9uF/a4riEItWxXpDxSnBdKCZLnp65PJY9irKvRq uZZc/VUhbPKm+keGDxv11uxAOcASuOc= 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-100-cbsQdSbTO9iAyNHoribILg-1; Tue, 20 Jun 2023 09:17:52 -0400 X-MC-Unique: cbsQdSbTO9iAyNHoribILg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2CDB33C28C17; Tue, 20 Jun 2023 13:16:52 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-166.pek2.redhat.com [10.72.12.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B052C1ED97; Tue, 20 Jun 2023 13:16:42 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, 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, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Michael Ellerman , Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v7 17/19] powerpc: mm: Convert to GENERIC_IOREMAP Date: Tue, 20 Jun 2023 21:13:54 +0800 Message-Id: <20230620131356.25440-18-bhe@redhat.com> In-Reply-To: <20230620131356.25440-1-bhe@redhat.com> References: <20230620131356.25440-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: A7D04120013 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: nmhgirgk3mpf1y6i5uatiidy16cn5i7t X-HE-Tag: 1687267081-899001 X-HE-Meta: U2FsdGVkX1+DmU1ACT8VqnO5FRy2hyq5kx6c91225nSCG/fYTWCEnnSDc8uoDpmRRcYM25tOQI6YnvmVFNw2zD5LxDVaS5qfKtnAO9CzSrneOd+oiPl1P0FNX2L3wxcvQz7UIrfSjb8B8KDAFgdJogjrwvDmOQH5Ob84Louuc7mZCZCECQQMZBXpe2mEkXolYhl4EWa1pZybuQw2Q9JwxgjoZZReXreI7s4jdXsCwcI+WbAybU+RcEPGrUgw0aLVVSwijG7Tsx1CfNoAxlLTlzHG5oXsfbSRY0yRUzYK02KHI9VdGpPGv7ixxB/mk8xiAqnmVqxgdw+xpYv1HDo7aiVqdUr2bLyh1GQKgmv1NnLMTiVy/MYScmtLBMw5+ed8mBnLRS/zB8wLScsmxxDIpUflg7k5X1wB2lPNM+jbyg6iQxCvKCA1NEWYL8raiMcJkLsEWULSrp39J6ZE+QVMNZVokR7UaMWWm2ZrZI3fXTNLbjNgdCvN2aTy9Z73cdzzOx0DEuvIi3EAgpEkjEVc3/UV7JCQv/FHL05aj5InC/iw0+jyc7VJYcC7urnVGCRLI8F0jL7Z0pl4pucb6PIDaGTnG2eI+0GoKnTOPyJxcNxDvCIGdVivakfHcp/6j+CKMo+HxzrHNueNBWuufSBO2BpBXxXX+GGB5hl43Pf6D+DOvbmFkVM2HX2F1q9s0m4XrOPPRyQw0NZAASHfmEdXnZ0fq3YivqIOniZV9OmPY0jQ8Mk5AI66mLxuAJmRRGozwYgjkhQG7l4fPQNhDDQWl0KluQfeShfAyosGTOWDEw/ULcdONBUI7XbLYqbQnIvHmC1c/t+U7VHNJpyX61l45CMRnmgudvf3l3RItalEX9gJCnfEo0UJt7jw98KbpFp8LjjMIV8KTScjU02M00DBP/CeIfp1CfaazHaii1sRiKJxR9ltxzvUrf4mhsi0XKRwVSB8429JVTfGzyf2FkA BILjdSy8 u3YU2YA6Z0BOJYSJwwqkhZIHjm+V7Ayu8zWArVuzIRCCKlL+Ys/e0TTDbamxdHippvYh9rBQbnYRYUE6bApOfmPaVWePg5hoVovWD6fPaPgf5xUVdEyF1cfZuS+AoiLShKxfAhsHtySZZ2D3PwOgMF952ImpIfdmwp+I0AKLOnhUyX3Tdy/OKGqIqknrJlmdAYgI6nq+jJbGjSnjwyolcyzb7l/zWCMPO9PNWwP7wG8dCN/LdqQ1LR2530+mHgy25Ifnltn0+8VKxXb+xmFexd2rAGWWqWSOaDBjQ35zLoU9VShdM5LOoBar2L6hWvQnabI/xNAUsqfOfiGGmTpE65cVp5DjhzXnVyL+PTjZ3ow8eH6qN9NT5Rj1lNr4oAhvpzlMFAXNLLV3G+iJycbWa6C3O7YzXJLYTA5JuiPV5vWP0n0Q= 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); -- 2.34.1