From patchwork Tue Jun 20 13:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13285840 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 D76E9EB64D8 for ; Tue, 20 Jun 2023 13:17:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79C978D000E; Tue, 20 Jun 2023 09:17:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 725AE8D000D; Tue, 20 Jun 2023 09:17:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EEBC8D000E; Tue, 20 Jun 2023 09:17:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4FA708D0001 for ; Tue, 20 Jun 2023 09:17:16 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CD2E380F17 for ; Tue, 20 Jun 2023 13:17:15 +0000 (UTC) X-FDA: 80923177230.29.9F4AA57 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id ED29BC0023 for ; Tue, 20 Jun 2023 13:17:12 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BMOu+Rur; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1687267033; 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=L73uxYO6/gwUk9UCAvwzC3MI9+cjvFVAXT1CVkWyq/Y=; b=kS8rnO36UX6ydb5i5GFmvYhuiAhEH3wAwwPKmsUj7NDDmiipVaLdu+QI8xdO7hQYcGIxnV pmTTYLmashxq6wzWSAvGC21yvNKXd8p+IDS+FCL00oHk4vkTIVlTIEJig1JkNhJdsGU5Yf JASQrmrm/uCbAdmXo1oPmknXPv+Zjl0= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BMOu+Rur; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1687267033; a=rsa-sha256; cv=none; b=JTlk/3tL7ZeKMEuXtCUzF1McFJ2b7KCWq9/afk4WeI8djBr/u/wAki3lKBcWFI7/wMEBQW W/SnlzTZeP/HrXHAzkaDfcbazyBZRvvvuwap6jzLKsD4hebYYflmCjQC/QoCs8HjcqoIBH HfHSw1bZ1Y5IrfGPpxLuXf3p1/s3NNw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687267032; 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=L73uxYO6/gwUk9UCAvwzC3MI9+cjvFVAXT1CVkWyq/Y=; b=BMOu+Rur1axQWspemMiScoLzvyoke7RmM88LSOoBuPOP+oIWyIRXpdcctWxI85ZpGQLnVE uaXjuxR7RT7nrL9xg4QWDBaOvCsnRhJS/XIQRPhw1n40cAZmzSH8HTx4ntNmuBHPlJe9HS kkQs1ZQQJzVHalq0HG1tqUwime0eOxg= 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-638-FRnLt72yPKKHm7OpzzusiQ-1; Tue, 20 Jun 2023 09:17:06 -0400 X-MC-Unique: FRnLt72yPKKHm7OpzzusiQ-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 773E28870E9; Tue, 20 Jun 2023 13:16:23 +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 8B9FBC1ED96; Tue, 20 Jun 2023 13:16:14 +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 , "James E.J. Bottomley" , linux-parisc@vger.kernel.org Subject: [PATCH v7 14/19] parisc: mm: Convert to GENERIC_IOREMAP Date: Tue, 20 Jun 2023 21:13:51 +0800 Message-Id: <20230620131356.25440-15-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 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspam-User: X-Stat-Signature: bybp1h6mefq3sdmwkqitxk5uqiqc75n5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: ED29BC0023 X-HE-Tag: 1687267032-627270 X-HE-Meta: U2FsdGVkX19YKKYSP4yKnjikPAdIcVjD7jAcw3SBNmd3CBr3kNp+Og88vr3xAwaiJ8v5IhuEDXP+ViHoWMEWiTnL9nfIt6svHAFF6ZDJ4YTuRoP/QUJ1lu3gWtxwFw0c8wMDvagHiZEqOmWevVtRcCl3WHVGqhIw0IrTTM4NI2nAp2wNlUD7zVyoQT8Bz/wNodZvPI1QaQewZWNLQLQWt1idCJWdkTWL8B8DfTU0J0GrJ1JJL7Tu2yjyivtMUmrB8/+3tz6iJ2ACUbDoSoq7GeYVEiEAk6QYzTnmFjys0neJVsaWsbdN03ZDLpwffN7qXdYl5imG+UgJX0JRxu4WHYP6G2PQe7BKVyJfwCErySerunclY2GgGJAySCPl2aQcVn3UJCmbFsupriYNNaKMURq9RyR5S3XiSJfEIF1spUcFzHkh3FJzQEq9zTauFFgHk3rK+FYcQijSblYUKn8GgpWiQdIMGeonuzAxb9h2GFc758Y6ytkQOWfFTrVwJk2iNo9qjJS4E/Z6n7Xc2t5lcl1US3qrz2dCuP8r4ATtnSwGo2O4IExGk0aBKtwkDK6B1SKzb65AhhbGMHUR1bclaKibB/jX2jRnfOLR5XU6e948O7YM+fk/bEmu9/CPJ18HrUwIh4T4+S8qXh2ywXY7tEEXCKz6RXxhRcjfvll98+BUPCaYaVEj9TSJtSfzhT4JEtjZKUehEXEoVBxa2/au0snmYk8YzYGmxyj0ZyIZGjhQ0mkYoWnAZhpYtlYgX2Mj63uBlvmQwxlqWNDvB3yu35znEDCFIM0JXV3ce67Ct3F2jr7gzqmjCRWsOOUOWVdNMlfq3EQPuccy0F87tMMIfTG4QoiS8rkXCiVeryNqHz84AgzdgipeQ8cO0UQd0Y391YpuzgyXZieJun+h1kCZFvsTXvL5bpq8WO7F0KJVvhR+ZD9gJg8JTxr1JwyXro/IE5Lz+qISn+VwzDEp3VM KmOUejUC 2l1vQg1f+M8P/uDzh7Cef98iWzDDAMhEFum9bwTLO0dxLAjpIuodQ3F1OSDV7qJtcRzZlAIhnQIStx0fCzgQRm7erSB+pvvVgjxwNeA1c4FVQYlHxgvGyUq86MfG+MviJaRck13Vxrwwndy4/+TR1ae7UE7neN5gpW5fYKwjw2fSv67QtrS7ZNDr3UKtRobkJYIuxuyPhtkPaD01HYudVlKZAZl2dqpx924zftaueEdgRWhxRMSnvywXp3RM9pJnOolUN9PzuYfWhFaCwGzztYHfEW3d+HM7b3lDLbBTWwk5UEZJAGfYBmqKqXkeIXDGPiMrxFesImvAyC5p0PJ17pKkFNg== 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 Reviewed-by: Mike Rapoport (IBM) Acked-by: Helge Deller Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: linux-parisc@vger.kernel.org --- 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);