From mboxrd@z Thu Jan 1 00:00:00 1970 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 69214C7EE24 for ; Tue, 16 May 2023 06:50:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D476900004; Tue, 16 May 2023 02:50:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 05E07900002; Tue, 16 May 2023 02:50:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E42AD900004; Tue, 16 May 2023 02:50:08 -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 D3ABA900002 for ; Tue, 16 May 2023 02:50:08 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 96BA0414B7 for ; Tue, 16 May 2023 06:50:08 +0000 (UTC) X-FDA: 80795193696.24.4123B2D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id E89D11C000F for ; Tue, 16 May 2023 06:50:06 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VnB3eh+W; spf=pass (imf21.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684219807; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7iwMQn6Dy6v3l7PCDR2WggIUGM0TRXGyXrSuhSDrksk=; b=fId75alImbcNNCXaJXYq5YV0rGuczpcIEZEvZDw/GWSlATx2+mTF9dJmLHCPZcdZTrwKAU oiV2mzVWaNIcwnbHiVZOhLg9JahuJ2sk0G6CFpHAIEB5xJGG0zs5FB4B1TucAVoWPlgV2K Zn1KNMti2P5l3jlEs13wAEsre1XpkXo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684219807; a=rsa-sha256; cv=none; b=3+Np604fMKkJHtKzaH877qvnUbrLOShzskQh5ShuG+qSZyT8cxpcBakYHMEXhk58+DigfY EdPol4njgZWzIr4S7jRsPrsjys63Z02F/9YDkAwHCkaj3yv7bQ/F8qiBAeC/2Il10jZ4bP nApBkw8MabJkFaQelh49jkGx24iQ8SM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VnB3eh+W; spf=pass (imf21.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F0B1A63533; Tue, 16 May 2023 06:50:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE2BEC433D2; Tue, 16 May 2023 06:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684219805; bh=7VX2LsKv3PQ0dpUkb9e7oVnaxcn5EXXzhXtXcfTUrdo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VnB3eh+W1j0NQcaox7doiPd13Fc8F/IiUM4j8VdhBZm20oiEAt6LpIIe9ZXPuuy07 PpHqPmDqTNuewxCeTKCCrlt8tYZ3F4XKvzogI5hmHVwUE8nXYIMOxQ2QmaSXv4wJBP e6tE9Ek/N9ysGgCw4kg26JzP5Q8pT9eMEHEjQcknfCTO03Fy70W5Kz7Z578cqYO3JQ LursPVYyRZoQgXFWlwWDxOYsOUNxXGcBFVUuDPgcFbrtmUZ7RSFJ+DLFZHupMO/xJx xuWaXCHbvnzFewOzyOSLUPYGHKZ/AeecJHJAnBP53Eik0w6Sn6LFCSnuCJG8DulNny 9ajILl0m5k9oA== Date: Tue, 16 May 2023 09:49:57 +0300 From: Mike Rapoport To: Baoquan He Cc: linux-kernel@vger.kernel.org, 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, Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: Re: [PATCH v5 RESEND 09/17] openrisc: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-10-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515090848.833045-10-bhe@redhat.com> X-Stat-Signature: 7y84wiwwo4nuey77htkw83gr71fmu9fb X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E89D11C000F X-Rspam-User: X-HE-Tag: 1684219806-294290 X-HE-Meta: U2FsdGVkX18N/NHDtXoBGMosbk25+bO9Bs6Y7PEqyrTywsYdflMTMebmJm+IDVfv91gSyRgK2GMQo4OA3174A9IfhiMUjMz7uvHZGejX8A2T0KkrjZyLuPGezYk2/fR5X2EQdTiWBgI+/jjMrVlTDsKaPMWxlty0EXbgfW5Dk7yMmQ7J8w984e9MZRlTPclqR2ehfdsNZe8yPPX5+wm5PYUhyYB+rI4UABkcsK9zxdjpohS5zK7/Y3Xq2s4OPRakRxByh0r7s6z2Ex7U0Z7ngjN/Zja1sEMvssWHuOVcmNJEPkttZ6OzoGFkv811jTBCWQliJL5KUfots/yJ3z4Rle1fF6oGPmN/FLQt8QyyFo6wFhOiF1Np3qTS8G06VknSIYeR17ItuJltDJiaFdSxDvNHtxSHjoUn3XSLJzh8mDxqnnCSaH3vbyPFavFclQdX4mbw+ROybBuYdM0lCn4UtJCwdNnpARgbNcbZFeX4qGJI7IrIoO+Zg5G2TAxPgPBxQWzJeWgRb0BE2jwzyViAyzqHwkdKssZp6MJwuIOIxP1VP2onEHnJEVhdXWxYjJ+1J9tuKQZXgytE0Jk6abd47BvLSurxLYEDfJvsYb408yEEjLmCfHVI8xfZ6DbimOrReLxxX3U4Ee9cq0CVjcVCa2eBX+GQtKr8sDTs5ZLm/MBhtif+oDy2IIep/DrW3/aWzjQyOSrFX8vT4m3b4kIgzgfZokDPfXdEik8ayA18rScGEK5GY0okHNVEzVLc2EqPe6tUHxD6TTQHGTI/ni6gkvuUGfEDYvXm4GBKTvi3YtT83VeyznqGsJXb1ZO9ASGMSlQ39+utUHgzVs/6+9NvCszgQBr6uPCNvk+Vi+jpUobSOPS8oRQptv+rj15QoHuxOJDGCBsvWlbhDOIWItbiIBj+QTWkxq03wr66TZgft2KGSaVltZ+hZ9zSgEeTZx+M5FGYItgeyACARL5gmba /nq38Dd3 PYEk6IqwYJ7HsjzyvW5EA8oKKvcR0W8Nk6iZltWn7bhu8bUNk9LOh4gCE2vMqkS2SwnOoeYYcUg5QgIv3uvXvX8jasMOieyNEZscFAwYODYdFsbSmugxL1JcoBA+/DkdAv6GdEsF/UFvjhJZAgY6hx5s5kNlekSl9QiNSyKHdZKm16/VnIU2e4HxhnowHFfruQ7OIhsiwSBa3t2imRlyaE3/86wjMfJfOVdNxa2Ktr1O5j97nbGj6Gf4m1gEfhK1fA/yuQWGkzjflA+kVBuryYTwlwl3nlfc/OGVaCa2R+p8EwvZnBlKXMHRgsf1Ed+Xmf7GZN6X2nmSSsNgjtfoe3YZOdft67vANhua7i7mdVJWGs5oA260hf9xB+TlBLG4tavidynARpBh9MIRLIAk/w6LpI5rpexdDulzr3XlvgpkgmM17wtmmZL26oDOLqlAYgJXj 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: Hi, On Mon, May 15, 2023 at 05:08:40PM +0800, Baoquan He wrote: > 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 iounmap() for openrisc's special operation > when iounmap(). > > Signed-off-by: Baoquan He > Cc: Stafford Horne > Cc: Jonas Bonn > Cc: Stefan Kristiansson > Cc: openrisc@lists.librecores.org > --- > arch/openrisc/Kconfig | 1 + > arch/openrisc/include/asm/io.h | 11 +++++--- > arch/openrisc/mm/ioremap.c | 46 +--------------------------------- > 3 files changed, 9 insertions(+), 49 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..e640960c26c2 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,12 @@ > #define PIO_OFFSET 0 > #define PIO_MASK 0 > > -#define ioremap ioremap > -void __iomem *ioremap(phys_addr_t offset, unsigned long size); > - > +/* > + * I/O memory mapping functions. > + */ > #define iounmap iounmap > -extern void iounmap(volatile void __iomem *addr); > + > +#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 90b59bc53c8c..9f9941df7d4c 100644 > --- a/arch/openrisc/mm/ioremap.c > +++ b/arch/openrisc/mm/ioremap.c > @@ -22,49 +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) > { > /* If the page is from the fixmap pool then we just clear out The page cannot be from fixmap pool since we removed fixmap support from ioremap in an earlier patch. I believe that patch should also remove special casing of fixmap in iounmap() and then openrisc does not need to override any of ioremap methods. > @@ -88,9 +45,8 @@ void iounmap(volatile void __iomem *addr) > return; > } > > - return vfree((void *)(PAGE_MASK & (unsigned long)addr)); > + generic_iounmap(addr); > } > -EXPORT_SYMBOL(iounmap); > > /** > * OK, this one's a bit tricky... ioremap can get called before memory is > -- > 2.34.1 > > -- Sincerely yours, Mike.