From patchwork Thu Jul 6 15:45:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13303966 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 05A13EB64D9 for ; Thu, 6 Jul 2023 15:46:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CD5F6B0081; Thu, 6 Jul 2023 11:46:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97D9B6B0082; Thu, 6 Jul 2023 11:46:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 845728D0001; Thu, 6 Jul 2023 11:46:55 -0400 (EDT) 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 732CF6B0081 for ; Thu, 6 Jul 2023 11:46:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2E0EB1206FB for ; Thu, 6 Jul 2023 15:46:55 +0000 (UTC) X-FDA: 80981615190.04.A2EF9F3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id BD3D5C0012 for ; Thu, 6 Jul 2023 15:46:52 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Ff/sHDBj"; spf=pass (imf28.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=1688658412; 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=HouZTQm+V70h+gsiEupRVBEwB3PeE/r1+sDrBkNv3ls=; b=bc755zchkO5SXIllwzkXX1Bja60u1ob/GlydVcplMLNDv0m0wZ0vkXbPE//deXZifoLXwd nOr7G/RCvohhuVj2v5Qsjil39b6I9UqatD2aSzB+0f4YonDmh12Ks5xTUYDonLcNdiK8qG WukMHx/nvvRz949OgGmKfknRnt47ba4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688658412; a=rsa-sha256; cv=none; b=j5H+7qgsVrxz5SAuMRWw6wLkEz4OJ0hKWsOed3W1Yprh1rlgDis/VAl+JpCWhof9AXHX3o 4XoEE3R6vojA8UvgPvNGDD5+yJmK3pPXWKo2yqwoVclELeQ0ChT8viKx44yaURqhDfy5g0 wbwKKgGD9RV3GNk+tUTZyVYQsleZdX8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Ff/sHDBj"; spf=pass (imf28.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=1688658412; 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=HouZTQm+V70h+gsiEupRVBEwB3PeE/r1+sDrBkNv3ls=; b=Ff/sHDBjtmKM+P+ehogh/LvQTk8F4RlduGAtjH5Uy269oXHvFmnCBxQsqr2ttMJYKIUn+u ZAh7bxCzfNOiD+5IxU8muHlk0N6yhLpFVtt6ByF9wPsfgSin7Qo5hWnXtVgqnRgrez+ATX Ah0IxDXswV6KyDT2X/FpP753JaUGM5E= 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-199-zStYdrw0PYmzXl3bYNKOLg-1; Thu, 06 Jul 2023 11:46:47 -0400 X-MC-Unique: zStYdrw0PYmzXl3bYNKOLg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EFD23185A794; Thu, 6 Jul 2023 15:46:46 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-39.pek2.redhat.com [10.72.12.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F6DCF6431; Thu, 6 Jul 2023 15:46:37 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.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, shorne@gmail.com, David.Laight@ACULAB.COM, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , linux-ia64@vger.kernel.org Subject: [PATCH v8 08/19] ia64: mm: Convert to GENERIC_IOREMAP Date: Thu, 6 Jul 2023 23:45:09 +0800 Message-Id: <20230706154520.11257-9-bhe@redhat.com> In-Reply-To: <20230706154520.11257-1-bhe@redhat.com> References: <20230706154520.11257-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: BD3D5C0012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: mre9nzgqy6qg9j6s8ecacfcj5renjjq6 X-HE-Tag: 1688658412-676630 X-HE-Meta: U2FsdGVkX1/jB+t50w32qEQItL2NHrg98tQaPVS1ty2lJJ4aoSq04LL66ofmssqjdtDNiW1Kh0TuTY8q3sguBKqaR4nUJft5UOJJIIOlD0QN+gXSN5zkVaaCZoGJHbqe849eonzfUS7JEbi5tkABAkU/HH+rfzg78MmiW7x7DLeAot5KEQzD2koXneNPzitt7Nua3EleZ+w2c6saDX9lKeEguw40PWTaopMvhGLwgOXctJ/i6dGkGfEMrqlz3jz7JCWiq5HocWhybASe7aLt8twH8fHGg18K1HacpuQxjUr4jiFGql6+YAeIt79dF5pw+ydrA+uRkNOUsAWG0wpgS2A6NQ8b9Y2XOaruZxkch6yvJ+sgBTXQWYzbrZvfiCZICTy5a6ilyBdk5FAtb3vtP1wOXjsYYTynS0rX22ibkjpTuDMq13l6hkdKMLDDDbw/HQfRUhmlUOqpfbx4mpllUjQHiwk7nWkatSrcp/QdAUxquXcIEpY8J6tgE8D6nWSWvLJrD/O6zXIINyvBtARCDk2cPiPMMZzbpmSsOSaZLCq7flyOpzDUX/8N+2Z58fg9ffIOwWAavzFtVYb2ph7YktfAH2gI1T5VXSA9l7AUYk1wP7Aac0nKQkiSFe15BmXs0kecKns72DNh1+nHaWJCwshbefRH0tctaKnGAcukzn83dxY/KZdsZsipDPOQjR/9bdDql3myEI7fMpjS5Q5C/RrHdfp9B8WDpx/UNtum0u20G4BEnyb5Eu4uf9z8M8wwU4djJ4nF9wTuUceuPg+jwX0mH4MMx8si2WK5wmh9Nd2eO9G1NT8SfyRQdAPVSCJc536cGfNmDFhKBUEBMlprTKqqrMqDXc1HVNhws4mBMtXUQxW1Kjor6EXU0wweQ/WGt3XlYBTifNjNhUdw+jPNFNLE3pV+ecVO/bpVVA97xH1XZCck/HIsOA9+EfvgW6PqBfkwFQOC7814bcEvJ1j H9GLKSiF UmnUefLMJO6KTqqG5i0olFyGntoXI5FVlsV1MwZeUIeZXrMbunVz65cixMRriMgfmfvpqtkGw3vg6RHCRrhghKVptQXAuUlqfIbKlFTmmY8kYpUNVN1WEK+LDnazpfR9E0D1ixTw/Q4Lo6JUVWBqWP1HOoK/7eRNOaz1dYYthBcGjF7z0kDdDgxewlKEuPWbYaHzUCnjCq01UejmZtH1MIy7iGj1xo7owG/6nHFJcORwe27oQnwFKiwcu/Umf1FjnE2z7s6fLawhb+ZGGB10rXaFHYQ== 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 code 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 Reviewed-by: Christoph Hellwig Reviewed-by: Mike Rapoport (IBM) Cc: linux-ia64@vger.kernel.org --- 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 2cd93e6bf0fe..3ab75f36c037 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,6 +47,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));