From patchwork Fri Jun 9 07:55:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273363 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 EF522C7EE25 for ; Fri, 9 Jun 2023 07:57:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FFD88E0002; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 888068E0001; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7014D8E0002; Fri, 9 Jun 2023 03:57:26 -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 5F6ED8E0001 for ; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 188AE12017C for ; Fri, 9 Jun 2023 07:57:26 +0000 (UTC) X-FDA: 80882454492.27.9D4AFEE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 477C2180017 for ; Fri, 9 Jun 2023 07:57:24 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JjEr4BQ/"; spf=pass (imf16.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=1686297444; 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=LUPq0cnzOLgrLVKYAlQ346H5looYZtvjQRVHWSAi6lQ=; b=WbKfaj/ayfd4E6A2Of4GTkBzPCIs8BAygD5+2zIWCSWztdJH8yWEfzcr5uRc/KmPRk6TPu GYQtWq6RCkxLiPpuurfeMNGtNzpqJQp2/xpPxrkXSuwMXtPynaTdoMZb1PoGWsGn4CW2o+ 7D4vz6XfTdqA1ZFaQuVtwY6Qp9TC5EU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686297444; a=rsa-sha256; cv=none; b=p7+8wx/HkZuzig+y2bJp9523z8o60U6tEPhiXKMWAr0DcxwaMSKs55RdwZ3rp5o5831AfS kqdsikXTVUw7h68z1xbiQTPwOcCDRc8HVKqhz3sNo83d3SVJKALpfeLU7VS7XAkKhG9UuP gHz2LeKQjRnfHSENJKGghoKwtLT67HU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JjEr4BQ/"; spf=pass (imf16.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297443; 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=LUPq0cnzOLgrLVKYAlQ346H5looYZtvjQRVHWSAi6lQ=; b=JjEr4BQ/J3Zs/Y2cXQNLSyvcpIjI4NZk6MDLQADiH8h/s1lM6J2Xao1Xdl98Chgbw/ugk3 ES7ibWR9modRKP2aMVvwjOcPpeQ1DteVXtiUagYnyUGLkt0mCQjGlRjODr7+lHR21hXSnb 8nVRdYmLUyVCmhSCkZZ0TBVrZDLpqR4= 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-329-H4pi8mw1NUO8f6MFV9ToJw-1; Fri, 09 Jun 2023 03:57:18 -0400 X-MC-Unique: H4pi8mw1NUO8f6MFV9ToJw-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 6E9BA3C0CEFB; Fri, 9 Jun 2023 07:57:17 +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 3FD2C20268C6; Fri, 9 Jun 2023 07:57:10 +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 , "James E.J. Bottomley" , linux-parisc@vger.kernel.org Subject: [PATCH v6 14/19] parisc: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:23 +0800 Message-Id: <20230609075528.9390-15-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-Stat-Signature: mbfgftkgcyhe78fqbmt48texkd1d8mtb X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 477C2180017 X-Rspam-User: X-HE-Tag: 1686297444-210867 X-HE-Meta: U2FsdGVkX18jHxSH+noU83uSUr69Dj1J8pP1ONa8da3adflAkWA2pGBnd9iVTBeOdr8VbbwogXGMf5ZwfLXDP9llgzvy3xCaiWtixtf/7ujOyRTGeFqEbqdtB1TR4fitu+Rv13MUhY0GSuqq3HBApCh0/pjWeUdF9h0CEZIucKW2sQ7EE76l4yhXZQAW0dT2hgBSoeWrY19W1TIDGTNbg8LFmy9rG7jEZsRgxU3eRFrBw8kgMIeZ5R/JOEc926Dvkx20zkJhUvd10XhKcI0DFK6Ep5edJXJM0nkciQEQbwQcHmWcnJ4fTLX0sEQm5BdMWK+3T30VshF/kL00ftMAwsnpLEE1dODs64YHAeWBTr2SHIir2CF2bCYEyZuXoUg71QweawaX7hxv6gjmNXPeQgQbiBz1aX+6dbqMclim3NEQwPhOAP1nV1vycKUnN6QsPwuVzoJnymf7I9T53wtODQBPlSJ5EizskGCe5EU+BBVOtDC25iv7QIvhzqfKnrUatreqA2+eDMkTZVLOooPVNCSqmM+Cj/QbY5ehWo7a7v9a0wx4q4p9arsRA62POXutiWqRPwsl6X9XmttHVQptVvI3squwXXLpPbrsZ5KjkQ6EIV0vrZdC4ora3kl1n8FChugsdLpQ5xSQZcOrfkpNDogC2K4qv0I0MLOE8azC1czuX13Yq+0We9wer0fKzN/z2wO1pi4Bk6QhohO2ZxqaJSvVQOMQcIwyhlADZxn4W2O3iwQsfWdpkSLzb/4lBNskN9g9yCvAzfeJTDUh4qdnuMZ38NMCwWhwnE/E6ZmDpWYZ/LEB/rQIUuSLXftREd5+u+NeJIaTWD+Wmf2GA0IGtXYgmQ8qsInfVLaMvyxyhOiOEJEuv2eNrVauAOFCl/YvdZ/e4uFrm7WnB6RAeYT/ivFfftgyMvtUvYp+szXRGuwUDSgD/6XLBr5fAb2UDrm5BEBx274gXhwosbVSVOh vin9RA+m aVdb0Ts99KnwWNx98nalvb6jTHz0FhtyTYI4VUSpZgK8RKjUK8kyZdgdqpi7yb/BPKyq7FJ+YPV1rdMYskQcVTegoAoD8421e3cqHLa/SN9DmeEXPWGkfw1/eh4bDYhXz6lo+kQgDOKHsOM/vkeMVnvB6dhL4AuGXJav5lH8L/j/R1SHK7nNBY/iOHgBWoRp92Dk4u3uzK2tn2dQ6zn/MSHwJH2IPZrzkRJLfx7yxZYOqGDF1yeYZcDIryQxPehlrZs2vAjOsXMnEXvRrHmOyPiQ9R5wgiul28V8v8W7MdFDQMrNHmwN9F+YLXtQfCHJzCrDE36R+12mcSRDMsI1ViMH2/A== 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: 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 function ioremap_prot() for parisc's special operation when iounmap(). Signed-off-by: Baoquan He Reviewed-by: Christoph Hellwig Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: linux-parisc@vger.kernel.org Acked-by: Helge Deller # parisc --- v5->v6: Remove the stale paragraph related to ARCH_HAS_IOREMAP_WC adding in log - Mike arch/parisc/Kconfig | 1 + arch/parisc/include/asm/io.h | 15 ++++++--- arch/parisc/mm/ioremap.c | 62 +++--------------------------------- 3 files changed, 15 insertions(+), 63 deletions(-) diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 967bde65dd0e..315cc42b1a2c 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -36,6 +36,7 @@ config PARISC select GENERIC_ATOMIC64 if !64BIT select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP + select GENERIC_IOREMAP select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD select GENERIC_ARCH_TOPOLOGY if SMP diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index c05e781be2f5..366537042465 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h @@ -125,12 +125,17 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) /* * The standard PCI ioremap interfaces */ -void __iomem *ioremap(unsigned long offset, unsigned long size); -#define ioremap_wc ioremap -#define ioremap_uc ioremap -#define pci_iounmap pci_iounmap +#define ioremap_prot ioremap_prot + +#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \ + _PAGE_ACCESSED | _PAGE_NO_CACHE) -extern void iounmap(const volatile void __iomem *addr); +#define ioremap_wc(addr, size) \ + ioremap_prot((addr), (size), _PAGE_IOREMAP) +#define ioremap_uc(addr, size) \ + ioremap_prot((addr), (size), _PAGE_IOREMAP) + +#define pci_iounmap pci_iounmap void memset_io(volatile void __iomem *addr, unsigned char val, int count); void memcpy_fromio(void *dst, const volatile void __iomem *src, int count); diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 345ff0b66499..fd996472dfe7 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -13,25 +13,9 @@ #include #include -/* - * Generic mapping function (not visible outside): - */ - -/* - * Remap an arbitrary physical address space into the kernel virtual - * address space. - * - * NOTE! We need to allow non-page-aligned mappings too: we will obviously - * have to convert them into an offset in a page-aligned mapping, but the - * caller shouldn't need to know that small detail. - */ -void __iomem *ioremap(unsigned long phys_addr, unsigned long size) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { - void __iomem *addr; - struct vm_struct *area; - unsigned long offset, last_addr; - pgprot_t pgprot; - #ifdef CONFIG_EISA unsigned long end = phys_addr + size - 1; /* Support EISA addresses */ @@ -40,11 +24,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) phys_addr |= F_EXTEND(0xfc000000); #endif - /* Don't allow wraparound or zero size */ - last_addr = phys_addr + size - 1; - if (!size || last_addr < phys_addr) - return NULL; - /* * Don't allow anybody to remap normal RAM that we're using.. */ @@ -62,39 +41,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) } } - pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | - _PAGE_ACCESSED | _PAGE_NO_CACHE); - - /* - * Mappings have to be page-aligned - */ - offset = phys_addr & ~PAGE_MASK; - phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr + 1) - phys_addr; - - /* - * Ok, go for it.. - */ - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - - addr = (void __iomem *) area->addr; - if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, - phys_addr, pgprot)) { - vunmap(addr); - return NULL; - } - - return (void __iomem *) (offset + (char __iomem *)addr); -} -EXPORT_SYMBOL(ioremap); - -void iounmap(const volatile void __iomem *io_addr) -{ - unsigned long addr = (unsigned long)io_addr & PAGE_MASK; - - if (is_vmalloc_addr((void *)addr)) - vunmap((void *)addr); + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); } -EXPORT_SYMBOL(iounmap); +EXPORT_SYMBOL(ioremap_prot);