From patchwork Thu Feb 16 12:34:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13143040 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 42DDBC636CC for ; Thu, 16 Feb 2023 12:36:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB67C6B0081; Thu, 16 Feb 2023 07:36:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D40296B0085; Thu, 16 Feb 2023 07:36:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB97C6B0087; Thu, 16 Feb 2023 07:36:20 -0500 (EST) 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 AB9736B0081 for ; Thu, 16 Feb 2023 07:36:20 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8BFA8141061 for ; Thu, 16 Feb 2023 12:36:20 +0000 (UTC) X-FDA: 80473102920.14.6D4F242 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id C9A611C0021 for ; Thu, 16 Feb 2023 12:36:18 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KeVH8iHb; spf=pass (imf18.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1676550978; 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=yr5XKKSsspi4RAZHd1reswGYxPLpqfSVJwzPdgOU6W4=; b=ReOd0FCvKNvfESUEhZwfQ9A13gKstT2cNKXB1m9GfA3cQkycNgX10FtvuHm75+uYo9jLnn hGZT3NW9XiVzsY7njd+fqwV4S/Nb4ZCgA2Tt78XQDZcsItNpW4HxMepaX7IT0B4jBW6l3g uwRMNZD04VvGJ6k7WgeXqPjTQj83nx8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KeVH8iHb; spf=pass (imf18.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676550978; a=rsa-sha256; cv=none; b=YOLByWNpdwvl7DmgUj19aY5G0sbcbdKbLTqSKeJk8paD/muyHsJ4MOvU2LkjEiMX0ZsTLO dPvzoAtTbNyp1STeTNEL1O2AGe+rmh71jcnMXunkHW04Zo50O/f6l6oEXyQjYI1hjCh+xm 5MYM33+YC3KEIrs36T5sCg6eYSvQ9+c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676550978; 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=yr5XKKSsspi4RAZHd1reswGYxPLpqfSVJwzPdgOU6W4=; b=KeVH8iHbY4jdc4WejxGUw4mZ5LY97ldr4eVO2214DNu/MeqwPZJPPuQlWpV7fh7M4heTnB F1DMtsaC7qLtNKnTfY7Zx/munGU60ZdXSRJqeqeM7SzJLrgqfBvnFytR1jyE3jj+i6joE+ 83p02IPCgQMFee/JgnPUPwec8cB5Q04= 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-621-kaG1zBrrPPyNnxQLkRzQ4Q-1; Thu, 16 Feb 2023 07:36:14 -0500 X-MC-Unique: kaG1zBrrPPyNnxQLkRzQ4Q-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1DC483C16E98; Thu, 16 Feb 2023 12:36:13 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-99.pek2.redhat.com [10.72.12.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49478492C3C; Thu, 16 Feb 2023 12:36:06 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, 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, arnd@arndb.de, Baoquan He , Michael Ellerman , Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 14/16] powerpc: mm: Convert to GENERIC_IOREMAP Date: Thu, 16 Feb 2023 20:34:17 +0800 Message-Id: <20230216123419.461016-15-bhe@redhat.com> In-Reply-To: <20230216123419.461016-1-bhe@redhat.com> References: <20230216123419.461016-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: bp9squagxwxds4xaa8cwwjtaotijkg8x X-Rspamd-Queue-Id: C9A611C0021 X-HE-Tag: 1676550978-40344 X-HE-Meta: U2FsdGVkX1+DTM7FT4WRMXrnyAlXgtuLxWQ2ZOz7RLkM2IqggfNhLJ6F4H7/lpQ7jk8ytI4diDkI/teg+mHYxXmwDA2jK2s9gUOVDLQ5CRn9wU5327FYDtBcKgD6QtEn75/myuV/vKdzAeHZIVI40tA8qRho44loXphXS2d+1M03KoxC8CkbqFlYo86sbeQDT5cY37fim5LyXNnorPOBsKFfsE2SukQRwUghUlgeL5iUKh382bUqcX3efueogVyrf78QV9UfJ9scs3ACFn56x3KZw+OcgoFdJJKCs8EvUE+jOm4RdQUeAvEdfLWHoNAz/LlmJ1xch5QvwPR/CRg/FmKxq3gV37z+9exJ0HhlX1Oej969XGqMQ5zzFc9Pin8CH7E7Lhgr3gcPibi/+0+g/zoR5vK6YJLtGZtva5DVoheqhk7DYx58umUqhnMueSuV5mfD/XUXEwVZ1JD0VCAdPEJBBxEqiUo4fu4QWS6ncrFNiRph9g6Bhpx24e+/iEvoSYzBM+mOe6a5omDhlkfbyagkM2gx9BdFi6R605cRXH8r9M5TMhM+9W3eu0CLt4DwYf1rac2e7+gGM2sV1AwK1QwYSDw6joqfEMmB4SXMcGp63V9++SlQEJSpb1sktu+5M2GrKPykbCHkFF/qEnwxpM76AQNyZGek/v/F93wLOlMdHznj/WUcIY+ADqbd4aTHJ+10SbPFtdKovcgWH6FvxxYyzCvzx6Yvci1NipAGXs/1ETGZ4C/GGHZwppvw1D7tcTa7OxFBVkWeCAH8EhKm/Aa6jpkr+i/eETkk9qOD+NDK0GXk4A30rbTziveSzIvtHSwxZl4yDpWCOo19d9YZoczIjpYhmoUoC3d/9suwmAiEnxBlgFAjBA7jsxnvjIL2w4TJKXD+JNfsEza7Qr3qFPdZcW575DcAKx7gJ71YqYZMZCsGRGWObLFd7WmxKOQIAjPzs3g1K/sr67M6znO C8w4AIKE 8gcc5sBIhstRy47w53kuWoagb6xywg6MOvE0LJ2uol2gzD8LKSCtsjaP6PlTbpGNJWV3H1IV8lYKvTl4M+1vE4bJ2+qJqvXuGCT4flwCbpTdfhTuMjslLGVC2vfTAcr2WKoPK0QoLeqpxJWoWhm93bzuMsjnA0t0ShLgmxPe+8T8j/2tfnSNmKFMtmjVgvSyJqZ/MHzuYWYdHUBOR8SvYJqf2wvMtciCy7m8RX3bmHJm+S4svZ41vSp1vvdrOfW2HS2PKjiep64KCU+QlFxprf2Ueg+ZclzJlyMMYSkCM9vWla8Di2QyySRnbi+y60DsGyoJlk9deKNe+vAKULhpJvq/5JsfvdWaV876czr1SGYCYvplUp4E7ee4zXYsir7QWo1K1 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 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 7a5f8dbfbdd0..02ae9e6afed6 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -181,6 +181,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 fc112a91d0c2..127d8300b40b 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -859,8 +859,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 @@ -874,14 +874,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);