From patchwork Fri Jun 9 07:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273359 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 6122DC7EE29 for ; Fri, 9 Jun 2023 07:56:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF39A8E0005; Fri, 9 Jun 2023 03:56:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA27B8E0001; Fri, 9 Jun 2023 03:56:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D924A8E0005; Fri, 9 Jun 2023 03:56:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CAC878E0001 for ; Fri, 9 Jun 2023 03:56:51 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A43498014E for ; Fri, 9 Jun 2023 07:56:51 +0000 (UTC) X-FDA: 80882453022.28.83A9ADA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id E8133180010 for ; Fri, 9 Jun 2023 07:56:49 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="P5hR+/iQ"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1686297410; 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=0lDwY01DeRkcypkPwr3wPDENx+u681h4hIQx3NHXU5U=; b=1CrwSrGIyEcf97Dwej/nyRBmdYMHTtWFbjFTh2emHYlaFaR1VV87AN0VP2aVohbJKAvaL8 7MSQ/CIyrAnhLeMMwHwhSCazDNdXWOfgxsaNytPyjBjFdtV/UuyBN178clYHGh7TPGi7nd pYtWIxUWLnFpb0DnLYQyC0OaY6ctKTM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="P5hR+/iQ"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686297410; a=rsa-sha256; cv=none; b=a+qdrwVChdxwEMrqNCBMbqx7l2AuOYjyjQthtYq4N4h6BK6ZDoSoRf2e3L0dvdoxhOnRXY CPwYIMqkYuOYwLvYx16bid/mQzLEbUHyvyFSwTRVERWWxQczALLzH5se+EbqhtwQfC3/h4 ZVBdAgo8XwZGkBFQB1kS87Fc1YTgI2Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297409; 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=0lDwY01DeRkcypkPwr3wPDENx+u681h4hIQx3NHXU5U=; b=P5hR+/iQcb5NywF51ctfi1cYYzsPhYPiWygQ0rVZGBt4nFZgEUSh6MbnOzP7VhL86XOz3e QQO6KzGNGKsbG0b2P7lkpDwfDv5Xqr3kU8eaMm8J20eJRYIETLsrkea7IYLaQwn/B2JP57 pMUYoYQ2Q3hx3XEpnDFDTtLfmKakrpw= 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-673-RicPtZkPNu6XXaXpAxIvew-1; Fri, 09 Jun 2023 03:56:41 -0400 X-MC-Unique: RicPtZkPNu6XXaXpAxIvew-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 376CA185A78F; Fri, 9 Jun 2023 07:56:40 +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 BD93420268C6; Fri, 9 Jun 2023 07:56:33 +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 , Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: [PATCH v6 09/19] openrisc: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:18 +0800 Message-Id: <20230609075528.9390-10-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-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: E8133180010 X-Stat-Signature: xjzkuan9q3sr7n6hqp4nfxjscbum4dzh X-Rspam-User: X-HE-Tag: 1686297409-61969 X-HE-Meta: U2FsdGVkX18cTO0DLVpNTnZyW3UIukJfJoAIot2rz7oWTaGhpIvBUz56JYySmkcxVJDUf68OIrzyZZIy2s9tGbJGnJInJkMGmW+dX5D8GFvso9lGXGsuEDnUASJXi85kgmYk5Mfp7YEHNFcqCmHjCmKOxavgX3kynz8OztjkjN+F1NYcKNujdBqPBV4yxdzUx12s6j6VcVLij3yAQCOsYFTrW0UAFrbBveRSArwYc2uOZ8pzAe6jtNKqG+7FB2dmfJT7oYw1Pi+xhIk+qp2BevtSkROqek+wB4Dp3YrcD/Gdz9+fmk+do6HCN3qqYQuQ+HJWPmfUhhTmYlAQyObL1evX6UVhCvpJ+dv8XN1NP4PJNsP+BlxB/zz6psx/zZUlBENPwn25jPscghSIOWWoIuTis2vZUNVyKePL2vBFWd+OPyub35dh+18uCOJ/TdoUtpg2NvvOvhKQyxtUdWVDtlK9v/M2hb/lfORlpa0Rg/aK9gjHO7AsymLKz9RiFcRLxXK0Xt26tz4vSWu+FGJNWt0fLUXsUuXCwJ5p21dGXi3Euc9H34WaTl/6A3ovlKwlK5L6nBz5cv8gYrUGs5nlm/+VjWk0X445Ie2Nw60LUK7Re9rLm9KPFu0sazlWAtMLQ2B5UhuMMesVaaMF148YLLfXzwWFTK5BSutJr0Qhgmyz7ogntmr+GluPLK/b3qKYRIvCqTyMtBWZCqCY9zCYdhWvcWaxui8rPjFs57Olu3u4M5Iyn7I+boFJhvtDnHr2x95HhMsLfJmLFnoigWcEozd8OejAQuc/g/Ct4OCvlXCJXle68KPYuiLyjbQe5nTYDuAOWNpUQ7GWKWf3lWaHLegjhvI62daheZyLHpuRJGRJpSDAJMUHXrnoumTw4tqKmg5EWW3Zl+ah4PhKLkVR2sUi6mkbooNajHsE8M9YVQIUT4RhmGSlF+rjHx2ayl1ajwqAuVMHb/VrYHXN4b3 gYfb75+f 69hedb+rXPmA9JP0+4u7UPvHS/EmWZdik3NyAeCCWDC55JdU3hnMOZUr7akbU7F53yEDoWI4cYirA5bl4odbQ9fI4MeO9MzStcUd9Hg7Mxe85sF0UMjQHRnWdadFOAlr9yXB6Jb3Xg061x+fBaPnibBo6WMFco1scywUBV+88VbVAy6d1DsL4F2y6cc4iMMMITcn5808GnHM4noYb40LeLSvxVT/6voXJGi3eO8lRErCySdeNyuTGGiHdaOA8B2J2ExW84jgGIcO7YcdfGdZuN/ZPp3sgC2VvpzLhht5bII9Ho5+v3f6QSOxnrg== 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. For openrisc, the current ioremap() and iounmap() are the same as generic version. After taking GENERIC_IOREMAP way, the old ioremap() and iounmap() can be completely removed. Signed-off-by: Baoquan He Cc: Stafford Horne Cc: Jonas Bonn Cc: Stefan Kristiansson Cc: openrisc@lists.librecores.org Reviewed-by: Christoph Hellwig Reviewed-by: Mike Rapoport (IBM) --- v5->v6: Remove iounmap() because it's the same as the generic version since we have removed the code handling ealry mapping from fixmap pool in patch 3 - Mike arch/openrisc/Kconfig | 1 + arch/openrisc/include/asm/io.h | 11 ++++---- arch/openrisc/mm/ioremap.c | 49 ---------------------------------- 3 files changed, 7 insertions(+), 54 deletions(-) diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index c7f282f60f64..fd9bb76a610b 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -21,6 +21,7 @@ config OPENRISC select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP + select GENERIC_IOREMAP select GENERIC_CPU_DEVICES select HAVE_PCI select HAVE_UID16 diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index ee6043a03173..5a6f0f16a5ce 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -15,6 +15,8 @@ #define __ASM_OPENRISC_IO_H #include +#include +#include /* * PCI: We do not use IO ports in OpenRISC @@ -27,11 +29,10 @@ #define PIO_OFFSET 0 #define PIO_MASK 0 -#define ioremap ioremap -void __iomem *ioremap(phys_addr_t offset, unsigned long size); - -#define iounmap iounmap -extern void iounmap(volatile void __iomem *addr); +/* + * I/O memory mapping functions. + */ +#define _PAGE_IOREMAP (pgprot_val(PAGE_KERNEL) | _PAGE_CI) #include diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c index cdbcc7e73684..91c8259d4b7e 100644 --- a/arch/openrisc/mm/ioremap.c +++ b/arch/openrisc/mm/ioremap.c @@ -22,55 +22,6 @@ extern int mem_init_done; -/* - * Remap an arbitrary physical address space into the kernel virtual - * address space. Needed when the kernel wants to access high addresses - * directly. - * - * 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 *__ref ioremap(phys_addr_t addr, unsigned long size) -{ - phys_addr_t p; - unsigned long v; - unsigned long offset, last_addr; - struct vm_struct *area = NULL; - - /* Don't allow wraparound or zero size */ - last_addr = addr + size - 1; - if (!size || last_addr < addr) - return NULL; - - /* - * Mappings have to be page-aligned - */ - offset = addr & ~PAGE_MASK; - p = addr & PAGE_MASK; - size = PAGE_ALIGN(last_addr + 1) - p; - - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - v = (unsigned long)area->addr; - - if (ioremap_page_range(v, v + size, p, - __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) { - vfree(area->addr); - return NULL; - } - - return (void __iomem *)(offset + (char *)v); -} -EXPORT_SYMBOL(ioremap); - -void iounmap(volatile void __iomem *addr) -{ - return vfree((void *)(PAGE_MASK & (unsigned long)addr)); -} -EXPORT_SYMBOL(iounmap); - /** * OK, this one's a bit tricky... ioremap can get called before memory is * initialized (early serial console does this) and will want to alloc a page