From patchwork Mon May 15 09:08:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13240989 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 584E5C77B75 for ; Mon, 15 May 2023 09:10:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7B7F900003; Mon, 15 May 2023 05:10:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2B7E900002; Mon, 15 May 2023 05:10:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF35F900003; Mon, 15 May 2023 05:10:05 -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 C2D3D900002 for ; Mon, 15 May 2023 05:10:05 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 91764AF4CB for ; Mon, 15 May 2023 09:10:05 +0000 (UTC) X-FDA: 80791917570.10.C2A7879 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id D2DBF40009 for ; Mon, 15 May 2023 09:10:03 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R9bTmHDN; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1684141803; 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=Be3YZPYQKe3fVhwvu6S3wHOgSricTE7yqKPORN0fijw=; b=c0IeqDcG2nDBQpdiCsfol5kyIrdNK4GZF/Wl83CFc8kuZZo8kBhjzHSByhHY9frgSsfjxm YxJnYFdLDwIcFwz2LB/fWnIEVVarhKd+gYiCnqqdJBBEelschyz3IsBES//AWp3OgvzC4j xuHJ7SywDeqC7UoSUvqIadtCfOVxPHo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R9bTmHDN; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1684141803; a=rsa-sha256; cv=none; b=VThK4sPPlKSKC8f/+v5RKzFW91PuFYNWV2N8GRsMtvXEAbE5LDnd+DLpfSoxWPK0vLIh25 wf5jK/O1dA452Es5Sk4NrLHWMeMpq0IXrpsYeMVbRlYA/HDsmuR0BSik/EAeKDODN1IyxK d/NQagxp5xNZMX+PcjOC4ALtKuhoquc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684141803; 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=Be3YZPYQKe3fVhwvu6S3wHOgSricTE7yqKPORN0fijw=; b=R9bTmHDN6WDT7+be8GjX+BGLTwaF6IRsGWwRfQe8pYEjMtbcTTo3th5IcCZ+m60wjZYIIl ZoAWIrunUNlCp0KNElDAS5fgb48+cH+WEdU4LFJH0oo96NJ7JgcZuU6SMhpgzkSa/9zvps 3AWjDj0pJgUJHXU8tAYBtSjGK9RVRvY= 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-550-OwQRqC1OOXG4zvhgV9a-lA-1; Mon, 15 May 2023 05:10:01 -0400 X-MC-Unique: OwQRqC1OOXG4zvhgV9a-lA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF28C3C0CF02; Mon, 15 May 2023 09:10:00 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-32.pek2.redhat.com [10.72.12.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B0F940C2063; Mon, 15 May 2023 09:09:54 +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, deller@gmx.de, Baoquan He , linux-ia64@vger.kernel.org Subject: [PATCH v5 RESEND 08/17] ia64: mm: Convert to GENERIC_IOREMAP Date: Mon, 15 May 2023 17:08:39 +0800 Message-Id: <20230515090848.833045-9-bhe@redhat.com> In-Reply-To: <20230515090848.833045-1-bhe@redhat.com> References: <20230515090848.833045-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D2DBF40009 X-Stat-Signature: 7pteuugh6j1p469jimgp1jzbuuxe6xyd X-HE-Tag: 1684141803-422692 X-HE-Meta: U2FsdGVkX1+gKt69uyuc+H1Dj51kw5k0VUMWYz5eS/q1f5/R1pG6yiDbSLkyJTeyINp+dWMAYUaD0kuYw7eXXkVofdp0vC+5Mv3t1nKHBmqKP2lKZa3Njr/lOGJlIVQb0mtQyy1bPNPBIwQhLk+/uvFx9c9h4sbyDUfwOXMV52fRNt+5SlRM7K040mOSnGQVuug4+Ux2NZrFpoRYkzqS3d3k62fWyxV8zziNUM5BQgMvVfPxkTmPEbr//UtAKqcpoy8gOcMwHcq3+Eu98NXRIUZfnTQMQbzbzU6215FMv9mH/pB9hupwlrx5Jjlyc8lYsYFm/PwVWA6MCaUu+eoGvJumAIGEZj1QfrbX+fkfjGSU8SCisq3JPAyFXcy0SP3xYGnSUXuEBWVvqM58YacNQ1xOiqLyJ23/y4zkYM8PHFxCroTqkrRQ5x73Db1imzt+2uawDloT8YlWHE4CYoIqWztDr4ndLiZTflDuZtAXa3qX1CX3rgBTE9PioI5q9JHeyKIZKFWuw9MaLhfk+oJMk6r2ige4JRmW0hSJ1aIGylK328IL5M4Sx9N6tEKpKtpa2b0WSWnREj8EkcluMJ70WouyP+Qm2OPmIQWF8yyVExQQpN0DDqT4A9jdiANnfWSdF1DqTZoCxmtHCtGW/4XgunAkqmwn3tItRMss84ChxNDHuWqepYGcsEpyiys+SZpLccB6HQJxvO1LgZMecSr8mohnL8UTD5LhbGffl+iJyobmeYnzTaPdqh5XM/MslQTcedmE5Z9YwJQxovs0PlP31u4JV2sTFVlfxWw2VvLGRnLlX7wisqaBjbZ9/9gAFd8YEdfh88zE5+r7GDbcJXytuDXoI8lDBY1NJRcP4TCO9jwzDVOxWxjtqU8qkZ8tQCcArIDTsi4P8TGqFjYblNyqMS4m200PT22DW3nAmFjc2xIW41xht7Ea/L1R15b5NQUBPn9uXuzGDlL9+LcxR+5 EMMJNA8X FZRQb+0APHR/NZZrSLWy6Y+KxgUVqy0w8G08BPOxZB1CDHF2n521LRAJGrySYIgAM9MTz6yjYKGIggSRoQeaGHR4USLwcpknSpCUzO4vIKZk824dcBnEWhzAUQTbrE44m8HNNSkki4BIy1JqahcYgti0l5cmRHKwXVkfJTUanO1OfcaVPSK42tnxaJBRimuapmXOFJWtDwMclmRBiywMZHkhZ73vVIP/yPaYxaAnW9P0mcsi04avkN5//AjS2oYwQLm0XditHe4Vhztethl4SFhIZIA== 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 functions ioremap_prot() and iounmap() for ia64's special operation when ioremap() and iounmap(). Signed-off-by: Baoquan He Cc: linux-ia64@vger.kernel.org Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Christoph Hellwig --- arch/ia64/Kconfig | 1 + arch/ia64/include/asm/io.h | 13 +++++------- arch/ia64/mm/ioremap.c | 41 ++++++-------------------------------- 3 files changed, 12 insertions(+), 43 deletions(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 21fa63ce5ffc..4f970b6d8032 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -46,6 +46,7 @@ config IA64 select GENERIC_IRQ_LEGACY select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_IOMAP + select GENERIC_IOREMAP select GENERIC_SMP_IDLE_THREAD select ARCH_TASK_STRUCT_ON_STACK select ARCH_TASK_STRUCT_ALLOCATOR diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 83a492c8d298..eedc0afa8cad 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h @@ -243,15 +243,12 @@ static inline void outsl(unsigned long port, const void *src, # ifdef __KERNEL__ -extern void __iomem * ioremap(unsigned long offset, unsigned long size); +#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL) + extern void __iomem * ioremap_uc(unsigned long offset, unsigned long size); -extern void iounmap (volatile void __iomem *addr); -static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size) -{ - return ioremap(phys_addr, size); -} -#define ioremap ioremap -#define ioremap_cache ioremap_cache + +#define ioremap_prot ioremap_prot +#define ioremap_cache ioremap #define ioremap_uc ioremap_uc #define iounmap iounmap diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 92b81bc91397..711b6abc822e 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c @@ -29,13 +29,9 @@ early_ioremap (unsigned long phys_addr, unsigned long size) return __ioremap_uc(phys_addr); } -void __iomem * -ioremap (unsigned long phys_addr, unsigned long size) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long flags) { - void __iomem *addr; - struct vm_struct *area; - unsigned long offset; - pgprot_t prot; u64 attr; unsigned long gran_base, gran_size; unsigned long page_base; @@ -68,36 +64,12 @@ ioremap (unsigned long phys_addr, unsigned long size) */ page_base = phys_addr & PAGE_MASK; size = PAGE_ALIGN(phys_addr + size) - page_base; - if (efi_mem_attribute(page_base, size) & EFI_MEMORY_WB) { - prot = PAGE_KERNEL; - - /* - * Mappings have to be page-aligned - */ - offset = phys_addr & ~PAGE_MASK; - phys_addr &= PAGE_MASK; - - /* - * Ok, go for it.. - */ - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - - area->phys_addr = phys_addr; - addr = (void __iomem *) area->addr; - if (ioremap_page_range((unsigned long) addr, - (unsigned long) addr + size, phys_addr, prot)) { - vunmap((void __force *) addr); - return NULL; - } - - return (void __iomem *) (offset + (char __iomem *)addr); - } + if (efi_mem_attribute(page_base, size) & EFI_MEMORY_WB) + return generic_ioremap_prot(phys_addr, size, __pgprot(flags)); return __ioremap_uc(phys_addr); } -EXPORT_SYMBOL(ioremap); +EXPORT_SYMBOL(ioremap_prot); void __iomem * ioremap_uc(unsigned long phys_addr, unsigned long size) @@ -114,8 +86,7 @@ early_iounmap (volatile void __iomem *addr, unsigned long size) { } -void -iounmap (volatile void __iomem *addr) +void iounmap(volatile void __iomem *addr) { if (REGION_NUMBER(addr) == RGN_GATE) vunmap((void *) ((unsigned long) addr & PAGE_MASK));