From patchwork Wed Mar 1 03:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155581 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 7CF48C7EE31 for ; Wed, 1 Mar 2023 03:44:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 210596B0089; Tue, 28 Feb 2023 22:44:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C0296B008A; Tue, 28 Feb 2023 22:44:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 063246B008C; Tue, 28 Feb 2023 22:44:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EA60E6B0089 for ; Tue, 28 Feb 2023 22:44:39 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 537B180FD3 for ; Wed, 1 Mar 2023 03:44:39 +0000 (UTC) X-FDA: 80518937478.22.3480B6A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 98756180011 for ; Wed, 1 Mar 2023 03:44:37 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LM9S3Jmd; spf=pass (imf06.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=1677642277; 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=YI6zAsqfV4tytLdyXd5+o3PHSfOJhEqLGshxqkD2D90=; b=fJYx0NPsgFjdbtxSpW35y6SZFywAPU3IFhr4+d/md+HpM3O7i7J29/Py02E8xfW5VP288p gpmQ563W+grbLaMReKUI9lBXZothAYwwCQ7d1B8MhtSSVfR7dNR6lsI6jySmKXvJTQxusV EnEh5xR7yx41RDuk239841k42lVUQRg= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LM9S3Jmd; spf=pass (imf06.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=1677642277; a=rsa-sha256; cv=none; b=eW3ojALIGEZlkH6f3WcZ7kQQmJOS9K6RSNhJsedsa7RugCIRkBr7wRvANpa/KpdZKLTX7/ XhoLAAUIaCMzhdapme/h2SKfPxmnndFLfCziuZGe4SXWFworjWW5lEQd3J4GRfYgMa8xV6 ehr6JSL6m6ECWHAy26eMmL0aVwBmv8I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642277; 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=YI6zAsqfV4tytLdyXd5+o3PHSfOJhEqLGshxqkD2D90=; b=LM9S3Jmdz5cw1PC+Q/EpC91W9I9IK4U6QSPKBTcqPGEKuiZpiX0KMDDwPHP7M6ht5InQCM l92hYUx6Adw6fLgk9kdQignOoNUPaUDgwwattQcrZYZovGHrtcxTuh1+VvkmWfE3h4KkwO zWNdt0gWOOf73XvZ3SHOFfvpyIX3jvM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-391-zIUurNcQMHuSTAQ4hoLoWw-1; Tue, 28 Feb 2023 22:44:33 -0500 X-MC-Unique: zIUurNcQMHuSTAQ4hoLoWw-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 E60BD87A9E0; Wed, 1 Mar 2023 03:44:32 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-180.pek2.redhat.com [10.72.13.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65CE7C15BAD; Wed, 1 Mar 2023 03:44:28 +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@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, willy@infradead.org, Baoquan He Subject: [PATCH v5 15/17] powerpc: mm: Convert to GENERIC_IOREMAP Date: Wed, 1 Mar 2023 11:42:45 +0800 Message-Id: <20230301034247.136007-16-bhe@redhat.com> In-Reply-To: <20230301034247.136007-1-bhe@redhat.com> References: <20230301034247.136007-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Stat-Signature: rqyk67yyqy8biwixknd67awrsyjzzdcb X-Rspam-User: X-Rspamd-Queue-Id: 98756180011 X-Rspamd-Server: rspam06 X-HE-Tag: 1677642277-791591 X-HE-Meta: U2FsdGVkX1+UGfmCBMzOquETo5vNb92DrYd6tuqplrTGlu9nvYF1ZFNrsmNysHWOjTRGYbYnK0hmSnSpcVHhi17TlCGVXK4pm2ZCa5xXfarV2HkMo4p06aa+ydEKgKrNfCGo9uWkmaqE9Zjb2B7Iwnc+rDN+dU+VNC6VEsvnQdz2Hsf4l3DRqtACwW52QLjsvT2EqA8vu0MDrxBK6uyKpAMQrVUXdtnE1HUipkkbdnJilW6VI1Aa76weXHjZTzkhgdz8Fj/bUBkNFdFGRs+dWQda8faAg5pLHiZ0nNpgmL4ABa3tvT8vUNIcnkzc2sl2vI9LnZrAPJkNqS+Agy72p/H636nDTDM0bZKkchsfHazYMEG+emgKvNB+ZSCDwr2BXET+gQ5vdQns/t8a5i5CkunRvPH/SSIwA8YBTCpvsrJYLfDC9xYrfY5xUfhcYiT5x0gcuFbZuOBmfqYf21KV747L6fDcB+k+pDmYeJP2sgVs8/7DBItnEeXMLMizWa3B0psMlUanfD2/4XrWlIRIoGYz+nwkTwlR9kfwESwUdrny+oEhwTEE7BUQzzs1y2sSnOA/8DKaNYdgHl/aPcbX5Ktocqiwm43KnjJaBnzS+dSfSw0lW9wcipPS/KGgFPma3VNSmHNDgF65I1HJMeAHSuHp6FZQtejTqBY4aUckqxJh2JxrmqhpA2vvtfYoCzZl47sxkghTDndemaGqdaksq5yuikf4BlSn+XvPP6ct1GLfF5ZPleozyrISsJQRGNC7sHpDfGLrhl3nfM4TmuCQq4iOtPWzbfpXihIZt2OEK7Vf9JHfx2Dfwzff/1hemVIe6Ak/lgdjs8A2kDuqd6BALdcRcl6w2GMOlDpdpOZz05U3XXw9/IdU8Sln+z1ytcRuj5IsjSY/gqnBlKSgJZi+1n7+abg2MgrRi3OeAc3877PFHzvPKC193Omvu7UUspdpBi1KuwxpsPeCWQJED66 bRTXchAw xaoOTsWPmSL2AtVd8nNEN3T8zIe7T0R++Lh2dWtshFj1bl6GirRANDfOPsPrrYmFemgHOAyML9mHhxe+Y4IV+SSd7xMIRUDZf/IxmbKHLhhslAe9TcwA3/w75Z69FXo8IfgwE1aR8tXBJx+3A1i62z6N2ydulFkdjRzEgmY1OqHdfpBw9Ox/q1uYXzNUm8HhbUpcDaexByK9XWMJtaZfxk8xZve+cLkSMdK8ljLoABqtX/0IeN8wUwStuiyprYnbepxwIE5Cv8+UMkAx9/bOCHQdmrQl/FD/H+F9+PmGWLefC3gE= 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 --- 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 2c9cdf1d8761..7441295b718e 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 7a82e6f70ced..978d687edf32 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -852,8 +852,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 @@ -867,14 +867,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);