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 E3482C77B75 for ; Tue, 16 May 2023 06:52:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71455900003; Tue, 16 May 2023 02:52:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C4D1900002; Tue, 16 May 2023 02:52:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59041900003; Tue, 16 May 2023 02:52:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 49E88900002 for ; Tue, 16 May 2023 02:52:04 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 23CD91414A1 for ; Tue, 16 May 2023 06:52:04 +0000 (UTC) X-FDA: 80795198568.14.6938700 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 6E1DF4000B for ; Tue, 16 May 2023 06:52:02 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R1pIQm1x; spf=pass (imf04.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=1684219922; 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=Euq6ZLF/9DSvzQ4FkIDyq5qWSejUu8BPJLw526BNyOY=; b=jVX9WyZOUylGeYkTEF7bhIihMk0Svt2p35Z2AQgnb1odQZYG6eLqmNRrtExSsgpRLfoJbr 8ZoBBdjITcfqBsrG3cvpV6ggJsu116y6oycdBRrskiReqbLob10ulfJg2lvnKJeoMD6a9U kSrx4xgiS6bF8NIhNAst7lXFHN6Cb/k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684219922; a=rsa-sha256; cv=none; b=qOPKU0v52b5LxJL8iQtzHm3IQsqla9GYyI8YAe5Lrdm3s+20Ey0jJ6YQaf5fm6YD+GMDSO c04KwS2ha4JFE9kPuPiM8wYXC5zPsQTtDT9U9Fxj1+5JRBE2ZR82hRRVMN0shiCKK/Zja4 WSSCO3nw/NmZgWKZNX+J2GwsUS5S3uQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R1pIQm1x; spf=pass (imf04.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 7E62B63525; Tue, 16 May 2023 06:52:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 195B3C433D2; Tue, 16 May 2023 06:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684219920; bh=R3vXaZLbmwcNixKntNH8wMD/qVIT6iG5KEJlYUscwd0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R1pIQm1xEhZ4DphBAmAifSRaIxZkxwGEglk+5s7b7+Lg4FJdWrTc+EzV6vgWA47SI +oElJdTih4GDghmXvZ17lmgRiUoNTz0h3Ce/h0e6st9pphshvWbJD/Cku2ortprxqW qpr7gwX85/WAKORaWXd3irGyU9GSuqRvh8pa1jEnKldUz3KfB1I//SP92FH1gS+tVj DtjNhDka+f0H+i83Ul0Y8zf/fqxkpOq+LfYxZNLE5A7c8zQzior91cWvTmolAeE6A8 iSl2kZCW7Mi8DTqFLzs0eegl3wHCE7Isjs4ARp0yuRZ4lyNP5X+p4b2anmTv+QGzkC /y8B+If194LpQ== Date: Tue, 16 May 2023 09:51:53 +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, Chris Zankel , Max Filippov Subject: Re: [PATCH v5 RESEND 12/17] xtensa: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-13-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515090848.833045-13-bhe@redhat.com> X-Rspamd-Queue-Id: 6E1DF4000B X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: md7t3g1a9974wcnn5674oqt8kntgrc38 X-HE-Tag: 1684219922-802776 X-HE-Meta: U2FsdGVkX1+dQT1DGhIBCJj/geyLAYzhDkdtHQJ7sIFNRIEleE05An7yb0WW2SavSzItvndnby7OVmY/E+hvsvMbyIndTNn6Ra/uKZuoRCRBSkQP2TQtMrJJHzvzBbknL68IwvmwqMH3MRKE4T68H6rQPCeDAQW3PsXnPOf06I/ixakYoNBmuDqIXXIFpLjf8JDl9ypzIcyqqnxcfgSBudvSj/kXGIyubk6JqKZLny7/ExxSPZA4R0Skp0y3768QcVr9kub4Byk77sWQehd8AM0RsRqdi3EGklkrQaKCT4XvzbLxipNT50e8dCOhW/kJWRoQ1JIyhKtxaZB0IRAFLUvHHs+WhrehxXJFvWy4GKJRQg+QJKQ9A0/IhmAPEQi/WsxbpDkb5XsnHdph91jFC1Ok0td7rMBfqI/9jISQ5WmJVK4Rmwku2OQuYShqcSUl87C/5mvYwN29AiQ8BKAmX5fO4Ypq+3KD2H5A98bh16KkYYV4VbmbVTIpg6sAMjJbavYB2X6kVaCaDeKTfQbw/AUgyjvF0s0htIC/5ISkbmaZGuAEhYxKD4N+/07C5eEdB/W7xDnwtnuPpvXpr3WkYXxHUa3q8qsbYRoX5cUarWeugJi3ZxofiRWBqCwMq7qJJYUqAPpiyqXsHeuMBOCV9cZVRVvi7n20QOdd2guRyl0TwPCBqVDrOgpEjqQ2JLpJC2Fb+G29ALKOerGdx6ZCXd5bkjChe1vhdC28j4Et6bA4woAcsxpZ/BfwDqmo9vT434Qur+Yk5RgrkYhq0WwwsHnL0sA8LovuF3ODf6dhfozwIRmpjGPTg5uIjU1jbK/4RvJEo6ldGeQrF5+wRS0PI9INWF6PC6Pke0WE9EyHosEp2uwQ3QJk8Bhv8x0Lg49NxSFPVhurhxeoSlMhQHSiPFljIkZwx19Jc6KEb6QR8VaQamOx39/brBOKjzAiRIqtwJYHVYBMp49I9Z++05a 9m6NVQaq ee/BxTN0LPROa7T10UgS+iIfAhBQ6BmcE4Wr9KLSOSJJfkaSiX9eYpzi/K88o0gfdB/XRmnuEqHKOlp9D4IKw60NDH2owN55lMLENUlORmOyY9M6YF6Z1uTGoS3SgfXXBneU/eREt04JpOIf1rbI+y2nOIXy1jZ+e2ZsOLJBAAelU9Gsud32jCnBB71qjlEEY6qMqVhlwnrXlD0tcB31o4TF8sD7at1e/UQGqTDyiP1Zqv/REsDN/Vzh/EDiHkAjCqKMX5idBO/27SNGGZ8vv5SPxi2OHTWR5qiRjYQtxClWFK2n1ZnX2WfwQJU9W81b6J2gAVg2zqzD3n/MqAsU8hk7/EWsNUyhgQMcnpUgtJALw85gRz6pVK4OF9GtjtQKpuJacKWLuOEs38f0bdSUPYqovbqcQ3bUPVkcPyWcbL8QiE5s2bU3CXMixB0zpjfjT0oX1W6Z/h/kTB2N4JLmzVkoIqhQVnK/KxT+JQuerS5BQJ+MpMtbNkdhHyg== 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: On Mon, May 15, 2023 at 05:08:43PM +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 functions ioremap_prot(), ioremap() and iounmap() for > xtensa's special operation when ioremap() and iounmap(). > > Signed-off-by: Baoquan He > Cc: Chris Zankel > Cc: Max Filippov Reviewed-by: Mike Rapoport (IBM) > --- > arch/xtensa/Kconfig | 1 + > arch/xtensa/include/asm/io.h | 32 ++++++++------------ > arch/xtensa/mm/ioremap.c | 58 +++++++++--------------------------- > 3 files changed, 27 insertions(+), 64 deletions(-) > > diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig > index 3c6e5471f025..474cbbff3e6c 100644 > --- a/arch/xtensa/Kconfig > +++ b/arch/xtensa/Kconfig > @@ -29,6 +29,7 @@ config XTENSA > select GENERIC_LIB_UCMPDI2 > select GENERIC_PCI_IOMAP > select GENERIC_SCHED_CLOCK > + select GENERIC_IOREMAP if MMU > select HAVE_ARCH_AUDITSYSCALL > select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL > select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL > diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h > index a5b707e1c0f4..934e58399c8c 100644 > --- a/arch/xtensa/include/asm/io.h > +++ b/arch/xtensa/include/asm/io.h > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > > @@ -24,22 +25,24 @@ > #define PCI_IOBASE ((void __iomem *)XCHAL_KIO_BYPASS_VADDR) > > #ifdef CONFIG_MMU > - > -void __iomem *xtensa_ioremap_nocache(unsigned long addr, unsigned long size); > -void __iomem *xtensa_ioremap_cache(unsigned long addr, unsigned long size); > -void xtensa_iounmap(volatile void __iomem *addr); > - > /* > - * Return the virtual address for the specified bus memory. > + * I/O memory mapping functions. > */ > +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, > + unsigned long prot); > +#define ioremap_prot ioremap_prot > +#define iounmap iounmap > + > static inline void __iomem *ioremap(unsigned long offset, unsigned long size) > { > if (offset >= XCHAL_KIO_PADDR > && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) > return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_BYPASS_VADDR); > else > - return xtensa_ioremap_nocache(offset, size); > + return ioremap_prot(offset, size, > + pgprot_val(pgprot_noncached(PAGE_KERNEL))); > } > +#define ioremap ioremap > > static inline void __iomem *ioremap_cache(unsigned long offset, > unsigned long size) > @@ -48,21 +51,10 @@ static inline void __iomem *ioremap_cache(unsigned long offset, > && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) > return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_CACHED_VADDR); > else > - return xtensa_ioremap_cache(offset, size); > -} > -#define ioremap_cache ioremap_cache > + return ioremap_prot(offset, size, pgprot_val(PAGE_KERNEL)); > > -static inline void iounmap(volatile void __iomem *addr) > -{ > - unsigned long va = (unsigned long) addr; > - > - if (!(va >= XCHAL_KIO_CACHED_VADDR && > - va - XCHAL_KIO_CACHED_VADDR < XCHAL_KIO_SIZE) && > - !(va >= XCHAL_KIO_BYPASS_VADDR && > - va - XCHAL_KIO_BYPASS_VADDR < XCHAL_KIO_SIZE)) > - xtensa_iounmap(addr); > } > - > +#define ioremap_cache ioremap_cache > #endif /* CONFIG_MMU */ > > #include > diff --git a/arch/xtensa/mm/ioremap.c b/arch/xtensa/mm/ioremap.c > index a400188c16b9..8ca660b7ab49 100644 > --- a/arch/xtensa/mm/ioremap.c > +++ b/arch/xtensa/mm/ioremap.c > @@ -6,60 +6,30 @@ > */ > > #include > -#include > #include > #include > #include > > -static void __iomem *xtensa_ioremap(unsigned long paddr, unsigned long size, > - pgprot_t prot) > +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, > + unsigned long prot) > { > - unsigned long offset = paddr & ~PAGE_MASK; > - unsigned long pfn = __phys_to_pfn(paddr); > - struct vm_struct *area; > - unsigned long vaddr; > - int err; > - > - paddr &= PAGE_MASK; > - > + unsigned long pfn = __phys_to_pfn((phys_addr)); > WARN_ON(pfn_valid(pfn)); > > - size = PAGE_ALIGN(offset + size); > - > - area = get_vm_area(size, VM_IOREMAP); > - if (!area) > - return NULL; > - > - vaddr = (unsigned long)area->addr; > - area->phys_addr = paddr; > - > - err = ioremap_page_range(vaddr, vaddr + size, paddr, prot); > - > - if (err) { > - vunmap((void *)vaddr); > - return NULL; > - } > - > - flush_cache_vmap(vaddr, vaddr + size); > - return (void __iomem *)(offset + vaddr); > -} > - > -void __iomem *xtensa_ioremap_nocache(unsigned long addr, unsigned long size) > -{ > - return xtensa_ioremap(addr, size, pgprot_noncached(PAGE_KERNEL)); > + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); > } > -EXPORT_SYMBOL(xtensa_ioremap_nocache); > +EXPORT_SYMBOL(ioremap_prot); > > -void __iomem *xtensa_ioremap_cache(unsigned long addr, unsigned long size) > +void iounmap(volatile void __iomem *addr) > { > - return xtensa_ioremap(addr, size, PAGE_KERNEL); > -} > -EXPORT_SYMBOL(xtensa_ioremap_cache); > + unsigned long va = (unsigned long) addr; > > -void xtensa_iounmap(volatile void __iomem *io_addr) > -{ > - void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr); > + if ((va >= XCHAL_KIO_CACHED_VADDR && > + va - XCHAL_KIO_CACHED_VADDR < XCHAL_KIO_SIZE) || > + (va >= XCHAL_KIO_BYPASS_VADDR && > + va - XCHAL_KIO_BYPASS_VADDR < XCHAL_KIO_SIZE)) > + return; > > - vunmap(addr); > + generic_iounmap(addr); > } > -EXPORT_SYMBOL(xtensa_iounmap); > +EXPORT_SYMBOL(iounmap); > -- > 2.34.1 > > -- Sincerely yours, Mike.